cleanup

crypto-org-chain · Nov 11, 2024 · 9711b73 · 9711b73
1 parent 9711730
commit 9711b73
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 86 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Bug Fixes
 
 * [#1679](https://github.com/crypto-org-chain/cronos/pull/1679) Include no trace detail on insufficient balance fix.
+* [#1685](https://github.com/crypto-org-chain/cronos/pull/1685) Fix versiondb corrupted data on startup.
 
 ### Improvements
 

diff --git a/app/versiondb.go b/app/versiondb.go
@@ -35,6 +35,7 @@ func (app *App) setupVersionDB(
 		return nil, err
 	}
 
+	// see: https://github.com/crypto-org-chain/cronos/issues/1683
 	if err := versionDB.FixData(exposedKeys); err != nil {
 		return nil, err
 	}

diff --git a/versiondb/client/cmd.go b/versiondb/client/cmd.go
@@ -28,7 +28,6 @@ func ChangeSetGroupCmd(opts Options) *cobra.Command {
 		ChangeSetToVersionDBCmd(),
 		RestoreAppDBCmd(opts),
 		RestoreVersionDBCmd(),
-		FixDataCmd(),
 	)
 	return cmd
 }
diff --git a/versiondb/client/fixdata.go b/versiondb/client/fixdata.go
diff --git a/versiondb/tsrocksdb/store.go b/versiondb/tsrocksdb/store.go
@@ -257,6 +257,7 @@ func (s Store) fixDataStore(name string) error {
 	batch := grocksdb.NewWriteBatch()
 	defer batch.Destroy()
 
+	prefix := storePrefix(name)
 	for ; iter.Valid(); iter.Next() {
 		key := iter.Key()
 		if len(key) < TimestampSize {
@@ -280,8 +281,7 @@ func (s Store) fixDataStore(name string) error {
 			continue
 		}
 
-		fmt.Println("[debug] fix key", string(key), "ts", binary.LittleEndian.Uint64(ts))
-		batch.PutCFWithTS(s.cfHandle, key, ts, iter.Value())
+		batch.PutCFWithTS(s.cfHandle, cloneAppend(prefix, key), ts, iter.Value())
 	}
 
 	return s.db.Write(defaultSyncWriteOpts, batch)