optimize FilterTriggerCapsule

Author: 317787106

common/src/main/java/org/tron/common/es/ExecutorServiceManager.java

@@ -39,11 +39,16 @@ public static ScheduledExecutorService newSingleThreadScheduledExecutor(String n
   }
 
   public static ForkJoinPool newForkJoinPool(String name, int parallelism) {
+    return newForkJoinPool(name, parallelism, false);
+  }
+
+  public static ForkJoinPool newForkJoinPool(String name, int parallelism, boolean isDaemon) {
     AtomicInteger counter = new AtomicInteger(0);
     ForkJoinPool.ForkJoinWorkerThreadFactory factory = pool -> {
       ForkJoinWorkerThread thread =
           ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
       thread.setName(name + "-" + counter.getAndIncrement());
+      thread.setDaemon(isDaemon);
       return thread;
     };
     return new ForkJoinPool(parallelism, factory, null, false);

framework/src/main/java/org/tron/common/logsfilter/capsule/FilterTriggerCapsule.java

@@ -1,8 +1,5 @@
 package org.tron.common.logsfilter.capsule;
 
-public class FilterTriggerCapsule extends TriggerCapsule {
+public class FilterTriggerCapsule {
 
-  public void processFilterTrigger() {
-    throw new UnsupportedOperationException();
-  }
 }

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

@@ -14,6 +14,7 @@
 import static org.tron.core.services.jsonrpc.JsonRpcApiUtil.triggerCallContract;
 
 import com.alibaba.fastjson.JSON;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.protobuf.ByteString;
@@ -34,7 +35,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 import lombok.Getter;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.bouncycastle.util.encoders.Hex;
@@ -169,7 +169,6 @@ public enum RequestSource {
   private static final String NO_BLOCK_HEADER_BY_HASH = "header for hash not found";
 
   private static final String ERROR_SELECTOR = "08c379a0"; // Function selector for Error(string)
-  @Setter
   private int filterParallelThreshold = 10000;
   /**
    * Using the default maxLogFilterNum of 20,000, a 3-thread pool can keep up with log event
@@ -184,7 +183,6 @@ public enum RequestSource {
   private final ExecutorService sectionExecutor;
   private final NodeInfoService nodeInfoService;
   private final Wallet wallet;
-  @Setter
   @Autowired
   private Manager manager;
   private final String esName = "query-section";
@@ -196,6 +194,16 @@ public TronJsonRpcImpl(@Autowired NodeInfoService nodeInfoService, @Autowired Wa
     this.sectionExecutor = ExecutorServiceManager.newFixedThreadPool(esName, 5);
   }
 
+  @VisibleForTesting
+  public void setManager(Manager manager) {
+    this.manager = manager;
+  }
+
+  @VisibleForTesting
+  public void setFilterParallelThreshold(int filterParallelThreshold) {
+    this.filterParallelThreshold = filterParallelThreshold;
+  }
+
   public void handleBLockFilter(BlockFilterCapsule blockFilterCapsule) {
     Iterator<Entry<String, BlockFilterAndResult>> it;
 
@@ -1434,6 +1442,7 @@ public String newFilter(FilterRequest fr) throws JsonRpcInvalidParamsException,
     } else {
       eventFilter2Result = eventFilter2ResultSolidity;
     }
+    // Due to concurrent access, the threshold may occasionally be exceeded.
     if (maxLogFilterNum > 0 && eventFilter2Result.size() >= maxLogFilterNum) {
       throw new JsonRpcExceedLimitException(
           "exceed max log filters: " + maxLogFilterNum + ", try again later");

framework/src/test/java/org/tron/common/logsfilter/FilterQueryTest.java

@@ -21,7 +21,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.tron.common.logsfilter.capsule.ContractEventTriggerCapsule;
-import org.tron.common.logsfilter.capsule.FilterTriggerCapsule;
 import org.tron.common.logsfilter.capsule.TriggerCapsule;
 import org.tron.common.runtime.LogEventWrapper;
 import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI.Entry;
@@ -103,13 +102,6 @@ public synchronized void testMatchFilter() {
       assertNotNull(filterQuery.toString());
     }
 
-    FilterTriggerCapsule filterTriggerCapsule = new FilterTriggerCapsule();
-    try {
-      filterTriggerCapsule.processFilterTrigger();
-    } catch (Exception e) {
-      logger.info(e.getMessage());
-    }
-
     TriggerCapsule triggerCapsule = new TriggerCapsule();
     try {
       triggerCapsule.processTrigger();

framework/src/test/java/org/tron/core/jsonrpc/LogMatchOverLimitTest.java

@@ -118,7 +118,7 @@ public void testAtExactLimit_succeeds()
    * {@link JsonRpcTooManyResultException} is thrown BEFORE {@code addAll}.
    */
   @Test
-  public void testExceedsLimit_throwsBeforeAddAll()
+  public void testExceedsLimit_throws()
       throws ItemNotFoundException, JsonRpcInvalidParamsException {
     // block 1: MAX_RESULT - 1 logs, block 2: 2 logs → 9999 + 2 = 10001 > MAX_RESULT
     Manager manager = buildMockManager(

framework/src/test/java/org/tron/core/jsonrpc/WalletCursorTest.java

@@ -27,6 +27,7 @@
 
 @Slf4j
 public class WalletCursorTest extends BaseTest {
+
   private static final String OWNER_ADDRESS;
   private static final String OWNER_ADDRESS_ACCOUNT_NAME = "first";
   @Resource
@@ -36,7 +37,7 @@ public class WalletCursorTest extends BaseTest {
   private static boolean init;
 
   static {
-    Args.setParam(new String[]{"--output-directory", dbPath()}, TestConstants.TEST_CONF);
+    Args.setParam(new String[] {"--output-directory", dbPath()}, TestConstants.TEST_CONF);
 
     OWNER_ADDRESS =
         Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc";
@@ -160,6 +161,7 @@ public void testEnableInFullNode() {
   @Test
   public void testNewFilter_exceedsCapThrowsException() throws Exception {
     int cap = 5;
+    int saved = Args.getInstance().getJsonRpcMaxLogFilterNum();
     Args.getInstance().setJsonRpcMaxLogFilterNum(cap);
     FilterRequest fr = new FilterRequest();
     TronJsonRpcImpl tronJsonRpc = new TronJsonRpcImpl(nodeInfoService, wallet);
@@ -183,6 +185,7 @@ public void testNewFilter_exceedsCapThrowsException() throws Exception {
       }
     } finally {
       tronJsonRpc.close();
+      Args.getInstance().setJsonRpcMaxLogFilterNum(saved);
     }
   }