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 2020/09/12 00:45:16 UTC
[shardingsphere] branch master updated (8e001b7 -> 6c91b6e)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from 8e001b7 Merge pull request #7397 from strongduanmu/issue-7170-ddl
new 8816778 merge from upstream master
new 3e43d12 fix
new fe36767 fix test case
new 3e347db fix
new e1060cf merge from upstream/master
new 87d2177 fix
new b7c6f09 simplify code
new e054c5a merge from upstream master
new c79ecd5 fix
new 222f71e Merge branch 'master' into fix-6938
new 2ed972d delete unused import
new 68aa0cb fix
new cc17c1f fix
new 03ee182 fix
new ec00860 fix
new 773e451 fix
new 6c91b6e Merge pull request #7353 from jingshanglu/fix-6938
The 26869 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../rewrite/condition/EncryptConditionEngine.java | 74 +++--
.../impl/EncryptPredicateColumnTokenGenerator.java | 43 ++-
.../shadow/condition/ShadowConditionEngine.java | 54 ++--
.../impl/ShadowPredicateColumnTokenGenerator.java | 21 +-
.../impl/PreparedShadowDataSourceJudgeEngine.java | 57 ++--
.../impl/SimpleShadowDataSourceRouterTest.java | 19 +-
.../merge/dql/ShardingDQLResultMergerTest.java | 18 +-
.../dql/groupby/GroupByStreamMergedResultTest.java | 18 +-
.../dql/orderby/OrderByStreamMergedResultTest.java | 16 +-
.../engine/WhereClauseShardingConditionEngine.java | 64 +++-
.../generator/ConditionValueGenerator.java | 6 +-
.../generator/ConditionValueGeneratorFactory.java | 26 +-
.../ConditionValueBetweenOperatorGenerator.java | 18 +-
.../ConditionValueCompareOperatorGenerator.java | 12 +-
.../impl/ConditionValueInOperatorGenerator.java | 12 +-
.../impl/ShardingInsertStatementValidator.java | 2 +-
.../impl/ShardingUpdateStatementValidator.java | 56 ++--
...ConditionValueBetweenOperatorGeneratorTest.java | 24 +-
...ConditionValueCompareOperatorGeneratorTest.java | 36 ++-
.../ConditionValueInOperatorGeneratorTest.java | 13 +-
.../impl/ShardingDeleteStatementValidatorTest.java | 16 +-
.../impl/ShardingUpdateStatementValidatorTest.java | 33 +-
.../pagination/engine/PaginationContextEngine.java | 17 +-
.../engine/RowNumberPaginationContextEngine.java | 65 ++--
.../engine/TopPaginationContextEngine.java | 60 ++--
.../parser/binder/segment/table/TablesContext.java | 17 +-
.../statement/dml/DeleteStatementContext.java | 33 +-
.../statement/dml/InsertStatementContext.java | 5 +-
.../statement/dml/SelectStatementContext.java | 10 +-
.../statement/dml/UpdateStatementContext.java | 33 +-
.../engine/PaginationContextEngineTest.java | 10 +-
.../RowNumberPaginationContextEngineTest.java | 40 +--
.../engine/TopPaginationContextEngineTest.java | 43 ++-
.../engine/ProjectionsContextEngineTest.java | 20 +-
.../statement/dml/DeleteStatementContextTest.java | 33 +-
.../statement/dml/UpdateStatementContextTest.java | 35 +--
.../statement/impl/SelectStatementContextTest.java | 31 +-
.../sql/parser/mysql/visitor/MySQLVisitor.java | 224 ++++++++------
.../parser/mysql/visitor/impl/MySQLDMLVisitor.java | 143 ++++-----
.../sql/parser/oracle/visitor/OracleVisitor.java | 189 ++++++------
.../oracle/visitor/impl/OracleDMLVisitor.java | 146 ++++-----
.../main/antlr4/imports/postgresql/DMLStatement.g4 | 2 +-
.../postgresql/visitor/PostgreSQLVisitor.java | 118 ++++++--
.../visitor/impl/PostgreSQLDMLVisitor.java | 135 ++++-----
.../sql/parser/sql92/visitor/SQL92Visitor.java | 197 ++++++------
.../parser/sql92/visitor/impl/SQL92DMLVisitor.java | 133 ++++-----
.../parser/sqlserver/visitor/SQLServerVisitor.java | 209 +++++++------
.../visitor/impl/SQLServerDMLVisitor.java | 147 ++++-----
.../segment/dml/JoinSpecificationSegment.java | 64 ----
.../sql/common/segment/dml/JoinedTableSegment.java | 54 ----
.../sql/common/segment/dml/TableFactorSegment.java | 60 ----
.../common/segment/dml/TableReferenceSegment.java | 56 ----
.../common/segment/dml/column/ColumnSegment.java | 4 +-
.../expr/AggregateExpression.java} | 16 +-
.../segment/dml/expr/AllColumnExpression.java | 11 +-
.../expr/BetweenExpression.java} | 16 +-
.../expr/BinaryOperationExpression.java} | 17 +-
.../expr/InExpression.java} | 29 +-
.../expr/ListExpression.java} | 15 +-
.../expr/NotExpression.java} | 9 +-
.../dml/expr/complex/ComplexExpressionSegment.java | 3 +-
.../segment/dml/expr/subquery/SubquerySegment.java | 6 +-
.../common/segment/dml/predicate/AndPredicate.java | 3 +-
.../segment/dml/predicate/PredicateSegment.java | 40 ---
.../common/segment/dml/predicate/WhereSegment.java | 6 +-
.../value/PredicateBetweenRightValue.java | 38 ---
.../value/PredicateCompareRightValue.java | 38 ---
.../dml/predicate/value/PredicateInRightValue.java | 38 ---
.../dml/predicate/value/PredicateRightValue.java | 26 --
.../table/DeleteMultiTableSegment.java} | 28 +-
...ueryTableSegment.java => JoinTableSegment.java} | 41 ++-
.../sql/common/statement/dml/DeleteStatement.java | 6 +-
.../sql/common/statement/dml/SelectStatement.java | 6 +-
.../sql/common/statement/dml/UpdateStatement.java | 6 +-
.../common/util/ColumnExtractFromExpression.java | 49 +++
.../sql/common/util/ExpressionBuildUtil.java | 76 +++++
.../sql/parser/sql/common/util/SQLUtil.java | 37 +++
.../parser/sql/common/util/TableExtractUtils.java | 332 +++++++--------------
.../sql/common/util/WhereSegmentExtractUtils.java | 107 ++-----
.../common/util/predicate/PredicateBuildUtils.java | 109 -------
.../util/predicate/PredicateExtractUtils.java | 78 -----
.../asserts/segment/JoinSpecificationAssert.java | 47 ---
.../asserts/segment/PredicatesAssert.java | 196 ------------
.../asserts/segment/TableReferencesAssert.java | 55 ----
.../asserts/segment/table/JoinTableAssert.java | 66 ----
.../asserts/segment/table/TableFactorAssert.java | 57 ----
.../asserts/segment/where/WhereClauseAssert.java | 3 +-
.../statement/dml/impl/DeleteStatementAssert.java | 3 +-
.../statement/dml/impl/SelectStatementAssert.java | 9 +-
.../statement/dml/impl/UpdateStatementAssert.java | 3 +-
90 files changed, 1889 insertions(+), 2707 deletions(-)
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/JoinSpecificationSegment.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/JoinedTableSegment.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/TableFactorSegment.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/TableReferenceSegment.java
copy shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/{dal/VariableAssignSegment.java => dml/expr/AggregateExpression.java} (76%)
copy shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/DatabaseAccessConfiguration.java => shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/AllColumnExpression.java (81%)
copy shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/{dal/VariableAssignSegment.java => dml/expr/BetweenExpression.java} (81%)
copy shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/{dal/VariableSegment.java => dml/expr/BinaryOperationExpression.java} (79%)
copy shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/{generic/DataTypeLengthSegment.java => dml/expr/InExpression.java} (62%)
copy shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/{dal/VariableAssignSegment.java => dml/expr/ListExpression.java} (82%)
copy shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/{dal/VariableAssignSegment.java => dml/expr/NotExpression.java} (81%)
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/predicate/PredicateSegment.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/predicate/value/PredicateBetweenRightValue.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/predicate/value/PredicateCompareRightValue.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/predicate/value/PredicateInRightValue.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/predicate/value/PredicateRightValue.java
copy shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/{dal/FromTableSegment.java => generic/table/DeleteMultiTableSegment.java} (68%)
copy shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/generic/table/{SubqueryTableSegment.java => JoinTableSegment.java} (70%)
create mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/util/ColumnExtractFromExpression.java
create mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionBuildUtil.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/util/predicate/PredicateBuildUtils.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/util/predicate/PredicateExtractUtils.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/JoinSpecificationAssert.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/PredicatesAssert.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/TableReferencesAssert.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/table/JoinTableAssert.java
delete mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/table/TableFactorAssert.java