#30 remove useless flag from prepared statement

Blynk-Technologies · Sep 8, 2019 · 5b4017f · 5b4017f
1 parent 39fe2c6
commit 5b4017f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/src/main/java/cc/blynk/clickhouse/ClickHousePreparedStatementImpl.java b/src/main/java/cc/blynk/clickhouse/ClickHousePreparedStatementImpl.java
@@ -54,7 +54,6 @@ public final class ClickHousePreparedStatementImpl extends ClickHouseStatementIm
     private final List<String> sqlParts;
     private final ClickHousePreparedStatementParameter[] binds;
     private final String[][] parameterList;
-    private final boolean insertBatchMode;
     private List<byte[]> batchRows = new ArrayList<>();
 
     ClickHousePreparedStatementImpl(HttpConnector connector,
@@ -67,7 +66,6 @@ public final class ClickHousePreparedStatementImpl extends ClickHouseStatementIm
         this.sql = sql;
         PreparedStatementParser parser = PreparedStatementParser.parse(sql);
         this.parameterList = parser.getParameters();
-        this.insertBatchMode = parser.isValuesMode();
         this.sqlParts = parser.getParts();
         int numParams = countNonConstantParams();
         this.binds = new ClickHousePreparedStatementParameter[numParams];
@@ -307,11 +305,7 @@ public void addBatch() throws SQLException {
                 String batchVal = batchParams[j];
                 if (PARAM_MARKER.equals(batchVal)) {
                     ClickHousePreparedStatementParameter param = binds[p++];
-                    if (insertBatchMode) {
-                        batchVal = param.getBatchValue();
-                    } else {
-                        batchVal = param.getRegularValue();
-                    }
+                    batchVal = param.getBatchValue();
                 }
                 sb.append(batchVal);
                 char appendChar = j < batchParamsLength - 1 ? '\t' : '\n';

diff --git a/src/main/java/cc/blynk/clickhouse/PreparedStatementParser.java b/src/main/java/cc/blynk/clickhouse/PreparedStatementParser.java
@@ -20,12 +20,10 @@ final class PreparedStatementParser {
 
     private final List<List<String>> parameters;
     private final List<String> parts;
-    private boolean valuesMode;
 
     private PreparedStatementParser() {
         parameters = new ArrayList<>();
         parts = new ArrayList<>();
-        valuesMode = false;
     }
 
     static PreparedStatementParser parse(String sql) {
@@ -50,14 +48,9 @@ List<String> getParts() {
         return Collections.unmodifiableList(parts);
     }
 
-    boolean isValuesMode() {
-        return valuesMode;
-    }
-
     private void reset() {
         parameters.clear();
         parts.clear();
-        valuesMode = false;
     }
 
     private void parseSQL(String sql) {
@@ -70,9 +63,7 @@ private void parseSQL(String sql) {
         boolean inMultiLineComment = false;
         boolean whiteSpace = false;
         Matcher matcher = VALUES.matcher(sql);
-        if (matcher.find()) {
-            valuesMode = true;
-        }
+        boolean valuesMode = matcher.find();
         int currentParensLevel = 0;
         int quotedStart = 0;
         int partStart = 0;

diff --git a/src/test/java/cc/blynk/clickhouse/PreparedStatementParserTest.java b/src/test/java/cc/blynk/clickhouse/PreparedStatementParserTest.java
@@ -5,7 +5,6 @@
 
 import java.util.List;
 
-import static org.testng.Assert.assertTrue;
 import static org.testng.AssertJUnit.assertEquals;
 
 
@@ -410,7 +409,6 @@ public void testMultiLineValues() {
           + "\t\tVALUES\n"
           + "(?, ?) , \r\n"
           + "\t(?,?),(?,?)\n");
-        assertTrue(s.isValuesMode());
         assertMatchParams(new String[][] {{"?", "?"}, {"?", "?"}, {"?", "?"}}, s);
         assertEquals(s.getParts().get(0),
             "INSERT INTO table1\n"