From feff6b2b61dd33bd8794e4a1051599395fb33631 Mon Sep 17 00:00:00 2001 From: tristaZero Date: Wed, 5 Jun 2019 16:22:16 +0800 Subject: [PATCH] solve Conflicts --- .../apache/shardingsphere/core/rewrite/SQLRewriteEngine.java | 4 ++-- .../core/rewrite/rewriter/sql/BaseSQLRewriter.java | 3 ++- .../core/rewrite/rewriter/sql/EncryptSQLRewriter.java | 2 +- .../core/rewrite/rewriter/sql/ShardingSQLRewriter.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java index 7a2c3548b9..5d2c9f32c3 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java @@ -19,7 +19,6 @@ package org.apache.shardingsphere.core.rewrite; import com.google.common.base.Optional; import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement; -import org.apache.shardingsphere.core.parse.sql.token.SQLToken; import org.apache.shardingsphere.core.rewrite.builder.ParameterBuilder; import org.apache.shardingsphere.core.rewrite.builder.SQLBuilder; import org.apache.shardingsphere.core.rewrite.rewriter.parameter.ParameterRewriter; @@ -29,6 +28,7 @@ import org.apache.shardingsphere.core.rewrite.token.BaseTokenGenerateEngine; import org.apache.shardingsphere.core.rewrite.token.EncryptTokenGenerateEngine; import org.apache.shardingsphere.core.rewrite.token.MasterSlaveTokenGenerateEngine; import org.apache.shardingsphere.core.rewrite.token.ShardingTokenGenerateEngine; +import org.apache.shardingsphere.core.rewrite.token.pojo.SQLToken; import org.apache.shardingsphere.core.route.SQLUnit; import org.apache.shardingsphere.core.route.type.RoutingUnit; import org.apache.shardingsphere.core.route.type.TableUnit; @@ -92,7 +92,7 @@ public final class SQLRewriteEngine { } private List createSQLTokens(final BaseRule baseRule, final SQLStatement sqlStatement, final boolean isSingleRoute) { - List result = new LinkedList<>(sqlStatement.getSQLTokens()); + List result = new LinkedList<>(); result.addAll(new BaseTokenGenerateEngine().generateSQLTokens(sqlStatement, baseRule, isSingleRoute)); if (baseRule instanceof ShardingRule) { ShardingRule shardingRule = (ShardingRule) baseRule; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/BaseSQLRewriter.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/BaseSQLRewriter.java index d60c67424b..e46da0663d 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/BaseSQLRewriter.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/BaseSQLRewriter.java @@ -19,15 +19,16 @@ package org.apache.shardingsphere.core.rewrite.rewriter.sql; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement; -import org.apache.shardingsphere.core.parse.sql.token.SQLToken; import org.apache.shardingsphere.core.rewrite.builder.ParameterBuilder; import org.apache.shardingsphere.core.rewrite.builder.SQLBuilder; import org.apache.shardingsphere.core.rewrite.placeholder.InsertColumnsPlaceholder; import org.apache.shardingsphere.core.rewrite.token.pojo.InsertColumnsToken; +import org.apache.shardingsphere.core.rewrite.token.pojo.SQLToken; import org.apache.shardingsphere.core.rewrite.token.pojo.Substitutable; import java.util.List; + /** * Base SQL rewriter. * diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/EncryptSQLRewriter.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/EncryptSQLRewriter.java index 4a6499824c..d3bb9e53af 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/EncryptSQLRewriter.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/EncryptSQLRewriter.java @@ -29,7 +29,6 @@ import org.apache.shardingsphere.core.parse.sql.segment.dml.expr.simple.Paramete import org.apache.shardingsphere.core.parse.sql.segment.dml.predicate.PredicateSegment; import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement; import org.apache.shardingsphere.core.parse.sql.statement.dml.UpdateStatement; -import org.apache.shardingsphere.core.parse.sql.token.SQLToken; import org.apache.shardingsphere.core.rewrite.builder.ParameterBuilder; import org.apache.shardingsphere.core.rewrite.builder.SQLBuilder; import org.apache.shardingsphere.core.rewrite.placeholder.InsertAssistedColumnsPlaceholder; @@ -46,6 +45,7 @@ import org.apache.shardingsphere.core.rewrite.token.pojo.InsertAssistedColumnsTo import org.apache.shardingsphere.core.rewrite.token.pojo.InsertSetAddAssistedColumnsToken; import org.apache.shardingsphere.core.rewrite.token.pojo.InsertSetEncryptValueToken; import org.apache.shardingsphere.core.rewrite.token.pojo.InsertValuesToken; +import org.apache.shardingsphere.core.rewrite.token.pojo.SQLToken; import org.apache.shardingsphere.core.rule.ColumnNode; import org.apache.shardingsphere.core.strategy.encrypt.ShardingEncryptorEngine; import org.apache.shardingsphere.spi.encrypt.ShardingEncryptor; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/ShardingSQLRewriter.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/ShardingSQLRewriter.java index 6906b0560c..41f2a4a0b1 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/ShardingSQLRewriter.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/ShardingSQLRewriter.java @@ -25,7 +25,6 @@ import org.apache.shardingsphere.core.optimize.result.insert.InsertOptimizeResul import org.apache.shardingsphere.core.parse.sql.segment.dml.order.item.OrderByItemSegment; import org.apache.shardingsphere.core.parse.sql.segment.dml.order.item.TextOrderByItemSegment; import org.apache.shardingsphere.core.parse.sql.statement.dml.SelectStatement; -import org.apache.shardingsphere.core.parse.sql.token.SQLToken; import org.apache.shardingsphere.core.rewrite.builder.ParameterBuilder; import org.apache.shardingsphere.core.rewrite.builder.SQLBuilder; import org.apache.shardingsphere.core.rewrite.placeholder.AggregationDistinctPlaceholder; @@ -45,6 +44,7 @@ import org.apache.shardingsphere.core.rewrite.token.pojo.InsertSetAddGeneratedKe import org.apache.shardingsphere.core.rewrite.token.pojo.OffsetToken; import org.apache.shardingsphere.core.rewrite.token.pojo.OrderByToken; import org.apache.shardingsphere.core.rewrite.token.pojo.RowCountToken; +import org.apache.shardingsphere.core.rewrite.token.pojo.SQLToken; import org.apache.shardingsphere.core.rewrite.token.pojo.SelectItemPrefixToken; import org.apache.shardingsphere.core.rewrite.token.pojo.SelectItemsToken; import org.apache.shardingsphere.core.rewrite.token.pojo.TableToken; -- GitLab