You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/08/25 09:00:30 UTC
[shardingsphere] branch master updated: optimize and or condition
parse and extract logic (#11996)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 327e282 optimize and or condition parse and extract logic (#11996)
327e282 is described below
commit 327e282038ba350fca335b33cb3e979e179b7cf8
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Wed Aug 25 16:59:50 2021 +0800
optimize and or condition parse and extract logic (#11996)
* optimize and or condition parse and extract logic
* fix checkstyle
* optimize extract logic
---
.../rewrite/condition/EncryptConditionEngine.java | 14 +--
.../impl/EncryptPredicateColumnTokenGenerator.java | 6 +-
.../shadow/condition/ShadowConditionEngine.java | 8 +-
.../impl/ShadowPredicateColumnTokenGenerator.java | 10 +-
.../impl/PreparedShadowDataSourceJudgeEngine.java | 13 +--
.../impl/WhereClauseShardingConditionEngine.java | 42 ++++-----
.../engine/RowNumberPaginationContextEngine.java | 6 +-
.../engine/TopPaginationContextEngine.java | 4 +-
.../src/main/antlr4/imports/mysql/BaseRule.g4 | 11 ++-
.../visitor/format/impl/MySQLFormatSQLVisitor.java | 24 +++--
.../statement/impl/MySQLStatementSQLVisitor.java | 24 +++--
.../src/main/antlr4/imports/oracle/BaseRule.g4 | 11 ++-
.../statement/impl/OracleStatementSQLVisitor.java | 18 ++--
.../src/main/antlr4/imports/postgresql/BaseRule.g4 | 11 ++-
.../impl/PostgreSQLStatementSQLVisitor.java | 7 +-
.../src/main/antlr4/imports/sql92/BaseRule.g4 | 11 ++-
.../statement/impl/SQL92StatementSQLVisitor.java | 18 ++--
.../src/main/antlr4/imports/sqlserver/BaseRule.g4 | 11 ++-
.../impl/SQLServerStatementSQLVisitor.java | 18 ++--
.../parser/sql/common/util/ExpressionBuilder.java | 104 ---------------------
.../sql/common/util/ExpressionExtractUtil.java | 81 ++++++++++++++++
...derTest.java => ExpressionExtractUtilTest.java} | 56 +++++------
.../main/resources/case/dml/select-expression.xml | 81 ++++++++++++++++
.../sql/supported/dml/select-expression.xml | 1 +
24 files changed, 342 insertions(+), 248 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java
index 06fb4c7..2915db8 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java
@@ -21,10 +21,10 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.encrypt.rewrite.condition.impl.EncryptEqualCondition;
import org.apache.shardingsphere.encrypt.rewrite.condition.impl.EncryptInCondition;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
-import org.apache.shardingsphere.infra.exception.ShardingSphereException;
-import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.type.WhereAvailable;
+import org.apache.shardingsphere.infra.exception.ShardingSphereException;
+import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BetweenExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
@@ -33,8 +33,8 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.InExpres
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.SimpleExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.WhereSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionBuilder;
import org.apache.shardingsphere.sql.parser.sql.common.util.ColumnExtractor;
+import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionExtractUtil;
import java.util.Collection;
import java.util.Collections;
@@ -68,12 +68,8 @@ public final class EncryptConditionEngine {
return Collections.emptyList();
}
List<EncryptCondition> result = new LinkedList<>();
- if (((WhereAvailable) sqlStatementContext).getWhere().isPresent()) {
- ExpressionBuilder expressionBuilder = new ExpressionBuilder(((WhereAvailable) sqlStatementContext).getWhere().get().getExpr());
- Collection<AndPredicate> andPredicates = new LinkedList<>(expressionBuilder.extractAndPredicates().getAndPredicates());
- for (AndPredicate each : andPredicates) {
- result.addAll(createEncryptConditions(sqlStatementContext, each));
- }
+ for (AndPredicate each : ExpressionExtractUtil.getAndPredicates(whereSegment.get().getExpr())) {
+ result.addAll(createEncryptConditions(sqlStatementContext, each));
}
// FIXME process subquery
// for (SubqueryPredicateSegment each : sqlStatementContext.getSqlStatement().findSQLSegments(SubqueryPredicateSegment.class)) {
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateColumnTokenGenerator.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateColumnTokenGenerator.java
index 01925de..1333d16 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateColumnTokenGenerator.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateColumnTokenGenerator.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.Column
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
import org.apache.shardingsphere.sql.parser.sql.common.util.ColumnExtractor;
-import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionBuilder;
+import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionExtractUtil;
import java.util.Collection;
import java.util.Collections;
@@ -61,9 +61,7 @@ public final class EncryptPredicateColumnTokenGenerator extends BaseEncryptSQLTo
Preconditions.checkState(((WhereAvailable) sqlStatementContext).getWhere().isPresent());
Collection<SubstitutableColumnNameToken> result = new LinkedHashSet<>();
ExpressionSegment expression = ((WhereAvailable) sqlStatementContext).getWhere().get().getExpr();
- ExpressionBuilder expressionBuilder = new ExpressionBuilder(expression);
- Collection<AndPredicate> andPredicates = new LinkedList<>(expressionBuilder.extractAndPredicates().getAndPredicates());
- for (AndPredicate each : andPredicates) {
+ for (AndPredicate each : ExpressionExtractUtil.getAndPredicates(expression)) {
result.addAll(generateSQLTokens(sqlStatementContext, each));
}
return result;
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/condition/ShadowConditionEngine.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/condition/ShadowConditionEngine.java
index 93174e0..ef4cb91 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/condition/ShadowConditionEngine.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/condition/ShadowConditionEngine.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.shadow.condition;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.exception.ShardingSphereException;
-import org.apache.shardingsphere.shadow.rule.ShadowRule;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.type.WhereAvailable;
+import org.apache.shardingsphere.infra.exception.ShardingSphereException;
+import org.apache.shardingsphere.shadow.rule.ShadowRule;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BetweenExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
@@ -30,8 +30,8 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.InExpres
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.SimpleExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.WhereSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionBuilder;
import org.apache.shardingsphere.sql.parser.sql.common.util.ColumnExtractor;
+import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionExtractUtil;
import java.util.Collection;
import java.util.LinkedList;
@@ -68,7 +68,7 @@ public final class ShadowConditionEngine {
}
private Collection<AndPredicate> createAndPredicates(final WhereSegment whereSegment) {
- return new ExpressionBuilder(whereSegment.getExpr()).extractAndPredicates().getAndPredicates();
+ return ExpressionExtractUtil.getAndPredicates(whereSegment.getExpr());
}
private Optional<ShadowCondition> createShadowConditionAndPredicates(final Collection<AndPredicate> andPredicates) {
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rewrite/token/generator/impl/ShadowPredicateColumnTokenGenerator.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rewrite/token/generator/impl/ShadowPredicateColumnTokenGenerator.java
index e5eba4f..823f77e 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rewrite/token/generator/impl/ShadowPredicateColumnTokenGenerator.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rewrite/token/generator/impl/ShadowPredicateColumnTokenGenerator.java
@@ -19,18 +19,18 @@ package org.apache.shardingsphere.shadow.rewrite.token.generator.impl;
import com.google.common.base.Preconditions;
import lombok.Setter;
+import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
+import org.apache.shardingsphere.infra.binder.type.WhereAvailable;
import org.apache.shardingsphere.infra.rewrite.sql.token.generator.CollectionSQLTokenGenerator;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic.RemoveToken;
import org.apache.shardingsphere.shadow.rewrite.token.generator.BaseShadowSQLTokenGenerator;
-import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
-import org.apache.shardingsphere.infra.binder.type.WhereAvailable;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.WhereSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionBuilder;
import org.apache.shardingsphere.sql.parser.sql.common.util.ColumnExtractor;
+import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionExtractUtil;
import java.util.Collection;
import java.util.Iterator;
@@ -55,9 +55,7 @@ public final class ShadowPredicateColumnTokenGenerator extends BaseShadowSQLToke
WhereSegment whereSegment = whereOptional.get();
ExpressionSegment expression = whereSegment.getExpr();
Collection<SQLToken> result = new LinkedList<>();
- ExpressionBuilder expressionBuilder = new ExpressionBuilder(expression);
- Collection<AndPredicate> andPredicates = new LinkedList<>(expressionBuilder.extractAndPredicates().getAndPredicates());
- for (AndPredicate each : andPredicates) {
+ for (AndPredicate each : ExpressionExtractUtil.getAndPredicates(expression)) {
result.addAll(generateSQLTokens(whereSegment, each));
}
return result;
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/route/judge/impl/PreparedShadowDataSourceJudgeEngine.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/route/judge/impl/PreparedShadowDataSourceJudgeEngine.java
index e254249..cf33d8f 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/route/judge/impl/PreparedShadowDataSourceJudgeEngine.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/route/judge/impl/PreparedShadowDataSourceJudgeEngine.java
@@ -19,12 +19,12 @@ package org.apache.shardingsphere.shadow.route.judge.impl;
import com.google.common.base.Preconditions;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.shadow.route.judge.ShadowDataSourceJudgeEngine;
-import org.apache.shardingsphere.shadow.route.judge.util.ShadowValueJudgeUtil;
-import org.apache.shardingsphere.shadow.rule.ShadowRule;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.InsertStatementContext;
import org.apache.shardingsphere.infra.binder.type.WhereAvailable;
+import org.apache.shardingsphere.shadow.route.judge.ShadowDataSourceJudgeEngine;
+import org.apache.shardingsphere.shadow.route.judge.util.ShadowValueJudgeUtil;
+import org.apache.shardingsphere.shadow.rule.ShadowRule;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
@@ -32,10 +32,9 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.L
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.ParameterMarkerExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.WhereSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionBuilder;
+import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionExtractUtil;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
@@ -72,9 +71,7 @@ public final class PreparedShadowDataSourceJudgeEngine implements ShadowDataSour
return false;
}
ExpressionSegment expression = whereSegment.get().getExpr();
- ExpressionBuilder expressionBuilder = new ExpressionBuilder(expression);
- Collection<AndPredicate> andPredicates = new LinkedList<>(expressionBuilder.extractAndPredicates().getAndPredicates());
- for (AndPredicate andPredicate : andPredicates) {
+ for (AndPredicate andPredicate : ExpressionExtractUtil.getAndPredicates(expression)) {
if (judgePredicateSegments(andPredicate.getPredicates())) {
return true;
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java
index 79747d1..2e0eb2d 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java
@@ -19,27 +19,27 @@ package org.apache.shardingsphere.sharding.route.engine.condition.engine.impl;
import com.google.common.collect.Range;
import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
+import org.apache.shardingsphere.infra.binder.type.WhereAvailable;
import org.apache.shardingsphere.infra.exception.ShardingSphereException;
-import org.apache.shardingsphere.sharding.route.engine.condition.value.AlwaysFalseShardingConditionValue;
+import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.sharding.route.engine.condition.AlwaysFalseShardingCondition;
import org.apache.shardingsphere.sharding.route.engine.condition.Column;
import org.apache.shardingsphere.sharding.route.engine.condition.ShardingCondition;
import org.apache.shardingsphere.sharding.route.engine.condition.engine.ShardingConditionEngine;
import org.apache.shardingsphere.sharding.route.engine.condition.generator.ConditionValueGeneratorFactory;
-import org.apache.shardingsphere.sharding.rule.ShardingRule;
+import org.apache.shardingsphere.sharding.route.engine.condition.value.AlwaysFalseShardingConditionValue;
import org.apache.shardingsphere.sharding.route.engine.condition.value.ListShardingConditionValue;
import org.apache.shardingsphere.sharding.route.engine.condition.value.RangeShardingConditionValue;
import org.apache.shardingsphere.sharding.route.engine.condition.value.ShardingConditionValue;
-import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
-import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
-import org.apache.shardingsphere.infra.binder.type.WhereAvailable;
+import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.WhereSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.sql.common.util.ColumnExtractor;
-import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionBuilder;
+import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionExtractUtil;
import org.apache.shardingsphere.sql.parser.sql.common.util.SafeNumberOperationUtil;
import org.apache.shardingsphere.sql.parser.sql.common.util.WhereExtractUtil;
@@ -69,29 +69,15 @@ public final class WhereClauseShardingConditionEngine implements ShardingConditi
return Collections.emptyList();
}
List<ShardingCondition> result = new ArrayList<>();
- ((WhereAvailable) sqlStatementContext).getWhere().ifPresent(segment -> result.addAll(createShardingConditions(sqlStatementContext, segment.getExpr(), parameters)));
- Collection<WhereSegment> joinWhereSegments = sqlStatementContext.getSqlStatement() instanceof SelectStatement
- ? WhereExtractUtil.getJoinWhereSegments((SelectStatement) sqlStatementContext.getSqlStatement()) : Collections.emptyList();
- for (WhereSegment each : joinWhereSegments) {
- Collection<ShardingCondition> joinShardingConditions = createShardingConditions(sqlStatementContext, each.getExpr(), parameters);
- if (!result.containsAll(joinShardingConditions)) {
- result.addAll(joinShardingConditions);
- }
- }
- Collection<WhereSegment> subqueryWhereSegments = sqlStatementContext.getSqlStatement() instanceof SelectStatement
- ? WhereExtractUtil.getSubqueryWhereSegments((SelectStatement) sqlStatementContext.getSqlStatement()) : Collections.emptyList();
- for (WhereSegment each : subqueryWhereSegments) {
- Collection<ShardingCondition> subqueryShardingConditions = createShardingConditions(sqlStatementContext, each.getExpr(), parameters);
- if (!result.containsAll(subqueryShardingConditions)) {
- result.addAll(subqueryShardingConditions);
- }
+ for (WhereSegment each : getWhereSegments(sqlStatementContext)) {
+ result.addAll(createShardingConditions(sqlStatementContext, each.getExpr(), parameters));
}
return result;
}
private Collection<ShardingCondition> createShardingConditions(final SQLStatementContext<?> sqlStatementContext, final ExpressionSegment expressionSegment, final List<Object> parameters) {
Collection<ShardingCondition> result = new LinkedList<>();
- for (AndPredicate each : new ExpressionBuilder(expressionSegment).extractAndPredicates().getAndPredicates()) {
+ for (AndPredicate each : ExpressionExtractUtil.getAndPredicates(expressionSegment)) {
Map<Column, Collection<ShardingConditionValue>> shardingConditionValues = createShardingConditionValueMap(sqlStatementContext, each, parameters);
if (shardingConditionValues.isEmpty()) {
return Collections.emptyList();
@@ -101,6 +87,16 @@ public final class WhereClauseShardingConditionEngine implements ShardingConditi
return result;
}
+ private Collection<WhereSegment> getWhereSegments(final SQLStatementContext<?> sqlStatementContext) {
+ Collection<WhereSegment> result = new LinkedList<>();
+ ((WhereAvailable) sqlStatementContext).getWhere().ifPresent(result::add);
+ if (sqlStatementContext.getSqlStatement() instanceof SelectStatement) {
+ result.addAll(WhereExtractUtil.getSubqueryWhereSegments((SelectStatement) sqlStatementContext.getSqlStatement()));
+ result.addAll(WhereExtractUtil.getJoinWhereSegments((SelectStatement) sqlStatementContext.getSqlStatement()));
+ }
+ return result;
+ }
+
private Map<Column, Collection<ShardingConditionValue>> createShardingConditionValueMap(final SQLStatementContext<?> sqlStatementContext,
final AndPredicate andPredicate, final List<Object> parameters) {
Map<Column, Collection<ShardingConditionValue>> result = new HashMap<>(andPredicate.getPredicates().size(), 1);
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/RowNumberPaginationContextEngine.java b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/RowNumberPaginationContextEngine.java
index 27e07ee..4fb7b1e 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/RowNumberPaginationContextEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/RowNumberPaginationContextEngine.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.infra.binder.segment.select.pagination.engine;
-import org.apache.shardingsphere.infra.binder.segment.select.projection.ProjectionsContext;
import org.apache.shardingsphere.infra.binder.segment.select.pagination.PaginationContext;
+import org.apache.shardingsphere.infra.binder.segment.select.projection.ProjectionsContext;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.ro
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.rownum.ParameterMarkerRowNumberValueSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.rownum.RowNumberValueSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
-import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionBuilder;
+import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionExtractUtil;
import java.util.Collection;
import java.util.HashSet;
@@ -61,7 +61,7 @@ public final class RowNumberPaginationContextEngine {
if (!rowNumberAlias.isPresent()) {
return new PaginationContext(null, null, parameters);
}
- Collection<AndPredicate> andPredicates = new ExpressionBuilder(where).extractAndPredicates().getAndPredicates();
+ Collection<AndPredicate> andPredicates = ExpressionExtractUtil.getAndPredicates(where);
Collection<BinaryOperationExpression> rowNumberPredicates = getRowNumberPredicates(andPredicates, rowNumberAlias.get());
return rowNumberPredicates.isEmpty() ? new PaginationContext(null, null, parameters) : createPaginationWithRowNumber(rowNumberPredicates, parameters);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngine.java b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngine.java
index e7fc50c..364b083 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngine.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.ro
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.rownum.RowNumberValueSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.top.TopProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
-import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionBuilder;
+import org.apache.shardingsphere.sql.parser.sql.common.util.ExpressionExtractUtil;
import java.util.Collection;
import java.util.List;
@@ -49,7 +49,7 @@ public final class TopPaginationContextEngine {
* @return pagination context
*/
public PaginationContext createPaginationContext(final TopProjectionSegment topProjectionSegment, final ExpressionSegment where, final List<Object> parameters) {
- Collection<AndPredicate> andPredicates = new ExpressionBuilder(where).extractAndPredicates().getAndPredicates();
+ Collection<AndPredicate> andPredicates = ExpressionExtractUtil.getAndPredicates(where);
Optional<ExpressionSegment> rowNumberPredicate = null != where ? getRowNumberPredicate(andPredicates, topProjectionSegment.getAlias()) : Optional.empty();
Optional<PaginationValueSegment> offset = rowNumberPredicate.isPresent() ? createOffsetWithRowNumber(rowNumberPredicate.get()) : Optional.empty();
PaginationValueSegment rowCount = topProjectionSegment.getTop();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
index d33be93..dcaa392 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
@@ -789,13 +789,18 @@ triggerOrder
expr
: booleanPrimary
- | expr logicalOperator expr
+ | expr andOperator expr
+ | expr orOperator expr
| expr XOR expr
| notOperator expr
;
-logicalOperator
- : OR | OR_ | AND | AND_
+andOperator
+ : AND | AND_
+ ;
+
+orOperator
+ : OR | OR_
;
notOperator
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
index b81a6c9..167fa69 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/format/impl/MySQLFormatSQLVisitor.java
@@ -51,7 +51,6 @@ import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.Precisi
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ProjectionContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ProjectionsContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.QueryExpressionBodyContext;
-import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.UnionClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.QueryExpressionContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.QueryExpressionParensContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.QuerySpecificationContext;
@@ -68,6 +67,7 @@ import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableNa
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableValueConstructorContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TemporalLiteralsContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TypeDatetimePrecisionContext;
+import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.UnionClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.UserVariableContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.WhereClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.WithClauseContext;
@@ -558,14 +558,10 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
@Override
public String visitExpr(final ExprContext ctx) {
- if (null != ctx.logicalOperator()) {
- ExprContext left = ctx.expr(0);
- visit(left);
- formatPrintln();
- ExprContext right = ctx.expr(1);
- formatPrint(ctx.logicalOperator().getText());
- formatPrint(" ");
- visit(right);
+ if (null != ctx.andOperator()) {
+ visitLogicalOperator(ctx, ctx.andOperator().getText());
+ } else if (null != ctx.orOperator()) {
+ visitLogicalOperator(ctx, ctx.orOperator().getText());
} else if (null != ctx.notOperator()) {
formatPrint(ctx.notOperator().getText());
visit(ctx.expr(0));
@@ -575,6 +571,16 @@ public abstract class MySQLFormatSQLVisitor extends MySQLStatementBaseVisitor<St
return result.toString();
}
+ private void visitLogicalOperator(final ExprContext ctx, final String operator) {
+ ExprContext left = ctx.expr(0);
+ visit(left);
+ formatPrintln();
+ ExprContext right = ctx.expr(1);
+ formatPrint(operator);
+ formatPrint(" ");
+ visit(right);
+ }
+
@Override
public String visitAlias(final AliasContext ctx) {
formatPrint(ctx.getText());
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
index 267ccdd..eb5264e 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
@@ -86,7 +86,6 @@ import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.Project
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ProjectionsContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.QualifiedShorthandContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.QueryExpressionBodyContext;
-import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.UnionClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.QueryExpressionContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.QueryExpressionParensContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.QueryPrimaryContext;
@@ -113,6 +112,7 @@ import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableNa
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableReferenceContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableReferencesContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TemporalLiteralsContext;
+import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.UnionClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.UpdateContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ViewNameContext;
import org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ViewNamesContext;
@@ -354,20 +354,24 @@ public abstract class MySQLStatementSQLVisitor extends MySQLStatementBaseVisitor
return visit(ctx.booleanPrimary());
}
if (null != ctx.XOR()) {
- ExpressionSegment left = (ExpressionSegment) visit(ctx.expr(0));
- ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
- String operator = "XOR";
- String text = ctx.start.getInputStream().getText(new Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- return new BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left, right, operator, text);
+ return createBinaryOperationExpression(ctx, "XOR");
}
- if (null != ctx.logicalOperator()) {
- String text = ctx.start.getInputStream().getText(new Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- return new BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)),
- (ExpressionSegment) visit(ctx.expr(1)), ctx.logicalOperator().getText(), text);
+ if (null != ctx.andOperator()) {
+ return createBinaryOperationExpression(ctx, ctx.andOperator().getText());
+ }
+ if (null != ctx.orOperator()) {
+ return createBinaryOperationExpression(ctx, ctx.orOperator().getText());
}
return new NotExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
}
+ private BinaryOperationExpression createBinaryOperationExpression(final ExprContext ctx, final String operator) {
+ ExpressionSegment left = (ExpressionSegment) visit(ctx.expr(0));
+ ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
+ String text = ctx.start.getInputStream().getText(new Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
+ return new BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left, right, operator, text);
+ }
+
@Override
public final ASTNode visitBooleanPrimary(final BooleanPrimaryContext ctx) {
if (null != ctx.IS()) {
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4
index 143621f..33a94c4 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/BaseRule.g4
@@ -357,14 +357,19 @@ exprList
// TODO comb expr
expr
- : expr logicalOperator expr
+ : expr andOperator expr
+ | expr orOperator expr
| notOperator expr
| LP_ expr RP_
| booleanPrimary
;
-logicalOperator
- : OR | OR_ | AND | AND_
+andOperator
+ : AND | AND_
+ ;
+
+orOperator
+ : OR | OR_
;
notOperator
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java
index 5cdd73b..86e9c32 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleStatementSQLVisitor.java
@@ -270,16 +270,22 @@ public abstract class OracleStatementSQLVisitor extends OracleStatementBaseVisit
if (null != ctx.LP_()) {
return visit(ctx.expr(0));
}
- if (null != ctx.logicalOperator()) {
- ExpressionSegment left = (ExpressionSegment) visit(ctx.expr(0));
- ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
- String operator = ctx.logicalOperator().getText();
- String text = ctx.start.getInputStream().getText(new Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- return new BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left, right, operator, text);
+ if (null != ctx.andOperator()) {
+ return createBinaryOperationExpression(ctx, ctx.andOperator().getText());
+ }
+ if (null != ctx.orOperator()) {
+ return createBinaryOperationExpression(ctx, ctx.orOperator().getText());
}
return new NotExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
}
+ private ASTNode createBinaryOperationExpression(final ExprContext ctx, final String operator) {
+ ExpressionSegment left = (ExpressionSegment) visit(ctx.expr(0));
+ ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
+ String text = ctx.start.getInputStream().getText(new Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
+ return new BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left, right, operator, text);
+ }
+
@Override
public final ASTNode visitBooleanPrimary(final BooleanPrimaryContext ctx) {
if (null != ctx.IS()) {
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/BaseRule.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/BaseRule.g4
index f08062e..a9802d1 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/BaseRule.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/BaseRule.g4
@@ -500,8 +500,12 @@ primaryKey
: PRIMARY? KEY
;
-logicalOperator
- : OR | OR_ | AND | AND_
+andOperator
+ : AND | AND_
+ ;
+
+orOperator
+ : OR | OR_
;
comparisonOperator
@@ -579,7 +583,8 @@ aExpr
| aExpr IS unicodeNormalForm NORMALIZED
| aExpr IS NOT NORMALIZED
| aExpr IS NOT unicodeNormalForm NORMALIZED
- | aExpr logicalOperator aExpr
+ | aExpr andOperator aExpr
+ | aExpr orOperator aExpr
| DEFAULT
;
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
index 0f5c040..fb17b3d 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
@@ -270,8 +270,11 @@ public abstract class PostgreSQLStatementSQLVisitor extends PostgreSQLStatementB
if (null != ctx.comparisonOperator()) {
return createCommonBinaryOperationSegment(ctx, ctx.comparisonOperator().getText());
}
- if (null != ctx.logicalOperator()) {
- return createCommonBinaryOperationSegment(ctx, ctx.logicalOperator().getText());
+ if (null != ctx.andOperator()) {
+ return createCommonBinaryOperationSegment(ctx, ctx.andOperator().getText());
+ }
+ if (null != ctx.orOperator()) {
+ return createCommonBinaryOperationSegment(ctx, ctx.orOperator().getText());
}
super.visitAExpr(ctx);
String text = ctx.start.getInputStream().getText(new Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/antlr4/imports/sql92/BaseRule.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/antlr4/imports/sql92/BaseRule.g4
index b52428e..4b66b14 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/antlr4/imports/sql92/BaseRule.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/antlr4/imports/sql92/BaseRule.g4
@@ -130,14 +130,19 @@ characterSetName
;
expr
- : expr logicalOperator expr
+ : expr andOperator expr
+ | expr orOperator expr
| notOperator expr
| LP_ expr RP_
| booleanPrimary
;
-logicalOperator
- : OR | AND | AND_
+andOperator
+ : AND | AND_
+ ;
+
+orOperator
+ : OR
;
notOperator
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92StatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92StatementSQLVisitor.java
index 785a413..661dc56 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92StatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92StatementSQLVisitor.java
@@ -236,16 +236,22 @@ public abstract class SQL92StatementSQLVisitor extends SQL92StatementBaseVisitor
if (null != ctx.LP_()) {
return visit(ctx.expr(0));
}
- if (null != ctx.logicalOperator()) {
- ExpressionSegment left = (ExpressionSegment) visit(ctx.expr(0));
- ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
- String operator = ctx.logicalOperator().getText();
- String text = ctx.start.getInputStream().getText(new Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- return new BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left, right, operator, text);
+ if (null != ctx.andOperator()) {
+ return createBinaryOperationExpression(ctx, ctx.andOperator().getText());
+ }
+ if (null != ctx.orOperator()) {
+ return createBinaryOperationExpression(ctx, ctx.orOperator().getText());
}
return new NotExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
}
+ private ASTNode createBinaryOperationExpression(final ExprContext ctx, final String operator) {
+ ExpressionSegment left = (ExpressionSegment) visit(ctx.expr(0));
+ ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
+ String text = ctx.start.getInputStream().getText(new Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
+ return new BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left, right, operator, text);
+ }
+
@Override
public final ASTNode visitBooleanPrimary(final BooleanPrimaryContext ctx) {
if (null != ctx.IS()) {
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4
index 540da9c..34b7682 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4
@@ -167,14 +167,19 @@ primaryKey
// TODO comb expr
expr
- : expr logicalOperator expr
+ : expr andOperator expr
+ | expr orOperator expr
| notOperator expr
| LP_ expr RP_
| booleanPrimary
;
-logicalOperator
- : OR | OR_ | AND | AND_
+andOperator
+ : AND | AND_
+ ;
+
+orOperator
+ : OR | OR_
;
notOperator
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
index aec4946..d29ebb9 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
@@ -257,16 +257,22 @@ public abstract class SQLServerStatementSQLVisitor extends SQLServerStatementBas
if (null != ctx.LP_()) {
return visit(ctx.expr(0));
}
- if (null != ctx.logicalOperator()) {
- ExpressionSegment left = (ExpressionSegment) visit(ctx.expr(0));
- ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
- String operator = ctx.logicalOperator().getText();
- String text = ctx.start.getInputStream().getText(new Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- return new BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left, right, operator, text);
+ if (null != ctx.andOperator()) {
+ return createBinaryOperationExpression(ctx, ctx.andOperator().getText());
+ }
+ if (null != ctx.orOperator()) {
+ return createBinaryOperationExpression(ctx, ctx.orOperator().getText());
}
return new NotExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), (ExpressionSegment) visit(ctx.expr(0)));
}
+ private ASTNode createBinaryOperationExpression(final ExprContext ctx, final String operator) {
+ ExpressionSegment left = (ExpressionSegment) visit(ctx.expr(0));
+ ExpressionSegment right = (ExpressionSegment) visit(ctx.expr(1));
+ String text = ctx.start.getInputStream().getText(new Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
+ return new BinaryOperationExpression(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), left, right, operator, text);
+ }
+
@Override
public final ASTNode visitBooleanPrimary(final BooleanPrimaryContext ctx) {
if (null != ctx.IS()) {
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionBuilder.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionBuilder.java
deleted file mode 100644
index d446224..0000000
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionBuilder.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.sql.parser.sql.common.util;
-
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.sql.parser.sql.common.constant.LogicalOperator;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.OrPredicateSegment;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.Optional;
-
-/**
- * Expression builder.
- */
-@RequiredArgsConstructor
-public final class ExpressionBuilder {
-
- private final ExpressionSegment expression;
-
- /**
- * Extract and predicates.
- *
- * @return Or predicate segment
- */
- public OrPredicateSegment extractAndPredicates() {
- OrPredicateSegment result = new OrPredicateSegment();
- if (expression instanceof BinaryOperationExpression) {
- String operator = ((BinaryOperationExpression) expression).getOperator();
- Optional<LogicalOperator> logicalOperator = LogicalOperator.valueFrom(operator);
- if (logicalOperator.isPresent() && LogicalOperator.OR == logicalOperator.get()) {
- ExpressionBuilder leftBuilder = new ExpressionBuilder(((BinaryOperationExpression) expression).getLeft());
- ExpressionBuilder rightBuilder = new ExpressionBuilder(((BinaryOperationExpression) expression).getRight());
- result.getAndPredicates().addAll(leftBuilder.extractAndPredicates().getAndPredicates());
- result.getAndPredicates().addAll(rightBuilder.extractAndPredicates().getAndPredicates());
- } else if (logicalOperator.isPresent() && LogicalOperator.AND == logicalOperator.get()) {
- result.getAndPredicates().addAll(createAndPredicates());
- } else {
- AndPredicate andPredicate = new AndPredicate();
- andPredicate.getPredicates().add(expression);
- result.getAndPredicates().add(andPredicate);
- }
- } else {
- AndPredicate andPredicate = new AndPredicate();
- andPredicate.getPredicates().add(expression);
- result.getAndPredicates().add(andPredicate);
- }
- return result;
- }
-
- private AndPredicate createAndPredicate(final AndPredicate left, final AndPredicate right) {
- AndPredicate result = new AndPredicate();
- result.getPredicates().addAll(left.getPredicates());
- result.getPredicates().addAll(right.getPredicates());
- return result;
- }
-
- private Collection<AndPredicate> createAndPredicates() {
- Collection<AndPredicate> result = new LinkedList<>();
- ExpressionBuilder leftBuilder = new ExpressionBuilder(((BinaryOperationExpression) expression).getLeft());
- ExpressionBuilder rightBuilder = new ExpressionBuilder(((BinaryOperationExpression) expression).getRight());
- ExpressionSegment leftExpression = ((BinaryOperationExpression) expression).getLeft();
- if (leftExpression instanceof BinaryOperationExpression) {
- String leftOp = ((BinaryOperationExpression) leftExpression).getOperator();
- Optional<LogicalOperator> logicLeftOp = LogicalOperator.valueFrom(leftOp);
- if (logicLeftOp.isPresent() && LogicalOperator.OR == logicLeftOp.get()) {
- ExpressionBuilder beforeOrBuilder = new ExpressionBuilder(((BinaryOperationExpression) leftExpression).getLeft());
- ExpressionBuilder afterOrBuilder = new ExpressionBuilder(((BinaryOperationExpression) leftExpression).getRight());
- result.addAll(beforeOrBuilder.extractAndPredicates().getAndPredicates());
- result.addAll(createResultCollection(afterOrBuilder, rightBuilder));
- return result;
- }
- }
- result.addAll(createResultCollection(leftBuilder, rightBuilder));
- return result;
- }
-
- private Collection<AndPredicate> createResultCollection(final ExpressionBuilder leftBuilder, final ExpressionBuilder rightBuilder) {
- Collection<AndPredicate> result = new LinkedList<>();
- for (AndPredicate eachLeft : leftBuilder.extractAndPredicates().getAndPredicates()) {
- for (AndPredicate eachRight : rightBuilder.extractAndPredicates().getAndPredicates()) {
- result.add(createAndPredicate(eachLeft, eachRight));
- }
- }
- return result;
- }
-}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtil.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtil.java
new file mode 100644
index 0000000..fd1f146
--- /dev/null
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtil.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.sql.parser.sql.common.util;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.sql.parser.sql.common.constant.LogicalOperator;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Optional;
+
+/**
+ * Expression extract utility class.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class ExpressionExtractUtil {
+
+ /**
+ * Get and predicate collection.
+ *
+ * @param expression expression segment
+ * @return and predicate collection
+ */
+ public static Collection<AndPredicate> getAndPredicates(final ExpressionSegment expression) {
+ if (!(expression instanceof BinaryOperationExpression)) {
+ return Collections.singletonList(createAndPredicate(expression));
+ }
+ BinaryOperationExpression binaryExpression = (BinaryOperationExpression) expression;
+ Optional<LogicalOperator> logicalOperator = LogicalOperator.valueFrom(binaryExpression.getOperator());
+ Collection<AndPredicate> result = new LinkedList<>();
+ if (logicalOperator.isPresent() && LogicalOperator.OR == logicalOperator.get()) {
+ result.addAll(getAndPredicates(binaryExpression.getLeft()));
+ result.addAll(getAndPredicates(binaryExpression.getRight()));
+ } else if (logicalOperator.isPresent() && LogicalOperator.AND == logicalOperator.get()) {
+ Collection<AndPredicate> predicates = getAndPredicates(binaryExpression.getRight());
+ for (AndPredicate each : getAndPredicates(binaryExpression.getLeft())) {
+ result.addAll(getCombinedAndPredicates(each, predicates));
+ }
+ } else {
+ result.add(createAndPredicate(expression));
+ }
+ return result;
+ }
+
+ private static Collection<AndPredicate> getCombinedAndPredicates(final AndPredicate current, final Collection<AndPredicate> predicates) {
+ Collection<AndPredicate> result = new LinkedList<>();
+ for (AndPredicate each : predicates) {
+ AndPredicate predicate = new AndPredicate();
+ predicate.getPredicates().addAll(current.getPredicates());
+ predicate.getPredicates().addAll(each.getPredicates());
+ result.add(predicate);
+ }
+ return result;
+ }
+
+ private static AndPredicate createAndPredicate(final ExpressionSegment expression) {
+ AndPredicate result = new AndPredicate();
+ result.getPredicates().add(expression);
+ return result;
+ }
+}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionBuilderTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilTest.java
similarity index 62%
rename from shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionBuilderTest.java
rename to shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilTest.java
index 2f7316b..9e1ddea 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionBuilderTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilTest.java
@@ -22,26 +22,25 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOp
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.ParameterMarkerExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.AndPredicate;
-import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.OrPredicateSegment;
import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
import org.junit.Test;
+import java.util.Collection;
import java.util.Iterator;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class ExpressionBuilderTest {
+public final class ExpressionExtractUtilTest {
@Test
public void assertExtractAndPredicates() {
ColumnSegment left = new ColumnSegment(26, 33, new IdentifierValue("order_id"));
ParameterMarkerExpressionSegment right = new ParameterMarkerExpressionSegment(35, 35, 0);
ExpressionSegment expressionSegment = new BinaryOperationExpression(26, 35, left, right, "=", "order_id=?");
- ExpressionBuilder expressionBuilder = new ExpressionBuilder(expressionSegment);
- OrPredicateSegment result = expressionBuilder.extractAndPredicates();
- assertThat(result.getAndPredicates().size(), is(1));
- assertThat(result.getAndPredicates().iterator().next().getPredicates().iterator().next(), is(expressionSegment));
+ Collection<AndPredicate> actual = ExpressionExtractUtil.getAndPredicates(expressionSegment);
+ assertThat(actual.size(), is(1));
+ assertThat(actual.iterator().next().getPredicates().iterator().next(), is(expressionSegment));
}
@Test
@@ -53,10 +52,9 @@ public final class ExpressionBuilderTest {
ParameterMarkerExpressionSegment parameterMarkerExpressionSegment2 = new ParameterMarkerExpressionSegment(54, 54, 1);
ExpressionSegment rightExpressionSegment = new BinaryOperationExpression(28, 39, columnSegment2, parameterMarkerExpressionSegment2, "=", "status=?");
BinaryOperationExpression expression = new BinaryOperationExpression(28, 54, leftExpressionSegment, rightExpressionSegment, "AND", "order_id=? AND status=?");
- ExpressionBuilder expressionBuilder = new ExpressionBuilder(expression);
- OrPredicateSegment result = expressionBuilder.extractAndPredicates();
- assertThat(result.getAndPredicates().size(), is(1));
- AndPredicate andPredicate = result.getAndPredicates().iterator().next();
+ Collection<AndPredicate> actual = ExpressionExtractUtil.getAndPredicates(expression);
+ assertThat(actual.size(), is(1));
+ AndPredicate andPredicate = actual.iterator().next();
assertThat(andPredicate.getPredicates().size(), is(2));
Iterator<ExpressionSegment> iterator = andPredicate.getPredicates().iterator();
assertThat(iterator.next(), is(leftExpressionSegment));
@@ -72,10 +70,9 @@ public final class ExpressionBuilderTest {
ParameterMarkerExpressionSegment parameterMarkerExpressionSegment2 = new ParameterMarkerExpressionSegment(47, 47, 1);
ExpressionSegment expressionSegment2 = new BinaryOperationExpression(40, 47, columnSegment2, parameterMarkerExpressionSegment2, "=", "status=?");
BinaryOperationExpression expression = new BinaryOperationExpression(28, 47, expressionSegment1, expressionSegment2, "OR", "status=? OR status=?");
- ExpressionBuilder expressionBuilder = new ExpressionBuilder(expression);
- OrPredicateSegment result = expressionBuilder.extractAndPredicates();
- assertThat(result.getAndPredicates().size(), is(2));
- Iterator<AndPredicate> andPredicateIterator = result.getAndPredicates().iterator();
+ Collection<AndPredicate> actual = ExpressionExtractUtil.getAndPredicates(expression);
+ assertThat(actual.size(), is(2));
+ Iterator<AndPredicate> andPredicateIterator = actual.iterator();
AndPredicate andPredicate1 = andPredicateIterator.next();
AndPredicate andPredicate2 = andPredicateIterator.next();
assertThat(andPredicate1.getPredicates().iterator().next(), is(expressionSegment1));
@@ -85,23 +82,20 @@ public final class ExpressionBuilderTest {
@Test
public void assertExtractAndPredicatesOrAndCondition() {
- ColumnSegment columnSegment1 = new ColumnSegment(28, 33, new IdentifierValue("status"));
- ParameterMarkerExpressionSegment parameterMarkerExpressionSegment1 = new ParameterMarkerExpressionSegment(35, 35, 0);
- ExpressionSegment expressionSegment1 = new BinaryOperationExpression(28, 39, columnSegment1, parameterMarkerExpressionSegment1, "=", "status=?");
- ColumnSegment columnSegment2 = new ColumnSegment(40, 45, new IdentifierValue("status"));
- ParameterMarkerExpressionSegment parameterMarkerExpressionSegment2 = new ParameterMarkerExpressionSegment(47, 47, 1);
- ExpressionSegment expressionSegment2 = new BinaryOperationExpression(40, 47, columnSegment2, parameterMarkerExpressionSegment2, "=", "status=?");
- BinaryOperationExpression expressionOr = new BinaryOperationExpression(28, 47, expressionSegment1, expressionSegment2, "OR", "status=? OR status=?");
- ColumnSegment columnSegment3 = new ColumnSegment(53, 57, new IdentifierValue("count"));
- ParameterMarkerExpressionSegment parameterMarkerExpressionSegment3 = new ParameterMarkerExpressionSegment(59, 59, 2);
- ExpressionSegment expressionSegment3 = new BinaryOperationExpression(53, 59, columnSegment3, parameterMarkerExpressionSegment3, "=", "count=?");
- BinaryOperationExpression expression = new BinaryOperationExpression(28, 59, expressionOr, expressionSegment3, "AND", "status=? OR status=? AND count=?");
- ExpressionBuilder expressionBuilder = new ExpressionBuilder(expression);
- OrPredicateSegment result = expressionBuilder.extractAndPredicates();
- Iterator<AndPredicate> andPredicateIterator = result.getAndPredicates().iterator();
- AndPredicate andPredicate1 = andPredicateIterator.next();
- AndPredicate andPredicate2 = andPredicateIterator.next();
- assertThat(result.getAndPredicates().size(), is(2));
+ ColumnSegment statusColumn = new ColumnSegment(0, 0, new IdentifierValue("status"));
+ ParameterMarkerExpressionSegment statusParameterExpression = new ParameterMarkerExpressionSegment(0, 0, 0);
+ ExpressionSegment leftExpression = new BinaryOperationExpression(0, 0, statusColumn, statusParameterExpression, "=", "status=?");
+ ColumnSegment countColumn = new ColumnSegment(0, 0, new IdentifierValue("count"));
+ ParameterMarkerExpressionSegment countParameterExpression = new ParameterMarkerExpressionSegment(0, 0, 1);
+ ExpressionSegment subLeftExpression = new BinaryOperationExpression(0, 0, statusColumn, statusParameterExpression, "=", "status=?");
+ ExpressionSegment subRightExpression = new BinaryOperationExpression(0, 0, countColumn, countParameterExpression, "=", "count=?");
+ BinaryOperationExpression rightExpression = new BinaryOperationExpression(0, 0, subLeftExpression, subRightExpression, "AND", "status=? AND count=?");
+ BinaryOperationExpression expression = new BinaryOperationExpression(0, 0, leftExpression, rightExpression, "OR", "status=? OR status=? AND count=?");
+ Collection<AndPredicate> actual = ExpressionExtractUtil.getAndPredicates(expression);
+ assertThat(actual.size(), is(2));
+ Iterator<AndPredicate> iterator = actual.iterator();
+ AndPredicate andPredicate1 = iterator.next();
+ AndPredicate andPredicate2 = iterator.next();
assertThat(andPredicate1.getPredicates().size(), is(1));
assertThat(andPredicate2.getPredicates().size(), is(2));
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-expression.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-expression.xml
index e307bfe..0d7888f 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-expression.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-expression.xml
@@ -332,6 +332,87 @@
</where>
</select>
+ <select sql-case-id="select_where_with_expr_with_and_or" parameters="1,2,2">
+ <from start-index="14" stop-index="20">
+ <simple-table name="t_order" start-index="14" stop-index="20"/>
+ </from>
+ <projections distinct-row="false" start-index="7" stop-index="7">
+ <shorthand-projection start-index="7" stop-index="7"/>
+ </projections>
+ <where start-index="22" stop-index="126">
+ <expr>
+ <binary-operation-expression start-index="28" stop-index="126">
+ <left>
+ <binary-operation-expression start-index="28" stop-index="72">
+ <left>
+ <binary-operation-expression start-index="28" stop-index="47">
+ <left>
+ <column name="order_id" start-index="28" stop-index="43">
+ <owner name="t_order" start-index="28" stop-index="34"/>
+ </column>
+ </left>
+ <operator>=</operator>
+ <right>
+ <literal-expression value="1" start-index="47" stop-index="47"/>
+ <parameter-marker-expression value="0" start-index="47" stop-index="47"/>
+ </right>
+ </binary-operation-expression>
+ </left>
+ <operator>AND</operator>
+ <right>
+ <binary-operation-expression start-index="53" stop-index="72">
+ <left>
+ <literal-expression value="2" start-index="53" stop-index="53"/>
+ <parameter-marker-expression value="1" start-index="53" stop-index="53"/>
+ </left>
+ <operator>=</operator>
+ <right>
+ <column name="order_id" start-index="57" stop-index="72">
+ <owner name="t_order" start-index="57" stop-index="63"/>
+ </column>
+ </right>
+ </binary-operation-expression>
+ </right>
+ </binary-operation-expression>
+ </left>
+ <operator>OR</operator>
+ <right>
+ <binary-operation-expression start-index="77" stop-index="126">
+ <left>
+ <binary-operation-expression start-index="77" stop-index="101">
+ <left>
+ <column name="status" start-index="77" stop-index="90">
+ <owner name="t_order" start-index="77" stop-index="83"/>
+ </column>
+ </left>
+ <operator>=</operator>
+ <right>
+ <literal-expression value="failed" start-index="94" stop-index="101"/>
+ </right>
+ </binary-operation-expression>
+ </left>
+ <operator>AND</operator>
+ <right>
+ <binary-operation-expression start-index="107" stop-index="126">
+ <left>
+ <literal-expression value="2" start-index="107" stop-index="107"/>
+ <parameter-marker-expression value="2" start-index="107" stop-index="107"/>
+ </left>
+ <operator>=</operator>
+ <right>
+ <column name="order_id" start-index="111" stop-index="126">
+ <owner name="t_order" start-index="111" stop-index="117"/>
+ </column>
+ </right>
+ </binary-operation-expression>
+ </right>
+ </binary-operation-expression>
+ </right>
+ </binary-operation-expression>
+ </expr>
+ </where>
+ </select>
+
<select sql-case-id="select_where_with_expr_with_and_sign" parameters="1,2">
<from start-index="14" stop-index="20">
<simple-table name="t_order" start-index="14" stop-index="20"/>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-expression.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-expression.xml
index 8821b44..3d63dec 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-expression.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-expression.xml
@@ -27,6 +27,7 @@
<sql-case id="select_where_with_expr_with_or_sign" value="SELECT * FROM t_order WHERE t_order.order_id = ? || ? = t_order.order_id" db-types="MySQL"/>
<sql-case id="select_where_with_expr_with_xor" value="SELECT * FROM t_order WHERE t_order.order_id = ? XOR ? = t_order.order_id" db-types="MySQL"/>
<sql-case id="select_where_with_expr_with_and" value="SELECT * FROM t_order WHERE t_order.order_id = ? AND ? = t_order.order_id" db-types="MySQL"/>
+ <sql-case id="select_where_with_expr_with_and_or" value="SELECT * FROM t_order WHERE t_order.order_id = ? AND ? = t_order.order_id OR t_order.status = 'failed' AND ? = t_order.order_id"/>
<sql-case id="select_where_with_expr_with_and_sign" value="SELECT * FROM t_order WHERE t_order.order_id = ? && ? = t_order.order_id" db-types="MySQL"/>
<sql-case id="select_where_with_expr_with_not" value="SELECT * FROM t_order WHERE NOT (? = t_order.order_id)" db-types="MySQL"/>
<sql-case id="select_where_with_expr_with_not_sign" value="SELECT * FROM t_order WHERE ! ( ? = t_order.order_id)" db-types="MySQL"/>