This is an automated email from the ASF dual-hosted git repository. wuweijie pushed a commit to branch opengauss_adapt in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
commit 848fc02c18d6072ca8e10b764bf2d98634dbc763 Merge: 20d27b4 0a87730 Author: 吴伟杰 <[email protected]> AuthorDate: Tue Jul 6 18:46:25 2021 +0800 Merge remote-tracking branch 'apache/master' into opengauss_adapt .github/workflows/ci.yml | 45 +++--- .github/workflows/it.yml | 3 + .../features/sharding/principle/parse.cn.md | 4 +- .../features/sharding/principle/parse.en.md | 4 +- .../query/text/PostgreSQLDataRowPacket.java | 4 + .../query/text/PostgreSQLDataRowPacketTest.java | 10 ++ shardingsphere-distsql-parser/pom.xml | 1 - .../RQLStatement.java => DistSQLStatement.java} | 6 +- .../distsql/parser/statement/ral/RALStatement.java | 4 +- .../distsql/parser/statement/rdl/RDLStatement.java | 4 +- .../statement/rdl/ResourceDefinitionStatement.java | 8 +- ...Statement.java => RuleDefinitionStatement.java} | 6 +- .../statement/rdl/alter/AlterRuleStatement.java | 4 +- .../statement/rdl/create/AddResourceStatement.java | 4 +- .../statement/rdl/create/CreateRuleStatement.java | 4 +- .../statement/rdl/drop/DropResourceStatement.java | 4 +- .../statement/rdl/drop/DropRuleStatement.java | 4 +- .../distsql/parser/statement/rql/RQLStatement.java | 4 +- .../shardingsphere-db-discovery-core/pom.xml | 13 +- .../DatabaseDiscoveryRuleNotExistedException.java | 34 ----- .../InvalidDatabaseDiscoveryTypesException.java | 34 ----- .../DatabaseDiscoveryRuleStatementConverter.java | 70 ---------- .../shardingsphere-db-discovery-distsql/pom.xml | 1 + .../pom.xml | 12 +- .../DatabaseDiscoveryRuleStatementConverter.java | 58 ++++++++ .../query/DatabaseDiscoveryRuleQueryResultSet.java | 2 +- ...AlterDatabaseDiscoveryRuleStatementUpdater.java | 69 +++++----- ...reateDatabaseDiscoveryRuleStatementUpdater.java | 46 +++---- .../DropDatabaseDiscoveryRuleStatementUpdater.java | 24 ++-- ...shardingsphere.infra.distsql.query.RQLResultSet | 2 +- ...ere.infra.distsql.update.RuleDefinitionUpdater} | 6 +- ...atabaseDiscoveryRuleStatementConverterTest.java | 15 +- .../DatabaseDiscoveryRuleQueryResultSetTest.java | 6 +- ...rDatabaseDiscoveryRuleStatementUpdaterTest.java | 31 ++--- ...eDatabaseDiscoveryRuleStatementUpdaterTest.java | 21 +-- ...pDatabaseDiscoveryRuleStatementUpdaterTest.java | 15 +- .../pom.xml | 2 +- .../shardingsphere-encrypt-core/pom.xml | 7 +- .../converter/EncryptRuleStatementConverter.java | 83 ----------- .../shardingsphere-encrypt-distsql/pom.xml | 1 + .../pom.xml | 12 +- .../converter/EncryptRuleStatementConverter.java | 79 +++++++++++ .../handler}/query/EncryptRuleQueryResultSet.java | 2 +- .../update/AlterEncryptRuleStatementUpdater.java | 65 ++++----- .../update/CreateEncryptRuleStatementUpdater.java | 39 +++--- .../update/DropEncryptRuleStatementUpdater.java | 25 ++-- ...shardingsphere.infra.distsql.query.RQLResultSet | 2 +- ...ere.infra.distsql.update.RuleDefinitionUpdater} | 4 +- .../EncryptRuleStatementConverterTest.java | 20 ++- .../query/EncryptRuleQueryResultSetTest.java | 2 +- .../AlterEncryptRuleStatementUpdaterTest.java | 25 ++-- .../CreateEncryptRuleStatementUpdaterTest.java | 15 +- .../DropEncryptRuleStatementUpdaterTest.java | 15 +- .../parser/segment/EncryptColumnSegment.java | 2 + .../pom.xml | 7 +- .../exception/InvalidLoadBalancersException.java | 34 ----- .../ReadwriteSplittingRuleNotExistedException.java | 34 ----- .../ReadwriteSplittingRuleStatementConverter.java | 92 ------------- ....shardingsphere.infra.distsql.update.RDLUpdater | 20 --- .../pom.xml | 1 + .../pom.xml | 12 +- .../ReadwriteSplittingRuleStatementConverter.java | 70 ++++++++++ .../ReadwriteSplittingRuleQueryResultSet.java | 2 +- ...lterReadwriteSplittingRuleStatementUpdater.java | 71 +++++----- ...eateReadwriteSplittingRuleStatementUpdater.java | 46 +++---- ...DropReadwriteSplittingRuleStatementUpdater.java | 24 ++-- ...hardingsphere.infra.distsql.query.RQLResultSet} | 4 +- ...ere.infra.distsql.update.RuleDefinitionUpdater} | 6 +- .../ReadwriteSplittingRuleQueryResultSetTest.java | 2 +- ...ReadwriteSplittingRuleStatementUpdaterTest.java | 31 ++--- ...ReadwriteSplittingRuleStatementUpdaterTest.java | 21 +-- ...ReadwriteSplittingRuleStatementUpdaterTest.java | 15 +- .../impl/PreparedShadowDataSourceRouterTest.java | 28 +++- .../impl/SimpleShadowDataSourceRouterTest.java | 37 +++-- .../shardingsphere-sharding-core/pom.xml | 2 +- .../converter/ShardingRuleStatementConverter.java | 152 --------------------- .../exception/DuplicateBindingTablesException.java | 34 ----- .../exception/DuplicateTablesException.java | 34 ----- .../exception/InvalidKeyGeneratorsException.java | 34 ----- .../InvalidShardingAlgorithmsException.java | 34 ----- ...ShardingBindingTableRuleNotExistsException.java | 32 ----- ...ShardingBroadcastTableRuleExistedException.java | 32 ----- ...ardingBroadcastTableRuleNotExistsException.java | 32 ----- .../ShardingTableRuleNotExistedException.java | 34 ----- .../ShardingTableRulesInUsedException.java | 34 ----- .../token/generator/impl/TableTokenGenerator.java | 4 +- ....shardingsphere.infra.distsql.update.RDLUpdater | 26 ---- .../merge/ShardingResultMergerEngineTest.java | 30 ++-- .../merge/dql/ShardingDQLResultMergerTest.java | 3 +- .../dql/groupby/GroupByStreamMergedResultTest.java | 3 +- .../dql/orderby/OrderByStreamMergedResultTest.java | 3 +- .../type/ShardingRouteEngineFactoryTest.java | 5 +- .../engine/type/standard/AbstractSQLRouteTest.java | 7 +- .../ShardingAlterTableStatementValidatorTest.java | 33 ++--- .../ShardingAlterViewStatementValidatorTest.java | 5 +- ...ardingCreateFunctionStatementValidatorTest.java | 11 +- .../ShardingCreateIndexStatementValidatorTest.java | 13 +- ...rdingCreateProcedureStatementValidatorTest.java | 11 +- .../ShardingCreateTableStatementValidatorTest.java | 27 ++-- .../ShardingCreateViewStatementValidatorTest.java | 5 +- .../ShardingDropTableStatementValidatorTest.java | 15 +- .../ddl/ShardingPrepareStatementValidatorTest.java | 5 +- .../dml/ShardingDeleteStatementValidatorTest.java | 7 +- .../dml/ShardingInsertStatementValidatorTest.java | 42 +++--- .../dml/ShardingUpdateStatementValidatorTest.java | 9 +- .../yaml/distsql/sharding-rule-config.yaml | 51 ------- .../shardingsphere-sharding-distsql/pom.xml | 1 + .../pom.xml | 12 +- .../converter/ShardingRuleStatementConverter.java | 91 ++++++++++++ .../ShardingBindingTableRuleQueryResultSet.java | 2 +- .../ShardingBroadcastTableRuleQueryResultSet.java | 2 +- .../query/ShardingTableRuleQueryResultSet.java | 2 +- ...erShardingBindingTableRuleStatementUpdater.java | 49 ++++--- ...ShardingBroadcastTableRuleStatementUpdater.java | 30 ++-- .../AlterShardingTableRuleStatementUpdater.java | 80 +++++------ ...teShardingBindingTableRuleStatementUpdater.java | 47 ++++--- ...ShardingBroadcastTableRuleStatementUpdater.java | 36 ++--- .../CreateShardingTableRuleStatementUpdater.java | 45 +++--- ...opShardingBindingTableRuleStatementUpdater.java | 17 +-- ...ShardingBroadcastTableRuleStatementUpdater.java | 17 +-- .../DropShardingTableRuleStatementUpdater.java | 33 +++-- ...shardingsphere.infra.distsql.query.RQLResultSet | 6 +- ...here.infra.distsql.update.RuleDefinitionUpdater | 26 ++++ .../ShardingRuleStatementConverterTest.java | 38 +++--- .../fixture/StandardShardingAlgorithmFixture.java | 31 +++-- ...ShardingBindingTableRuleQueryResultSetTest.java | 1 + ...ardingBroadcastTableRuleQueryResultSetTest.java | 1 + .../query/ShardingTableRuleQueryResultSetTest.java | 52 +++++-- ...ardingBindingTableRuleStatementUpdaterTest.java | 20 ++- ...dingBroadcastTableRuleStatementUpdaterTest.java | 27 ++-- ...AlterShardingTableRuleStatementUpdaterTest.java | 38 +++--- ...ardingBindingTableRuleStatementUpdaterTest.java | 13 +- ...reateShardingTableRuleStatementUpdaterTest.java | 14 +- ...ardingBindingTableRuleStatementUpdaterTest.java | 14 +- ...dingBroadcastTableRuleStatementUpdaterTest.java | 14 +- .../DropShardingTableRuleStatementUpdaterTest.java | 21 +-- ....shardingsphere.sharding.spi.ShardingAlgorithm} | 2 +- .../infra/binder/SQLStatementContextFactory.java | 28 +++- .../infra/binder/segment/table/TablesContext.java | 14 ++ .../statement/dal/ShowColumnsStatementContext.java | 14 +- .../dal/ShowCreateTableStatementContext.java | 2 +- .../statement/dal/ShowIndexStatementContext.java | 2 +- ...t.java => ShowTableStatusStatementContext.java} | 24 ++-- ...ontext.java => ShowTablesStatementContext.java} | 24 ++-- .../statement/ddl/DropIndexStatementContext.java | 2 +- .../statement/ddl/DropTableStatementContext.java | 2 +- .../statement/ddl/TruncateStatementContext.java | 2 +- .../statement/dml/InsertStatementContext.java | 30 ++-- .../statement/dml/SelectStatementContext.java | 16 ++- .../infra/binder/type}/RemoveAvailable.java | 13 +- .../engine/GeneratedKeyContextEngineTest.java | 9 +- .../orderby/engine/OrderByContextEngineTest.java | 7 +- .../select/pagination/PaginationContextTest.java | 13 +- .../projection/engine/ProjectionEngineTest.java | 5 +- .../engine/ProjectionsContextEngineTest.java | 41 ++++-- .../binder/segment/table/TablesContextTest.java | 5 +- .../statement/SQLStatementContextFactoryTest.java | 22 ++- .../statement/dml/DeleteStatementContextTest.java | 5 +- .../statement/dml/UpdateStatementContextTest.java | 5 +- .../statement/impl/InsertStatementContextTest.java | 71 +++++----- .../statement/impl/SelectStatementContextTest.java | 15 +- .../infra/distsql/exception/DistSQLException.java | 17 ++- .../resource}/DuplicateResourceException.java | 6 +- .../resource}/InvalidResourceException.java | 6 +- .../resource/RequiredResourceMissedException.java} | 10 +- .../ResourceDefinitionViolationException.java} | 14 +- .../resource}/ResourceInUsedException.java | 6 +- .../exception/rule/DuplicateRuleException.java} | 10 +- .../InvalidAlgorithmConfigurationException.java} | 12 +- .../rule/RequiredRuleMissedException.java | 18 +-- .../rule/RuleDefinitionViolationException.java | 17 +-- .../exception/rule/RuleInUsedException.java | 18 +-- ...pdater.java => RuleDefinitionAlterUpdater.java} | 19 ++- ...dater.java => RuleDefinitionCreateUpdater.java} | 11 +- ...Updater.java => RuleDefinitionDropUpdater.java} | 7 +- ...{RDLUpdater.java => RuleDefinitionUpdater.java} | 8 +- .../AlterTableStatementFederateRefresherTest.java | 2 +- .../generator/generic/RemoveTokenGenerator.java | 62 +++++---- .../statement/ShardingSpherePreparedStatement.java | 4 +- .../core/statement/ShardingSphereStatement.java | 4 +- .../DatabaseCommunicationEngineFactory.java | 21 +-- .../jdbc/connection/BackendConnection.java | 9 ++ .../backend/text/SchemaRequiredBackendHandler.java | 5 +- .../text/TextProtocolBackendHandlerFactory.java | 29 ++-- .../text/data/DatabaseBackendHandlerFactory.java | 12 +- .../data/impl/BroadcastDatabaseBackendHandler.java | 8 +- .../impl/SchemaAssignedDatabaseBackendHandler.java | 6 +- .../data/impl/UnicastDatabaseBackendHandler.java | 6 +- .../CreateDatabaseBackendHandler.java | 2 +- .../DatabaseOperateBackendHandlerFactory.java} | 33 ++--- .../DropDatabaseBackendHandler.java | 5 +- .../text/distsql/DistSQLBackendHandlerFactory.java | 22 +-- .../text/distsql/ral/RALBackendHandlerFactory.java | 38 +++--- .../text/distsql/rdl/RDLBackendHandlerFactory.java | 31 ++--- .../text/distsql/rdl/impl/RDLBackendHandler.java | 93 ------------- .../AddResourceBackendHandler.java | 11 +- .../DropResourceBackendHandler.java | 17 +-- .../rdl/rule/RuleDefinitionBackendHandler.java | 116 ++++++++++++++++ .../text/distsql/rql/RQLBackendHandlerFactory.java | 2 +- .../explain/ShardingCTLExplainBackendHandler.java | 26 ++-- .../TransactionBackendHandlerFactory.java | 8 +- .../TextProtocolBackendHandlerFactoryTest.java | 10 +- .../DatabaseCommunicationEngineFactoryTest.java | 6 +- .../DatabaseCommunicationEngineTest.java | 11 +- .../DatabaseOperateBackendHandlerFactoryTest.java} | 128 ++--------------- .../data/DatabaseBackendHandlerFactoryTest.java | 18 ++- .../impl/BroadcastDatabaseBackendHandlerTest.java | 3 +- .../SchemaAssignedDatabaseBackendHandlerTest.java | 3 +- .../impl/UnicastDatabaseBackendHandlerTest.java | 3 +- .../DropDatabaseBackendHandlerTest.java | 2 +- .../distsql/DistSQLBackendHandlerFactoryTest.java | 99 ++------------ .../AddResourceBackendHandlerTest.java | 9 +- .../ShardingCTLExplainBackendHandlerTest.java | 1 + .../TransactionBackendHandlerFactoryTest.java | 14 +- .../execute/MySQLComStmtExecuteExecutor.java | 14 +- .../fieldlist/MySQLComFieldListPacketExecutor.java | 16 ++- .../frontend/mysql/err/MySQLErrPacketFactory.java | 10 +- .../command/MySQLCommandExecutorFactoryTest.java | 1 + .../execute/MySQLComStmtExecuteExecutorTest.java | 2 + .../mysql/err/MySQLErrPacketFactoryTest.java | 28 ++-- .../command/PostgreSQLConnectionContext.java | 17 +-- .../command/query/binary/PostgreSQLPortal.java | 10 +- .../execute/PostgreSQLComExecuteExecutor.java | 15 +- .../binary/parse/PostgreSQLComParseExecutor.java | 1 - .../execute/PostgreSQLComExecuteExecutorTest.java | 60 +++++++- .../parser/mysql/visitor/MySQLSQLStatVisitor.java | 3 +- .../statement/impl/MySQLStatementSQLVisitor.java | 6 +- .../src/main/antlr4/imports/oracle/BaseRule.g4 | 2 +- .../src/main/antlr4/imports/oracle/DDLStatement.g4 | 10 ++ .../main/antlr4/imports/oracle/OracleKeyword.g4 | 4 + .../sql/parser/autogen/OracleStatement.g4 | 1 + .../impl/OracleDDLStatementSQLVisitor.java | 21 +++ .../statement/impl/OracleStatementSQLVisitor.java | 6 +- .../impl/PostgreSQLDALStatementSQLVisitor.java | 4 +- .../impl/PostgreSQLDDLStatementSQLVisitor.java | 4 +- .../impl/PostgreSQLStatementSQLVisitor.java | 17 ++- .../statement/impl/SQL92StatementSQLVisitor.java | 2 +- .../impl/SQLServerStatementSQLVisitor.java | 2 +- .../core/database/visitor/SQLVisitorRule.java | 2 + .../sql/parser/api/SQLParserEngineTest.java | 74 ++++++++++ .../sql/parser/core/SQLParserFactoryTest.java} | 28 ++-- .../sql/parser/fixture/LexerFixture.java | 24 +++- .../sql/parser/fixture/ParserFixture.java | 29 +++- .../sql/common/extractor/TableExtractor.java | 9 +- .../sql/common/segment/dal/FromSchemaSegment.java | 4 +- .../segment/generic/table/SimpleTableSegment.java | 7 +- .../sql/common/statement/dml/SelectStatement.java | 12 +- .../sql/parser/sql/common/util/SQLUtil.java | 14 -- .../mysql/dal/MySQLShowColumnsStatement.java | 6 +- .../mysql/dal/MySQLShowTableStatusStatement.java | 6 +- .../mysql/dal/MySQLShowTablesStatement.java | 6 +- .../OracleDisassociateStatisticsStatement.java} | 35 ++--- .../sql/common/extractor/TableExtractorTest.java | 6 +- .../generic/table/SimpleTableSegmentTest.java | 4 +- .../handler/dal/ExplainStatementHandlerTest.java | 3 +- .../ddl/AlterIndexStatementHandlerTest.java | 3 +- .../handler/ddl/DropIndexStatementHandlerTest.java | 5 +- .../dataset/db/{alter_table.xml => alter_add.xml} | 0 ...ast_alter_table.xml => alter_broadcast_add.xml} | 0 ...hanged_table.xml => alter_broadcast_change.xml} | 2 +- ...nchanged_table.xml => alter_broadcast_drop.xml} | 1 - .../db/{alter_table.xml => alter_change.xml} | 3 +- .../dataset/db/{alter_table.xml => alter_drop.xml} | 2 - ...create_index.xml => create_broadcast_index.xml} | 0 ...hanged_table.xml => create_broadcast_table.xml} | 0 ...index.xml => create_broadcast_unique_index.xml} | 0 ...ast_drop_table.xml => drop_broadcast_table.xml} | 0 ...ate_table.xml => unchanged_broadcast_table.xml} | 0 .../{alter_table.xml => alter_add.xml} | 0 ...ast_alter_table.xml => alter_broadcast_add.xml} | 0 ...create_table.xml => alter_broadcast_change.xml} | 2 +- ...t_create_table.xml => alter_broadcast_drop.xml} | 1 - .../{alter_table.xml => alter_change.xml} | 3 +- .../{alter_table.xml => alter_drop.xml} | 2 - ...create_index.xml => create_broadcast_index.xml} | 0 ...hanged_table.xml => create_broadcast_table.xml} | 0 ...index.xml => create_broadcast_unique_index.xml} | 0 ...ast_drop_table.xml => drop_broadcast_table.xml} | 0 ...ate_table.xml => unchanged_broadcast_table.xml} | 0 .../{create_user_table.xml => alter_add.xml} | 4 +- ...ange_column_user_table.xml => alter_change.xml} | 5 +- .../{drop_column_user_table.xml => alter_drop.xml} | 3 +- .../{create_user_table.xml => create_index.xml} | 4 +- .../{create_user_table.xml => create_table.xml} | 5 +- ...eate_user_table.xml => create_unique_index.xml} | 4 +- .../{drop_user_table.xml => drop_table.xml} | 0 ...nchanged_user_table.xml => unchanged_table.xml} | 3 +- .../{unchanged_user_table.xml => alter_add.xml} | 4 +- ...ange_column_user_table.xml => alter_change.xml} | 3 +- .../{drop_column_user_table.xml => alter_drop.xml} | 3 +- .../{unchanged_user_table.xml => create_index.xml} | 4 +- .../{unchanged_user_table.xml => create_table.xml} | 5 +- ...nged_user_table.xml => create_unique_index.xml} | 4 +- .../{drop_user_table.xml => drop_table.xml} | 0 .../{create_user_table.xml => unchanged_table.xml} | 3 +- .../{alter_table.xml => alter_add.xml} | 0 ...ast_alter_table.xml => alter_broadcast_add.xml} | 0 ...create_table.xml => alter_broadcast_change.xml} | 2 +- ...t_create_table.xml => alter_broadcast_drop.xml} | 1 - .../{alter_table.xml => alter_change.xml} | 3 +- .../{alter_table.xml => alter_drop.xml} | 2 - ...create_index.xml => create_broadcast_index.xml} | 0 ...hanged_table.xml => create_broadcast_table.xml} | 0 ...index.xml => create_broadcast_unique_index.xml} | 0 ...ast_drop_table.xml => drop_broadcast_table.xml} | 0 ...ate_table.xml => unchanged_broadcast_table.xml} | 0 .../dataset/tbl/{alter_table.xml => alter_add.xml} | 0 ...ast_alter_table.xml => alter_broadcast_add.xml} | 0 ...hanged_table.xml => alter_broadcast_change.xml} | 2 +- ...nchanged_table.xml => alter_broadcast_drop.xml} | 1 - .../tbl/{alter_table.xml => alter_change.xml} | 3 +- .../tbl/{alter_table.xml => alter_drop.xml} | 2 - ...create_index.xml => create_broadcast_index.xml} | 0 ...hanged_table.xml => create_broadcast_table.xml} | 0 ...index.xml => create_broadcast_unique_index.xml} | 0 ...ast_drop_table.xml => drop_broadcast_table.xml} | 0 ...ate_table.xml => unchanged_broadcast_table.xml} | 0 .../cases/ddl/ddl-integration-test-cases.xml | 133 +++++++++++------- .../asserts/statement/ddl/DDLStatementAssert.java | 5 + .../DisassociateStatisticsStatementAssert.java | 75 ++++++++++ .../jaxb/cases/domain/SQLParserTestCases.java | 5 + .../DisassociateStatisticsStatementTestCase.java | 47 +++++++ .../resources/case/ddl/disassociate-statistics.xml | 40 ++++++ .../src/main/resources/case/dml/insert.xml | 14 ++ .../sql/supported/ddl/disassociate-statistics.xml | 27 ++++ .../main/resources/sql/supported/dml/insert.xml | 1 + .../EncryptSQLRewriterParameterizedTest.java | 17 ++- .../scenario/MixSQLRewriterParameterizedTest.java | 15 +- .../ShardingSQLRewriterParameterizedTest.java | 18 ++- 329 files changed, 2760 insertions(+), 2775 deletions(-)
