Cache empty slots (hyperledger#4874)

* Cache empty slots. Signed-off-by: Ameziane H <[email protected]> * clear after each block and copy during clone Signed-off-by: Karim TAAM <[email protected]> * add changelog Signed-off-by: Ameziane H <[email protected]> * Avoid triggering a calculate root hash when empty slot cache is not empty. Signed-off-by: Ameziane H <[email protected]> Signed-off-by: Ameziane H <[email protected]> Signed-off-by: Karim TAAM <[email protected]> Signed-off-by: ahamlat <[email protected]> Signed-off-by: Simon Dudley <[email protected]> Co-authored-by: Karim TAAM <[email protected]>
jflo · Feb 7, 2023 · 34ea399 · 34ea399
1 parent c015567
commit 34ea399
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/...reum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java b/...reum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java
@@ -55,6 +55,7 @@ public class BonsaiWorldStateUpdater extends AbstractWorldUpdater<BonsaiWorldVie
   private final Consumer<Hash> storagePreloader;
   private final Map<Address, BonsaiValue<Bytes>> codeToUpdate = new ConcurrentHashMap<>();
   private final Set<Address> storageToClear = Collections.synchronizedSet(new HashSet<>());
+  private final Set<Bytes> emptySlot = Collections.synchronizedSet(new HashSet<>());
 
   // storage sub mapped by _hashed_ key.  This is because in self_destruct calls we need to
   // enumerate the old storage and delete it.  Those are trie stored by hashed key by spec and the
@@ -90,6 +91,7 @@ void cloneFromUpdater(final BonsaiWorldStateUpdater source) {
     storageToUpdate.putAll(source.storageToUpdate);
     updatedAccounts.putAll(source.updatedAccounts);
     deletedAccounts.addAll(source.deletedAccounts);
+    emptySlot.addAll(source.emptySlot);
   }
 
   @Override
@@ -352,18 +354,26 @@ public Optional<UInt256> getStorageValueBySlotHash(final Address address, final
         return Optional.ofNullable(value.getUpdated());
       }
     }
-    final Optional<UInt256> valueUInt =
-        wrappedWorldView().getStorageValueBySlotHash(address, slotHash);
-    valueUInt.ifPresent(
-        v ->
-            storageToUpdate
-                .computeIfAbsent(
-                    address,
-                    key ->
-                        new StorageConsumingMap<>(
-                            address, new ConcurrentHashMap<>(), storagePreloader))
-                .put(slotHash, new BonsaiValue<>(v, v)));
-    return valueUInt;
+    final Bytes slot = Bytes.concatenate(Hash.hash(address), slotHash);
+    if (emptySlot.contains(slot)) {
+      return Optional.empty();
+    } else {
+      final Optional<UInt256> valueUInt =
+          wrappedWorldView().getStorageValueBySlotHash(address, slotHash);
+      valueUInt.ifPresentOrElse(
+          v ->
+              storageToUpdate
+                  .computeIfAbsent(
+                      address,
+                      key ->
+                          new StorageConsumingMap<>(
+                              address, new ConcurrentHashMap<>(), storagePreloader))
+                  .put(slotHash, new BonsaiValue<>(v, v)),
+          () -> {
+            emptySlot.add(Bytes.concatenate(Hash.hash(address), slotHash));
+          });
+      return valueUInt;
+    }
   }
 
   @Override
@@ -706,6 +716,7 @@ public void reset() {
     storageToUpdate.clear();
     codeToUpdate.clear();
     accountsToUpdate.clear();
+    emptySlot.clear();
     super.reset();
   }