Skip to content

Commit

Permalink
fix(merge): move Merge to db.RunCompaction()
Browse files Browse the repository at this point in the history
  • Loading branch information
manosriram committed May 14, 2024
1 parent 6e985e6 commit 3c35f65
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
12 changes: 11 additions & 1 deletion db.go
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ func (db *Db) walk(s string, file fs.DirEntry, err error) error {

// Syncs the database. Will remove all expired/deleted keys from disk.
// Since items are removed, disk usage will reduce.
func (db *Db) Merge() error {
func (db *Db) merge() error {
defer db.closeActiveMergeDataFilePointer()
err := filepath.WalkDir(db.dirPath, db.walk)
if err != nil {
Expand All @@ -784,3 +784,13 @@ func (db *Db) Merge() error {

return nil
}

func (db *Db) RunCompaction() error {
// TODO:
// 1. Compaction
// 2. HintFiles
if err := db.merge(); err != nil {
return err
}
return nil
}
2 changes: 1 addition & 1 deletion db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ func Test_Merge(t *testing.T) {
filesBeforeMerge, err := filepath.Glob(filepath.Join(opts.Path, "*"))
assert.Nil(t, err)

err = d.Merge()
err = d.RunCompaction()
assert.Nil(t, err)

filesAfterMerge, err := filepath.Glob(filepath.Join(opts.Path, "*"))
Expand Down
2 changes: 1 addition & 1 deletion examples/db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func main() {
}
fmt.Println(string(z))
case "merge":
d.Merge()
d.RunCompaction()
case "keyreader":
prefix := ""
d.KeyReader(prefix, func(k []byte) {
Expand Down

0 comments on commit 3c35f65

Please sign in to comment.