Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions storage/zstorage/memtable.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,12 @@ func (m *MemTable) Delete(key []byte) error {
return errors.New("NO DATA IN MEMTABLE")
}

// 先写 WAL tombstone(value 为 nil 表示删除标记),确保崩溃恢复时能重放删除
if err := m.wal.Write(istorage.LogEntry{Key: key, Value: nil}); err != nil {
fmt.Println("Error writing delete to WAL:", err)
return err
}

if !m.active.delete(key) {
fmt.Println("the key does not exist")
return errors.New("KEY NOT FOUND")
Expand Down Expand Up @@ -281,8 +287,11 @@ func (m *MemTable) recoverFromWAL() {
fmt.Printf("[INFO] Recovering %d entries from WAL...\n", len(entries))

for _, entry := range entries {
// 直接插入 active 表,不写入 WAL(避免重复写入)
m.active.insert(entry.Key, entry.Value)
if entry.Value == nil {
m.active.delete(entry.Key)
} else {
m.active.insert(entry.Key, entry.Value)
}
}

fmt.Printf("[INFO] WAL recovery completed, memtable size: %d\n", m.active.size)
Expand Down
Loading