Merge pull request #4703 from guoquanwu/fix/db-recover-wrong-deletion

tomatoishealthy · web-flow · commit 161e4ca75185 · 2022-10-09T16:49:51.000+08:00
fix(db): reserve putting byte[0] in db recovery
diff --git a/chainbase/src/main/java/org/tron/core/db2/core/SnapshotManager.java b/chainbase/src/main/java/org/tron/core/db2/core/SnapshotManager.java
@@ -530,7 +530,12 @@ private void recover(TronDatabase<byte[]> tronDatabase) {
       if (realValue != null) {
         dbMap.get(db).getHead().put(realKey, realValue);
       } else {
-        dbMap.get(db).getHead().remove(realKey);
+        byte op = value[0];
+        if (Value.Operator.DELETE.getValue() == op) {
+          dbMap.get(db).getHead().remove(realKey);
+        } else {
+          dbMap.get(db).getHead().put(realKey, new byte[0]);
+        }
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,12 @@ private void recover(TronDatabase<byte[]> tronDatabase) {`
`530`	`530`	`if (realValue != null) {`
`531`	`531`	`dbMap.get(db).getHead().put(realKey, realValue);`
`532`	`532`	`} else {`
`533`		`- dbMap.get(db).getHead().remove(realKey);`
	`533`	`+ byte op = value[0];`
	`534`	`+ if (Value.Operator.DELETE.getValue() == op) {`
	`535`	`+ dbMap.get(db).getHead().remove(realKey);`
	`536`	`+ } else {`
	`537`	`+ dbMap.get(db).getHead().put(realKey, new byte[0]);`
	`538`	`+ }`
`534`	`539`	`}`
`535`	`540`	`}`
`536`	`541`