lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-21 20:07:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not idx file format

Browse Source 
revert c9ab8d05fa
This commit is contained in:
Chris Lu
2020-09-12 12:42:36 -07:00
parent ba984a4e29
commit f2723c1bc8
11 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/storage/needle_map_leveldb.go
View File

@@ -74,7 +74,7 @@ func generateLevelDbFile(dbFileName string, indexFile *os.File) error {
}
defer db.Close()
return idx.WalkIndexFile(indexFile, func(key NeedleId, offset Offset, size Size) error {
if !offset.IsZero() {
if !offset.IsZero() && size.IsValid() {
levelDbWrite(db, key, offset, size)
} else {
levelDbDelete(db, key)
@@ -123,7 +123,7 @@ func levelDbDelete(db *leveldb.DB, key NeedleId) error {
return db.Delete(bytes, nil)
}
func (m *LevelDbNeedleMap) Delete(key NeedleId) error {
func (m *LevelDbNeedleMap) Delete(key NeedleId, offset Offset) error {
oldNeedle, found := m.Get(key)
if !found || oldNeedle.Size.IsDeleted() {
return nil
@@ -131,7 +131,7 @@ func (m *LevelDbNeedleMap) Delete(key NeedleId) error {
m.logDelete(oldNeedle.Size)
// write to index file first
if err := m.appendToIndexFile(key, oldNeedle.Offset, -oldNeedle.Size); err != nil {
if err := m.appendToIndexFile(key, offset, TombstoneFileSize); err != nil {
return err
}