add log Cache to decrese memory occupy of eth_newFilter

Author: 317787106

framework/src/main/java/org/tron/core/services/jsonrpc/TronJsonRpc.java

@@ -7,6 +7,7 @@
 import com.googlecode.jsonrpc4j.JsonRpcMethod;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -23,6 +24,7 @@
 import org.tron.core.exception.jsonrpc.JsonRpcInvalidRequestException;
 import org.tron.core.exception.jsonrpc.JsonRpcMethodNotFoundException;
 import org.tron.core.exception.jsonrpc.JsonRpcTooManyResultException;
+import org.tron.core.net.peer.Item;
 import org.tron.core.services.jsonrpc.types.BlockResult;
 import org.tron.core.services.jsonrpc.types.BuildArguments;
 import org.tron.core.services.jsonrpc.types.CallArguments;
@@ -472,5 +474,39 @@ public LogFilterElement(String blockHash, Long blockNum, String txId, Integer tx
       }
       this.removed = removed;
     }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || this.getClass() != o.getClass()) {
+        return false;
+      }
+      LogFilterElement item = (LogFilterElement) o;
+      if (!Objects.equals(blockHash, item.blockHash)) {
+        return false;
+      }
+      if (!Objects.equals(transactionHash, item.transactionHash)) {
+        return false;
+      }
+      if (!Objects.equals(transactionIndex, item.transactionIndex)) {
+        return false;
+      }
+      if (!Objects.equals(logIndex, item.logIndex)) {
+        return false;
+      }
+      return removed == item.removed;
+    }
+
+    @Override
+    public int hashCode() {
+      int result = blockHash != null ? blockHash.hashCode() : 0;
+      result = 31 * result + (transactionHash != null ? transactionHash.hashCode() : 0);
+      result = 31 * result + (transactionIndex != null ? transactionIndex.hashCode() : 0);
+      result = 31 * result + (logIndex != null ? logIndex.hashCode() : 0);
+      return result + (removed ? 1 : 0);
+    }
+
   }
 }

framework/src/main/java/org/tron/core/services/jsonrpc/TronJsonRpcImpl.java

@@ -11,6 +11,8 @@
 import static org.tron.core.services.jsonrpc.JsonRpcApiUtil.triggerCallContract;
 
 import com.alibaba.fastjson.JSON;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.GeneratedMessageV3;
 import java.io.Closeable;
@@ -25,10 +27,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.bouncycastle.util.encoders.Hex;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -110,6 +112,10 @@ public enum RequestSource {
 
   private static final String FILTER_NOT_FOUND = "filter not found";
   public static final int EXPIRE_SECONDS = 5 * 60;
+  private static final Cache<Integer, LogFilterElement> logElementCache = CacheBuilder.newBuilder()
+      .maximumSize(100_000L)
+      .expireAfterWrite(EXPIRE_SECONDS, TimeUnit.SECONDS)
+      .recordStats().build(); //LRU cache
   /**
    * for log filter in Full Json-RPC
    */
@@ -165,7 +171,7 @@ public enum RequestSource {
 
   @Autowired
   public TronJsonRpcImpl(@Autowired NodeInfoService nodeInfoService, @Autowired Wallet wallet,
-                         @Autowired Manager manager) {
+      @Autowired Manager manager) {
     this.nodeInfoService = nodeInfoService;
     this.wallet = wallet;
     this.manager = manager;
@@ -191,6 +197,9 @@ public static void handleBLockFilter(BlockFilterCapsule blockFilterCapsule) {
     }
   }
 
+  /**
+   * append LogsFilterCapsule's LogFilterElement list to each filter if matched
+   */
   public static void handleLogsFilter(LogsFilterCapsule logsFilterCapsule) {
     Iterator<Entry<String, LogFilterAndResult>> it;
 
@@ -226,8 +235,15 @@ public static void handleLogsFilter(LogsFilterCapsule logsFilterCapsule) {
           LogMatch.matchBlock(logFilter, logsFilterCapsule.getBlockNumber(),
               logsFilterCapsule.getBlockHash(), logsFilterCapsule.getTxInfoList(),
               logsFilterCapsule.isRemoved());
-      if (CollectionUtils.isNotEmpty(elements)) {
-        logFilterAndResult.getResult().addAll(elements);
+
+      for (LogFilterElement element : elements) {
+        LogFilterElement newElement;
+        try {
+          newElement = logElementCache.get(element.hashCode(), () -> element);
+        } catch (ExecutionException e) {
+          continue;
+        }
+        logFilterAndResult.getResult().add(newElement);
       }
     }
   }
@@ -797,7 +813,7 @@ public TransactionReceipt getTransactionReceipt(String txId)
     long blockNum = blockCapsule.getNum();
     TransactionInfoList transactionInfoList = wallet.getTransactionInfoByBlockNum(blockNum);
     long energyFee = wallet.getEnergyFee(blockCapsule.getTimeStamp());
-    
+
     // Find transaction context
     TransactionReceipt.TransactionContext context
         = findTransactionContext(transactionInfoList,
@@ -806,7 +822,7 @@ public TransactionReceipt getTransactionReceipt(String txId)
     if (context == null) {
       return null; // Transaction not found in block
     }
-    
+
     return new TransactionReceipt(blockCapsule, transactionInfo, context, energyFee);
   }