Problem: code cleanup not backported (backport: #1215)

memiavl/db.go

@@ -20,6 +20,7 @@ import (
 const (
 	DefaultSnapshotInterval = 1000
 	LockFileName            = "LOCK"
+	TmpSuffix               = "-tmp"
 )
 
 var errReadOnly = errors.New("db is read-only")
@@ -259,7 +260,7 @@ func removeTmpDirs(rootDir string) error {
 	}
 
 	for _, entry := range entries {
-		if !entry.IsDir() || !strings.HasSuffix(entry.Name(), "-tmp") {
+		if !entry.IsDir() || !strings.HasSuffix(entry.Name(), TmpSuffix) {
 			continue
 		}
 
@@ -628,7 +629,7 @@ func (db *DB) RewriteSnapshot() error {
 	}
 
 	snapshotDir := snapshotName(db.lastCommitInfo.Version)
-	tmpDir := snapshotDir + "-tmp"
+	tmpDir := snapshotDir + TmpSuffix
 	path := filepath.Join(db.dir, tmpDir)
 	if err := db.MultiTree.WriteSnapshot(path); err != nil {
 		return errors.Join(err, os.RemoveAll(path))
@@ -835,7 +836,7 @@ func currentPath(root string) string {
 }
 
 func currentTmpPath(root string) string {
-	return filepath.Join(root, "current-tmp")
+	return currentPath(root) + TmpSuffix
 }
 
 func currentVersion(root string) (int64, error) {
@@ -981,7 +982,7 @@ func traverseSnapshots(dir string, ascending bool, callback func(int64) (bool, e
 
 // atomicRemoveDir is equavalent to `mv snapshot snapshot-tmp && rm -r snapshot-tmp`
 func atomicRemoveDir(path string) error {
-	tmpPath := path + "-tmp"
+	tmpPath := path + TmpSuffix
 	if err := os.Rename(path, tmpPath); err != nil {
 		return err
 	}

memiavl/db_test.go

@@ -45,7 +45,7 @@ func TestRemoveSnapshotDir(t *testing.T) {
 	defer os.RemoveAll(dbDir)
 
 	snapshotDir := filepath.Join(dbDir, snapshotName(0))
-	tmpDir := snapshotDir + "-tmp"
+	tmpDir := snapshotDir + TmpSuffix
 	if err := os.MkdirAll(tmpDir, os.ModePerm); err != nil {
 		t.Fatalf("Failed to create dummy snapshot directory: %v", err)
 	}

memiavl/import.go

@@ -25,7 +25,7 @@ func Import(
 		return snapshottypes.SnapshotItem{}, fmt.Errorf("version overflows uint32: %d", height)
 	}
 	snapshotDir := snapshotName(int64(height))
-	tmpDir := snapshotDir + "-tmp"
+	tmpDir := snapshotDir + TmpSuffix
 
 	var fileLock FileLock
 	fileLock, err = LockFile(filepath.Join(dir, LockFileName))