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 4cc1ad56b11549c239a9621194dcd8927e34cd3f Merge: cc158d5 e102f17 Author: 吴伟杰 <[email protected]> AuthorDate: Mon May 31 11:32:44 2021 +0800 Merge pull request #10572 from apache/master Merge master into opengauss_adapt docs/document/content/dev-manual/governance.cn.md | 1 - docs/document/content/dev-manual/governance.en.md | 1 - .../governance/management/registry-center.cn.md | 16 +- .../governance/management/registry-center.en.md | 16 +- .../configuration/authentication.cn.md | 10 +- .../configuration/authentication.en.md | 10 +- .../TestQueryAssistedShardingEncryptAlgorithm.java | 9 +- .../jpa/repository/OrderItemRepositoryImpl.java | 2 +- .../resources/META-INF/mappers/OrderItemMapper.xml | 2 +- examples/pom.xml | 7 + .../table/raw/jdbc/factory/DataSourceFactory.java | 2 +- .../raw/jdbc/factory/YamlDataSourceFactory.java | 2 +- ...application-encrypt-shadow-databases.properties | 3 +- ...readwrite-splitting-shadow-databases.properties | 4 +- ...pplication-sharding-shadow-databases.properties | 4 +- .../raw/jdbc/JavaConfigurationExampleMain.java | 6 +- .../jdbc/JavaRangeConfigurationExampleMain.java | 6 +- .../raw/jdbc/YamlConfigurationExampleMain.java | 6 +- .../jdbc/YamlRangeConfigurationExampleMain.java | 4 +- .../resources/conf/config-readwrite-splitting.yaml | 6 +- .../resources/conf/config-databases-tables.yaml | 6 +- .../src/main/resources/conf/config-write-only.yaml | 2 +- examples/src/resources/manual_schema.sql | 94 +++++----- .../db/protocol/error/CommonErrorCode.java | 50 +++-- .../db/protocol/error/CommonErrorCodeTest.java | 8 +- .../DatabaseDiscoveryRuleConfigurationChecker.java | 18 +- ...ere.infra.rule.checker.RuleConfigurationChecker | 8 +- .../AbstractEncryptRuleConfigurationChecker.java | 7 +- ...thmProvidedEncryptRuleConfigurationChecker.java | 17 +- .../checker/EncryptRuleConfigurationChecker.java | 17 +- ...ere.infra.rule.checker.RuleConfigurationChecker | 4 +- ...ReadwriteSplittingRuleConfigurationChecker.java | 8 +- ...ReadwriteSplittingRuleConfigurationChecker.java | 17 +- ...ReadwriteSplittingRuleConfigurationChecker.java | 17 +- ...ere.infra.rule.checker.RuleConfigurationChecker | 3 +- .../checker/ShadowRuleConfigurationChecker.java | 18 +- ...ere.infra.rule.checker.RuleConfigurationChecker | 3 +- .../AbstractShardingRuleConfigurationChecker.java | 7 +- ...hmProvidedShardingRuleConfigurationChecker.java | 18 +- .../checker/ShardingRuleConfigurationChecker.java | 18 +- ...ere.infra.rule.checker.RuleConfigurationChecker | 3 +- .../token/generator/impl/IndexTokenGenerator.java | 8 +- .../sharding/rewrite/token/pojo/IndexToken.java | 29 ++- .../src/test/resources/sharding/drop.xml | 30 --- .../src/test/resources/sharding/index.xml | 12 +- .../sharding/route/engine/ShardingSQLRouter.java | 2 +- .../validator/ShardingStatementValidator.java | 5 +- .../ShardingStatementValidatorFactory.java | 15 ++ .../ddl/ShardingDDLStatementValidator.java | 25 ++- ...a => ShardingAlterIndexStatementValidator.java} | 29 +-- .../impl/ShardingAlterTableStatementValidator.java | 12 +- .../impl/ShardingAlterViewStatementValidator.java | 3 +- .../ShardingCreateFunctionStatementValidator.java | 3 +- ... => ShardingCreateIndexStatementValidator.java} | 23 ++- .../ShardingCreateProcedureStatementValidator.java | 3 +- .../ShardingCreateTableStatementValidator.java | 11 +- .../impl/ShardingCreateViewStatementValidator.java | 3 +- ...va => ShardingDropIndexStatementValidator.java} | 42 +++-- .../impl/ShardingDropTableStatementValidator.java | 15 +- .../impl/ShardingPrepareStatementValidator.java | 3 +- .../dml/impl/ShardingDeleteStatementValidator.java | 5 +- .../dml/impl/ShardingInsertStatementValidator.java | 6 +- .../dml/impl/ShardingSelectStatementValidator.java | 6 +- .../dml/impl/ShardingUpdateStatementValidator.java | 5 +- .../ShardingAlterIndexStatementValidatorTest.java | 94 ++++++++++ .../ShardingAlterTableStatementValidatorTest.java | 12 +- .../ShardingCreateIndexStatementValidatorTest.java | 91 ++++++++++ .../ShardingCreateTableStatementValidatorTest.java | 23 ++- .../ShardingDropIndexStatementValidatorTest.java | 202 +++++++++++++++++++++ .../ShardingDropTableStatementValidatorTest.java | 15 +- .../ddl/ShardingPrepareStatementValidatorTest.java | 8 +- .../authority/listener/UserChangedListener.java | 46 ----- .../factory/UserChangedListenerFactory.java | 43 ----- .../metadata/GovernanceMetaDataContexts.java | 56 ++++-- ...ore.registry.listener.GovernanceListenerFactory | 1 - .../listener/UserChangedListenerTest.java | 48 ----- .../metadata/GovernanceMetaDataContextsTest.java | 51 +++--- .../shardingsphere-governance-core/pom.xml | 25 --- .../core/{facade => }/GovernanceFacade.java | 4 +- ...Lock.java => ShardingSphereDistributeLock.java} | 53 ++---- .../governance/core/lock/impl/LockAck.java} | 17 +- .../core/lock/{node => impl}/LockNode.java | 15 +- .../state => lock/impl}/LockRegistryService.java | 28 ++- .../governance/core/lock/node/LockAck.java | 16 -- .../governance/core/registry/RegistryCenter.java | 25 +-- .../RegistryCenterRepositoryFactory.java | 2 +- .../checker/RuleConfigurationCheckerFactory.java | 62 ------- ...DataDeletedEvent.java => SchemaAddedEvent.java} | 4 +- ...PersistedEvent.java => SchemaDeletedEvent.java} | 4 +- .../factory/DataSourceChangedListenerFactory.java | 43 ----- .../factory/MetaDataChangedListenerFactory.java | 2 +- .../factory/RuleChangedListenerFactory.java | 43 ----- .../factory/SchemaChangedListenerFactory.java | 43 ----- .../listener/impl/DataSourceChangedListener.java | 69 ------- .../listener/impl/LockChangedListener.java | 13 +- .../listener/impl/MetaDataChangedListener.java | 118 +++++++++--- .../listener/impl/RuleChangedListener.java | 81 --------- .../listener/impl/SchemaChangedListener.java | 47 ----- .../config/impl/SchemaRuleRegistryService.java | 12 +- .../service/config/node/SchemaMetadataNode.java | 56 +----- .../service/schema/SchemaRegistryService.java | 22 +-- ...ore.registry.listener.GovernanceListenerFactory | 3 - .../core/{facade => }/GovernanceFacadeTest.java | 4 +- ....java => ShardingSphereDistributeLockTest.java} | 30 +-- .../core/lock/{node => impl}/LockNodeTest.java | 18 +- .../impl}/LockRegistryServiceTest.java | 8 +- .../RegistryCenterRepositoryFactoryTest.java | 2 +- .../core/registry/RegistryCenterTest.java | 13 +- .../cache/ScalingRegistrySubscriberTest.java | 28 +-- .../RuleConfigurationCheckerFactoryTest.java | 77 -------- .../fixture/RegistryCenterRepositoryFixture.java | 2 +- .../impl/DataSourceChangedListenerTest.java | 82 --------- .../listener/impl/MetaDataChangedListenerTest.java | 26 +-- .../listener/impl/RuleChangedListenerTest.java | 111 ----------- .../listener/impl/SchemaChangedListenerTest.java | 56 ------ .../config/impl/SchemaRuleRegistryServiceTest.java | 47 ++--- .../config/node/SchemaMetadataNodeTest.java | 19 +- .../service/schema/SchemaRegistryServiceTest.java | 28 +-- ...ernance.repository.spi.RegistryCenterRepository | 2 +- .../yaml/{sharding-rule.yaml => rule.yaml} | 0 .../pom.xml | 2 +- .../governance/repository/etcd/EtcdRepository.java | 8 +- .../repository/etcd/EtcdRepositoryTest.java | 31 ++-- .../properties/ConfigurationPropertyKey.java | 5 + .../infra/lock/InnerLockReleasedEvent.java | 6 +- .../metadata/schema/builder/SchemaBuilder.java | 17 +- .../dialect/SQLServerTableMetaDataLoader.java | 19 +- .../rule}/checker/RuleConfigurationChecker.java | 11 +- .../checker/RuleConfigurationCheckerFactory.java | 52 ++++++ .../dialect/SQLServerTableMetaDataLoaderTest.java | 28 +-- .../CreateTableStatementSchemaRefresherTest.java | 8 +- .../sql/execute/engine/raw/RawExecutor.java | 5 +- .../optimize/schema/row/CalciteRowExecutor.java | 7 +- .../executor/sql/process/ExecuteProcessEngine.java | 6 +- .../process/ExecuteProcessStrategyEvaluator.java | 9 +- .../driver/executor/DriverJDBCExecutor.java | 6 +- .../statement/ShardingSpherePreparedStatement.java | 5 +- .../core/statement/ShardingSphereStatement.java | 5 +- .../GovernanceShardingSphereDataSource.java | 2 +- ...ernanceShardingSphereDataSourceFactoryTest.java | 8 +- .../governance/fixture/TestRuleConfiguration.java | 16 +- .../fixture/TestRuleConfigurationChecker.java | 31 ++-- ...ere.infra.rule.checker.RuleConfigurationChecker | 3 +- .../boot/governance/util/EmbedTestingServer.java | 2 +- .../test/resources/application-encrypt.properties | 2 +- .../application-readwrite-splitting.properties | 2 +- ...ication-registry-readwrite-splitting.properties | 2 +- .../test/resources/application-registry.properties | 2 +- .../test/resources/application-sharding.properties | 2 +- .../governance/util/EmbedTestingServer.java | 2 +- .../resources/META-INF/rdb/encrypt-governance.xml | 2 +- .../rdb/readwrite-splitting-governance.xml | 2 +- .../resources/META-INF/rdb/sharding-governance.xml | 2 +- .../sharding-readwrite-splitting-governance.xml | 2 +- .../backend/communication/ProxySQLExecutor.java | 9 +- .../jdbc/executor/ProxyJDBCExecutor.java | 6 +- ...teSplittingRuleDataSourcesExistedException.java | 35 ---- .../exception/ResourceNotExistedException.java | 2 + .../AlterDatabaseDiscoveryRuleBackendHandler.java | 2 +- .../AlterReadwriteSplittingRuleBackendHandler.java | 2 +- .../CreateDatabaseDiscoveryRuleBackendHandler.java | 73 +++++++- ...CreateReadwriteSplittingRuleBackendHandler.java | 2 +- .../rdl/impl/DropResourceBackendHandler.java | 4 +- ...ateDatabaseDiscoveryRuleBackendHandlerTest.java | 17 +- .../impl/GovernanceBootstrapInitializer.java | 2 +- .../src/main/resources/conf/server.yaml | 1 + .../fixture/FixtureRegistryCenterRepository.java | 2 +- .../impl/GovernanceBootstrapInitializerTest.java | 17 -- .../executor/ConnectionThreadExecutorGroup.java | 9 +- .../netty/FrontendChannelInboundHandler.java | 2 +- .../frontend/mysql/err/MySQLErrPacketFactory.java | 11 +- .../mysql/err/MySQLErrPacketFactoryTest.java | 8 +- .../StandardJDBCDataSourceConfiguration.java | 12 +- .../preparer/splitter/InventoryTaskSplitter.java | 4 + .../splitter/InventoryTaskSplitterTest.java | 20 ++ .../impl/MySQLDDLStatementSQLVisitor.java | 4 +- .../src/main/antlr4/imports/oracle/BaseRule.g4 | 5 + .../main/antlr4/imports/oracle/OracleKeyword.g4 | 12 ++ .../src/main/antlr4/imports/oracle/TCLStatement.g4 | 5 +- .../src/main/antlr4/imports/postgresql/BaseRule.g4 | 9 +- .../main/antlr4/imports/postgresql/DCLStatement.g4 | 10 +- .../main/antlr4/imports/postgresql/DDLStatement.g4 | 158 +++++++--------- .../impl/PostgreSQLDDLStatementSQLVisitor.java | 5 +- .../impl/SQLServerDDLStatementSQLVisitor.java | 3 +- .../sql/common/extractor/TableExtractor.java | 2 +- .../handler/ddl/CreateTableStatementHandler.java | 10 +- .../handler/ddl/DropIndexStatementHandler.java | 18 ++ .../handler/ddl/DropTableStatementHandler.java | 12 +- .../mysql/ddl/MySQLCreateTableStatement.java | 2 +- .../mysql/ddl/MySQLDropTableStatement.java | 2 +- .../ddl/PostgreSQLCreateTableStatement.java | 2 +- .../ddl/PostgreSQLDropIndexStatement.java | 6 + .../ddl/PostgreSQLDropTableStatement.java | 2 +- .../sqlserver/ddl/SQLServerDropIndexStatement.java | 4 + .../sqlserver/ddl/SQLServerDropTableStatement.java | 2 +- .../ddl/CreateTableStatementHandlerTest.java | 22 +-- .../handler/ddl/DropTableStatementHandlerTest.java | 28 +-- .../main/resources/case/tcl/set-transaction.xml | 4 + .../sql/supported/tcl/set-transaction.xml | 4 + .../pom.xml | 42 +++-- .../Dockerfile | 25 +-- .../pom.xml | 182 +++++++++++++++++++ .../src/test/assembly/bin/start.sh | 78 ++++++++ .../src/test/assembly/bin/stop.sh | 46 +++-- .../assembly/shardingsphere-scaling-assembly.xml | 44 +++++ .../integration/scaling/test/mysql/ScalingIT.java | 43 +++++ .../test/mysql/env/IntegrationTestEnvironment.java | 88 +++++++++ .../scaling/test/mysql/util/ScalingUtil.java | 108 +++++++++++ .../test/mysql/util/SourceShardingSphereUtil.java | 98 ++++++++++ .../test/mysql/util/TargetDataSourceUtil.java | 60 ++++++ .../src/test/resources/docker/docker-compose.yml | 72 ++++++++ .../test/resources/docker/scaling/conf/server.yaml | 11 +- .../src/test/resources/env/engine-env.properties | 11 +- .../src/test/resources/env/mysql/init.sql | 24 +++ 214 files changed, 2594 insertions(+), 2026 deletions(-)
