Problem: batch initialization when fixdata with dry-run is unnecessary (crypto-org-chain#1747)

mmsqe · mmsqe · commit 244cbc53e246 · 2025-02-18T09:08:07.000+08:00
* Problem: need batch initialization run fixdata with dry-run

* mod tidy

* skip flush
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,7 @@
 ### Improvements
 
 * [#1712](https://github.com/crypto-org-chain/cronos/pull/1712) Upgrade rocksdb to `v9.8.4`.
+* [#1747](https://github.com/crypto-org-chain/cronos/pull/1747) Skip batch initialization and flush when fixdata with dry-run.
 
 *Dec 2, 2024*
 
diff --git a/go.mod b/go.mod
@@ -56,7 +56,7 @@ require (
 	cloud.google.com/go/storage v1.41.0 // indirect
 	cosmossdk.io/collections v0.4.0 // indirect
 	cosmossdk.io/depinject v1.0.0 // indirect
-	cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871 // indirect
+	cosmossdk.io/x/tx v0.13.7 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
diff --git a/gomod2nix.toml b/gomod2nix.toml
diff --git a/versiondb/tsrocksdb/store.go b/versiondb/tsrocksdb/store.go
@@ -241,7 +241,9 @@ func (s Store) FixData(storeNames []string, dryRun bool) error {
 			return err
 		}
 	}
-
+	if dryRun {
+		return nil
+	}
 	return s.Flush()
 }
 
@@ -252,8 +254,11 @@ func (s Store) fixDataStore(storeName string, dryRun bool) error {
 		return err
 	}
 
-	batch := grocksdb.NewWriteBatch()
-	defer batch.Destroy()
+	var batch *grocksdb.WriteBatch
+	if !dryRun {
+		batch = grocksdb.NewWriteBatch()
+		defer batch.Destroy()
+	}
 
 	prefix := storePrefix(storeName)
 	readOpts := grocksdb.NewDefaultReadOptions()

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,9 @@ func (s Store) FixData(storeNames []string, dryRun bool) error {`
`241`	`241`	`return err`
`242`	`242`	`}`
`243`	`243`	`}`
`244`		`-`
	`244`	`+ if dryRun {`
	`245`	`+ return nil`
	`246`	`+ }`
`245`	`247`	`return s.Flush()`
`246`	`248`	`}`
`247`	`249`
`@@ -252,8 +254,11 @@ func (s Store) fixDataStore(storeName string, dryRun bool) error {`
`252`	`254`	`return err`
`253`	`255`	`}`
`254`	`256`
`255`		`- batch := grocksdb.NewWriteBatch()`
`256`		`- defer batch.Destroy()`
	`257`	`+ var batch *grocksdb.WriteBatch`
	`258`	`+ if !dryRun {`
	`259`	`+ batch = grocksdb.NewWriteBatch()`
	`260`	`+ defer batch.Destroy()`
	`261`	`+ }`
`257`	`262`
`258`	`263`	`prefix := storePrefix(storeName)`
`259`	`264`	`readOpts := grocksdb.NewDefaultReadOptions()`