Merge da1f872 into 99310d4

apache · Mar 23, 2020 · c06edf1 · c06edf1
2 parents 99310d4 + da1f872
commit c06edf1
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -133,7 +133,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
   private static final int DELETE_SIZE = 50;
   private static final String ERROR_PARSING_SQL =
       "meet error while parsing SQL to physical plan: {}";
-  public static Vector<SqlArgument> sqlArgumentsList = new Vector<>();
+  public static final Vector<SqlArgument> sqlArgumentsList = new Vector<>();
 
   protected Planner processor;
   protected IPlanExecutor executor;
@@ -508,9 +508,11 @@ public TSExecuteStatementResp executeStatement(TSExecuteStatementReq req) {
                 sessionIdUsernameMap.get(req.getSessionId()));
         long endTime = System.currentTimeMillis();
         sqlArgument = new SqlArgument(resp, physicalPlan, statement, startTime, endTime);
-        sqlArgumentsList.add(sqlArgument);
-        if (sqlArgumentsList.size() > MAX_SIZE) {
-          sqlArgumentsList.subList(0, DELETE_SIZE).clear();
+        synchronized (sqlArgumentsList) {
+          sqlArgumentsList.add(sqlArgument);
+          if (sqlArgumentsList.size() > MAX_SIZE) {
+            sqlArgumentsList.subList(0, DELETE_SIZE).clear();
+          }
         }
         return resp;
       } else {
@@ -567,9 +569,11 @@ public TSExecuteStatementResp executeQueryStatement(TSExecuteStatementReq req) {
           sessionIdUsernameMap.get(req.getSessionId()));
       long endTime = System.currentTimeMillis();
       sqlArgument = new SqlArgument(resp, physicalPlan, statement, startTime, endTime);
-      sqlArgumentsList.add(sqlArgument);
-      if (sqlArgumentsList.size() > MAX_SIZE) {
-        sqlArgumentsList.subList(0, DELETE_SIZE).clear();
+      synchronized (sqlArgumentsList) {
+        sqlArgumentsList.add(sqlArgument);
+        if (sqlArgumentsList.size() > MAX_SIZE) {
+          sqlArgumentsList.subList(0, DELETE_SIZE).clear();
+        }
       }
       return resp;
     } catch (ParseCancellationException e) {