From da1f872cd5cdb19397e42b83908571cf1fbd5793 Mon Sep 17 00:00:00 2001
From: qiaojialin <646274302@qq.com>
Date: Mon, 23 Mar 2020 09:31:58 +0800
Subject: [PATCH] fix sqlArgumentsList concurrent modification error

---
 .../apache/iotdb/db/service/TSServiceImpl.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 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
index a8afa574c4ce..ec55f5da3c09 100644
--- 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) {