for #701: remove parameters count dependency from route API

apache · Apr 5, 2018 · 41999da · 41999da
1 parent 48c51dd
commit 41999da
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 24 deletions.
diff --git a/...ore/src/main/java/io/shardingjdbc/core/parsing/parser/sql/dml/insert/InsertStatement.java b/...ore/src/main/java/io/shardingjdbc/core/parsing/parser/sql/dml/insert/InsertStatement.java
@@ -67,9 +67,8 @@ public final class InsertStatement extends DMLStatement {
      * Append generate key token.
      *
      * @param shardingRule databases and tables sharding rule
-     * @param parametersSize parameters size
      */
-    public void appendGenerateKeyToken(final ShardingRule shardingRule, final int parametersSize) {
+    public void appendGenerateKeyToken(final ShardingRule shardingRule) {
         if (null != generatedKey) {
             return;
         }
@@ -82,26 +81,22 @@ public void appendGenerateKeyToken(final ShardingRule shardingRule, final int pa
             return;
         }
         ItemsToken valuesToken = new ItemsToken(generatedKeysToken.get().getBeginPosition());
-        if (0 == parametersSize) {
-            appendGenerateKeyToken(shardingRule, tableRule.get(), valuesToken);
-        } else {
-            appendGenerateKeyToken(shardingRule, tableRule.get(), valuesToken, parametersSize);
-        }
+        appendGenerateKeyToken(shardingRule, tableRule.get(), valuesToken);
         getSqlTokens().remove(generatedKeysToken.get());
         getSqlTokens().add(valuesToken);
     }
 
     private void appendGenerateKeyToken(final ShardingRule shardingRule, final TableRule tableRule, final ItemsToken valuesToken) {
-        Number generatedKey = shardingRule.generateKey(tableRule.getLogicTable());
-        valuesToken.getItems().add(generatedKey.toString());
-        getConditions().add(new Condition(new Column(tableRule.getGenerateKeyColumn(), tableRule.getLogicTable()), new SQLNumberExpression(generatedKey)), shardingRule);
-        this.generatedKey = new GeneratedKey(tableRule.getLogicTable(), -1, generatedKey);
-    }
-
-    private void appendGenerateKeyToken(final ShardingRule shardingRule, final TableRule tableRule, final ItemsToken valuesToken, final int parametersSize) {
-        valuesToken.getItems().add(Symbol.QUESTION.getLiterals());
-        getConditions().add(new Condition(new Column(tableRule.getGenerateKeyColumn(), tableRule.getLogicTable()), new SQLPlaceholderExpression(parametersSize)), shardingRule);
-        generatedKey = new GeneratedKey(tableRule.getGenerateKeyColumn(), parametersSize, null);
+        if (0 == getParametersIndex()) {
+            Number generatedKey = shardingRule.generateKey(tableRule.getLogicTable());
+            valuesToken.getItems().add(generatedKey.toString());
+            getConditions().add(new Condition(new Column(tableRule.getGenerateKeyColumn(), tableRule.getLogicTable()), new SQLNumberExpression(generatedKey)), shardingRule);
+            this.generatedKey = new GeneratedKey(tableRule.getLogicTable(), -1, generatedKey);
+        } else {
+            valuesToken.getItems().add(Symbol.QUESTION.getLiterals());
+            getConditions().add(new Condition(new Column(tableRule.getGenerateKeyColumn(), tableRule.getLogicTable()), new SQLPlaceholderExpression(getParametersIndex())), shardingRule);
+            generatedKey = new GeneratedKey(tableRule.getGenerateKeyColumn(), getParametersIndex(), null);
+        }
     }
 
     private Optional<GeneratedKeyToken> findGeneratedKeyToken() {

diff --git a/sharding-core/src/main/java/io/shardingjdbc/core/routing/PreparedStatementRoutingEngine.java b/sharding-core/src/main/java/io/shardingjdbc/core/routing/PreparedStatementRoutingEngine.java
@@ -53,7 +53,7 @@ public PreparedStatementRoutingEngine(final String logicSQL, final ShardingRule
      */
     public SQLRouteResult route(final List<Object> parameters) {
         if (null == sqlStatement) {
-            sqlStatement = sqlRouter.parse(logicSQL, parameters.size());
+            sqlStatement = sqlRouter.parse(logicSQL);
         }
         return sqlRouter.route(logicSQL, parameters, sqlStatement);
     }

diff --git a/sharding-core/src/main/java/io/shardingjdbc/core/routing/StatementRoutingEngine.java b/sharding-core/src/main/java/io/shardingjdbc/core/routing/StatementRoutingEngine.java
@@ -45,7 +45,7 @@ public StatementRoutingEngine(final ShardingRule shardingRule, final DatabaseTyp
      * @return route result
      */
     public SQLRouteResult route(final String logicSQL) {
-        SQLStatement sqlStatement = sqlRouter.parse(logicSQL, 0);
+        SQLStatement sqlStatement = sqlRouter.parse(logicSQL);
         return sqlRouter.route(logicSQL, Collections.emptyList(), sqlStatement);
     }
 }
diff --git a/sharding-core/src/main/java/io/shardingjdbc/core/routing/router/DatabaseHintSQLRouter.java b/sharding-core/src/main/java/io/shardingjdbc/core/routing/router/DatabaseHintSQLRouter.java
@@ -44,7 +44,7 @@ public final class DatabaseHintSQLRouter implements SQLRouter {
     private final boolean showSQL;
 
     @Override
-    public SQLStatement parse(final String logicSQL, final int parametersSize) {
+    public SQLStatement parse(final String logicSQL) {
         return new SQLJudgeEngine(logicSQL).judge();
     }
 

diff --git a/sharding-core/src/main/java/io/shardingjdbc/core/routing/router/ParsingSQLRouter.java b/sharding-core/src/main/java/io/shardingjdbc/core/routing/router/ParsingSQLRouter.java
@@ -69,11 +69,11 @@ public final class ParsingSQLRouter implements SQLRouter {
     private final List<Number> generatedKeys = new LinkedList<>();
 
     @Override
-    public SQLStatement parse(final String logicSQL, final int parametersSize) {
+    public SQLStatement parse(final String logicSQL) {
         SQLParsingEngine parsingEngine = new SQLParsingEngine(databaseType, logicSQL, shardingRule);
         SQLStatement result = parsingEngine.parse();
         if (result instanceof InsertStatement) {
-            ((InsertStatement) result).appendGenerateKeyToken(shardingRule, parametersSize);
+            ((InsertStatement) result).appendGenerateKeyToken(shardingRule);
         }
         return result;
     }

diff --git a/sharding-core/src/main/java/io/shardingjdbc/core/routing/router/SQLRouter.java b/sharding-core/src/main/java/io/shardingjdbc/core/routing/router/SQLRouter.java
@@ -33,10 +33,9 @@ public interface SQLRouter {
      * Parse SQL.
      * 
      * @param logicSQL logic SQL
-     * @param parametersSize parameters size
      * @return parse result
      */
-    SQLStatement parse(String logicSQL, int parametersSize);
+    SQLStatement parse(String logicSQL);
 
     /**
      * Route SQL.