close rocksdb transaction correctly with bonsai (#9467)

Signed-off-by: Karim Taam <[email protected]>

Author: matkt

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/pathbased/bonsai/storage/BonsaiWorldStateKeyValueStorage.java

@@ -322,11 +322,13 @@ public void commit() {
     @Override
     public void commitTrieLogOnly() {
       trieLogStorageTransaction.commit();
+      composedWorldStateTransaction.close();
     }
 
     @Override
     public void commitComposedOnly() {
       composedWorldStateTransaction.commit();
+      trieLogStorageTransaction.close();
     }
 
     @Override

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/pathbased/common/worldview/PathBasedWorldState.java

@@ -318,6 +318,11 @@ public void commit() throws StorageException {
         public void rollback() {
           // no-op
         }
+
+        @Override
+        public void close() {
+          // no-op
+        }
       };
 
   protected static final SegmentedKeyValueStorageTransaction noOpSegmentedTx =
@@ -343,6 +348,11 @@ public void commit() throws StorageException {
         public void rollback() {
           // no-op
         }
+
+        @Override
+        public void close() {
+          // no-op
+        }
       };
 
   public Hash blockHash() {

plugin-api/build.gradle

@@ -71,7 +71,7 @@ Calculated : ${currentHash}
 tasks.register('checkAPIChanges', FileStateChecker) {
   description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
   files = sourceSets.main.allJava.files
-  knownHash = 'IzrtFU4/tJOlP/uzYA0e2/JA2029pinh32givR4HSbA='
+  knownHash = 'ACVfXtQZDPbvDrHz43Rigj8ZLzph7Pnp0q8z11gzpjA='
 }
 check.dependsOn('checkAPIChanges')
 

plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageTransaction.java

@@ -48,4 +48,7 @@ public interface KeyValueStorageTransaction {
 
   /** Reset the transaction to a state prior to any operations being queued. */
   void rollback();
+
+  /** close the transaction */
+  void close();
 }

plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SegmentedKeyValueStorageTransaction.java

@@ -52,4 +52,7 @@ public interface SegmentedKeyValueStorageTransaction {
 
   /** Reset the transaction to a state prior to any operations being queued. */
   void rollback();
+
+  /** close the transaction */
+  void close();
 }

plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBTransaction.java

@@ -114,7 +114,8 @@ public void rollback() {
     }
   }
 
-  private void close() {
+  @Override
+  public void close() {
     innerTx.close();
     options.close();
   }

plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueSnapshot.java

@@ -297,5 +297,10 @@ public void commit() throws StorageException {
         public void rollback() {
           // no-op
         }
+
+        @Override
+        public void close() {
+          // no-op
+        }
       };
 }

services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/KeyValueStorageTransactionValidatorDecorator.java

@@ -69,4 +69,12 @@ public final void rollback() {
     active = false;
     transaction.rollback();
   }
+
+  @Override
+  public void close() {
+    checkState(active, "Cannot close a completed transaction.");
+    checkState(!isClosed.get(), "Cannot invoke close() on a closed storage.");
+    active = false;
+    transaction.close();
+  }
 }

services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorage.java

@@ -195,6 +195,11 @@ public void commit() throws StorageException {
 
     @Override
     public void rollback() {
+      close();
+    }
+
+    @Override
+    public void close() {
       updatedValues.clear();
       removedKeys.clear();
     }

services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedInMemoryKeyValueStorage.java

@@ -388,6 +388,11 @@ public void commit() throws StorageException {
 
     @Override
     public void rollback() {
+      close();
+    }
+
+    @Override
+    public void close() {
       updatedValues.clear();
       removedKeys.clear();
     }