fix #65

apache · May 10, 2016 · 3e6d9f2 · 3e6d9f2
1 parent f0e3081
commit 3e6d9f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...dbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/visitor/ParseContext.java b/...dbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/visitor/ParseContext.java
@@ -133,7 +133,7 @@ public Table addTable(final SQLExprTableSource x) {
      */
     public void addCondition(final SQLExpr expr, final BinaryOperator operator, final List<SQLExpr> valueExprList, final DatabaseType databaseType, final List<Object> parameters) {
         Optional<Column> column = getColumn(expr);
-        if (!column.isPresent()) {
+        if (!column.isPresent() || !shardingColumns.contains(column.get().getColumnName())) {
             return;
         }
         List<Comparable<?>> values = new ArrayList<>(valueExprList.size());
@@ -160,16 +160,17 @@ public void addCondition(final SQLExpr expr, final BinaryOperator operator, fina
      * @param parameters 通过占位符传进来的参数
      */
     public void addCondition(final String columnName, final String tableName, final BinaryOperator operator, final SQLExpr valueExpr, final DatabaseType databaseType, final List<Object> parameters) {
+        Column column = createColumn(columnName, tableName);
+        if (!shardingColumns.contains(column.getColumnName())) {
+            return;
+        }
         Comparable<?> value = evalExpression(databaseType, valueExpr, parameters);
         if (null != value) {
-            addCondition(createColumn(columnName, tableName), operator, Collections.<Comparable<?>>singletonList(value));
+            addCondition(column, operator, Collections.<Comparable<?>>singletonList(value));
         }
     }
 
     private void addCondition(final Column column, final BinaryOperator operator, final List<Comparable<?>> values) {
-        if (!shardingColumns.contains(column.getColumnName())) {
-            return;
-        }
         Optional<Condition> optionalCondition = currentConditionContext.find(column.getTableName(), column.getColumnName(), operator);
         Condition condition;
         // TODO 待讨论

diff --git a/sharding-jdbc-doc/content/post/release_notes.md b/sharding-jdbc-doc/content/post/release_notes.md
@@ -19,6 +19,7 @@ weight = 1
 ### 缺陷修正
 
 1. [ISSUE #63](https://github.com/dangdangdotcom/sharding-jdbc/issues/63) ORDER BY与GROUP BY衍生列未添加表名或表别名
+1. [ISSUE #65](https://github.com/dangdangdotcom/sharding-jdbc/issues/65) 解析条件上下文性能提升
 
 ## 1.2.0