remove reduant maxBlockFilterNum; optimize commitToResponse

Author: 317787106

common/src/main/resources/reference.conf

@@ -380,27 +380,20 @@ node {
     httpPBFTEnable = false
     httpPBFTPort = 8565
 
-    # Maximum blocks range for eth_getLogs, >0 otherwise no limit
+    # The maximum blocks range to retrieve logs for eth_getLogs, default: 5000, <=0 means no limit
     maxBlockRange = 5000
-
-    # Maximum topics within a topic criteria, >0 otherwise no limit
+    # Allowed max address count in filter request, default: 1000, <=0 means no limit
+    maxAddressSize = 1000
+    # The maximum number of allowed topics within a topic criteria, default: 1000, <=0 means no limit
     maxSubTopics = 1000
-
-    # Maximum number for blockFilter. >0 otherwise no limit
+    # Allowed maximum number for blockFilter, default: 50000, <=0 means no limit
     maxBlockFilterNum = 50000
-
-    # Maximum number of requests in a JSON-RPC batch, >0 otherwise no limit
+    # Allowed batch size, default: 100, <=0 means no limit
     maxBatchSize = 100
-
-    # Maximum response body size in bytes for JSON-RPC (default 25MB), >0 otherwise no limit
+    # Allowed max response byte size, default: 26214400 (25 MB), <=0 means no limit
     maxResponseSize = 26214400
-
-    # Maximum number of addresses in a single JSON-RPC request, >0 otherwise no limit
-    maxAddressSize = 1000
-
-    # Maximum number of concurrent eth_newFilter registrations, >0 otherwise no limit
+    # Allowed maximum number for newFilter, <=0 means no limit
     maxLogFilterNum = 20000
-
     # Maximum JSON-RPC request body size, default 4MB. Independent from rpc.maxMessageSize.
     maxMessageSize = 4M
   }

framework/src/main/java/org/tron/core/services/filter/BufferedResponseWrapper.java

@@ -160,6 +160,13 @@ public void commitToResponse() throws IOException {
       throw new IllegalStateException("commitToResponse() already called");
     }
     committed = true;
+    // Flush the PrintWriter's OutputStreamWriter encoder into our ByteArrayOutputStream.
+    // PrintWriter(autoFlush=true) only auto-flushes on println/printf/format, not print/write,
+    // so bytes can remain buffered in the encoder until an explicit flush.
+    writer.flush();
+    if (overflow) {
+      return;
+    }
     if (contentType != null) {
       actual.setContentType(contentType);
     }

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

@@ -140,13 +140,12 @@ private void handleSingle(HttpServletRequest req, HttpServletResponse resp,
       return;
     }
 
+    bufferedResp.commitToResponse();
     if (bufferedResp.isOverflow()) {
       writeJsonRpcError(resp, JsonRpcError.RESPONSE_TOO_LARGE,
           "Response exceeds the limit of " + maxResponseSize + " bytes",
           rootNode.get("id"), false);
-      return;
     }
-    bufferedResp.commitToResponse();
   }
 
   private void handleBatch(HttpServletResponse resp, JsonNode rootNode, int maxResponseSize)

framework/src/main/resources/config.conf

@@ -400,10 +400,10 @@ node {
     maxBatchSize = 100
     # Allowed max response byte size, default: 26214400 (25 MB), <=0 means no limit
     maxResponseSize = 26214400
-    # Allowed maximum number for blockFilter, <=0 means no limit
-    maxBlockFilterNum = 50000
     # Allowed maximum number for newFilter, <=0 means no limit
     maxLogFilterNum = 20000
+    # Maximum JSON-RPC request body size, default 4MB. Independent from rpc.maxMessageSize.
+    maxMessageSize = 4M
   }
 
   # Disabled api list, it will work for http, rpc and pbft, both FullNode and SolidityNode,

framework/src/test/java/org/tron/core/services/filter/BufferedResponseWrapperTest.java

@@ -261,4 +261,27 @@ public void writeViaWriter_commitToResponse_flushesBody() throws IOException {
     w.commitToResponse();
     assertEquals("hello", mockResp.getContentAsString());
   }
+
+  @Test
+  public void writeViaWriter_noExplicitFlush_commitToResponse_flushesBody() throws IOException {
+    // Regression: PrintWriter(autoFlush=true) does NOT flush on plain print(); bytes can sit
+    // in the OutputStreamWriter encoder until commitToResponse() flushes the writer internally.
+    BufferedResponseWrapper w = new BufferedResponseWrapper(mockResp, 0);
+    w.getWriter().print("hello");
+    w.commitToResponse();
+    assertEquals("hello", mockResp.getContentAsString());
+    assertEquals(5, mockResp.getContentLength());
+  }
+
+  @Test
+  public void writeViaWriter_noExplicitFlush_flushTripsOverflow() throws IOException {
+    // Regression: bytes buffered in the encoder may push the total past maxBytes when
+    // commitToResponse() flushes — overflow must be detected and nothing written to actual.
+    BufferedResponseWrapper w = new BufferedResponseWrapper(mockResp, 3);
+    w.getWriter().print("hello"); // 5 bytes, not yet in ByteArrayOutputStream
+    assertFalse("overflow must not trigger before flush", w.isOverflow());
+    w.commitToResponse();
+    assertTrue("flush inside commitToResponse must trip overflow", w.isOverflow());
+    assertEquals(0, mockResp.getContentAsByteArray().length);
+  }
 }