This is an automated email from the ASF dual-hosted git repository. duanzhengqiang pushed a change to branch 5.2.1-release in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
from b8d992b10ad update example pom version add aa246afa10e Change javax.activation-api to compile scope (#21575) add 9e3bb7e6def Rename PreparedStatement to ServerPreparedStatement (#21577) add 43254b9715e Use case sensitive with algorithm and mode type (#21578) add 26acb7f4f11 Update distribution package path after ShardingSphere module name simplify (#21579) add 1a479bea84b fix dependency (#21580) add 59de429287c Improve MigrationJobAPIImplTest (#21582) add 3387bcb00c1 Update ShardingSphere on Cloud release note (#21586) add 155b86e7ff8 Remove LeaderExecutionCallback (#21585) add 2e4b80d370f Remove useless @Slf4j (#21587) add 57270d92a3b Add unit tests to cover CuratorZookeeperRepository.getNumChildren method (#21537) add 58bfe9c90ab refactored alter and drop encrypt rules (#21396) add de198120bfc Update sql-parser.en.md (#21588) add 26601424acd Update sql-parser.cn.md (#21592) add 0429f32ca01 Refactor BaseLoggingPluginDefinitionService (#21593) add 90191fb0528 Fix NPE when call findTableRule with subquery table (#21590) add faf90405790 Refactor RuleDefinitionBackendHandler (#21595) add 95adb91409e Update readwrite-splitting.en.md (#21598) add d3a91a03971 Fixes #20457, allows to start proxy without configuring authority rule. (#21599) add 4139705c32d Revise readwrite hint doc. (#21601) add d6f19952dd7 Fix IndexOutOfBoundsException when WeightReadQueryLoadBalanceAlgorithm 's readDataSourceNames and weight not equal (#21602) add 85781faa0f1 Update RQL show default sharding strategy documents (#21607) add e37315de863 Update RQL show sharding key generators documents (#21613) add 5a5b2d1abd6 Rename sub modules of shardingsphere-jdbc. (#21618) add 8aa385b5986 Add t_user, t_merchant, t_product, t_product_detail, t_product_category, t_country table structure and init data for dbtbl_with_readwrite_splitting scenario (#21600) add a9217e65350 Update readwrite-splitting.cn.md (#21605) add 3303e5b2f1e Support metadata load for heterogeneous databases in logic database (#21619) add e0aa8d663c6 Add : add nightly image build (#21623) (#21624) add 6162b79a5a6 Merge branch 'dev-1018' into 5.2.1-release No new revisions were added by this update. Summary of changes: .github/workflows/nightly-build.yml | 40 +- .../agent/core/plugin/PluginContext.java | 2 +- .../BaseLoggingPluginDefinitionService.java | 3 +- .../metrics/api/advice/ChannelHandlerAdvice.java | 2 - .../wrapper/PrometheusWrapperFactory.java | 2 - .../binlog/AbstractMySQLBinlogEventPacket.java | 2 - .../involved/release/shardingsphere-on-cloud.cn.md | 98 ++-- .../involved/release/shardingsphere-on-cloud.en.md | 110 +++-- .../content/involved/release/shardingsphere.cn.md | 8 +- .../content/involved/release/shardingsphere.en.md | 8 +- .../content/dev-manual/readwrite-splitting.cn.md | 22 +- .../content/dev-manual/readwrite-splitting.en.md | 22 +- docs/document/content/dev-manual/sql-parser.cn.md | 37 +- docs/document/content/dev-manual/sql-parser.en.md | 33 +- .../encrypt/alter-encrypt-rule.en.md | 62 +++ .../encrypt/drop-encrypt-rule.en.md | 34 ++ .../sharding/show-default-sharding-strategy.cn.md | 78 +++ .../sharding/show-default-sharding-strategy.en.md | 77 +++ .../sharding/show-sharding-key-generator.cn.md | 73 +++ .../sharding/show-sharding-key-generator.en.md | 73 +++ .../special-api/readwrite-splitting/hint.cn.md | 2 +- .../shardingsphere-proxy/migration/_index.cn.md | 2 +- .../shardingsphere-proxy/migration/_index.en.md | 2 +- .../src/main/resources/template/jdbc/pom.ftl | 18 + ...MGRMySQLDatabaseDiscoveryProviderAlgorithm.java | 2 - ...licationDatabaseDiscoveryProviderAlgorithm.java | 2 - ...licationDatabaseDiscoveryProviderAlgorithm.java | 2 - .../metadata/EncryptSchemaMetaDataDecorator.java | 4 +- .../EncryptSchemaMetaDataDecoratorTest.java | 4 +- ...ReplicaWeightReadQueryLoadBalanceAlgorithm.java | 4 +- .../WeightReadQueryLoadBalanceAlgorithm.java | 4 +- ...icaWeightReadQueryLoadBalanceAlgorithmTest.java | 10 + .../WeightReadQueryLoadBalanceAlgorithmTest.java | 10 + .../metadata/ShardingSchemaMetaDataDecorator.java | 8 +- .../shardingsphere/sharding/rule/ShardingRule.java | 8 +- .../ShardingSchemaMetaDataDecoratorTest.java | 8 +- .../sharding/rule/ShardingRuleTest.java | 7 +- .../update/DropMigrationSourceResourceUpdater.java | 2 - .../infra/database/type/DatabaseTypeEngine.java | 34 +- .../infra/instance/InstanceContext.java | 2 +- .../metadata/database/ShardingSphereDatabase.java | 10 +- .../database/ShardingSphereDatabasesFactory.java | 15 +- .../resource/ShardingSphereResourceMetaData.java | 20 +- .../schema/builder/GenericSchemaBuilder.java | 71 +-- ...ials.java => GenericSchemaBuilderMaterial.java} | 6 +- .../spi/RuleBasedSchemaMetaDataDecorator.java | 6 +- .../schema/loader/SchemaMetaDataLoaderEngine.java | 54 +-- ...ials.java => SchemaMetaDataLoaderMaterial.java} | 7 +- .../database/schema/util/SchemaMetaDataUtil.java | 61 ++- .../database/type/DatabaseTypeEngineTest.java | 6 +- .../infra/metadata/ShardingSphereMetaDataTest.java | 4 +- .../schema/builder/GenericSchemaBuilderTest.java | 22 +- .../RuleBasedSchemaMetaDataDecoratorFixture.java | 4 +- .../loader/common/TableMetaDataLoaderTest.java | 6 +- .../schema/util/SchemaMetaDataUtilTest.java | 30 +- .../type/AlterTableStatementSchemaRefresher.java | 8 +- .../type/AlterViewStatementSchemaRefresher.java | 8 +- .../type/CreateTableStatementSchemaRefresher.java | 8 +- .../type/CreateViewStatementSchemaRefresher.java | 8 +- .../type/RenameTableStatementSchemaRefresher.java | 8 +- .../RenameTableStatementSchemaRefresherTest.java | 4 +- .../ShardingSpherePipelineDataSourceCreator.java | 2 +- jdbc/spring/core/pom.xml | 4 +- .../pom.xml | 0 .../boot/ShardingSphereAutoConfiguration.java | 0 .../prop/SpringBootPropertiesConfiguration.java | 0 .../spring/boot/rule/LocalRulesCondition.java | 0 .../additional-spring-configuration-metadata.json | 0 .../src/main/resources/META-INF/spring.factories | 0 .../src/main/resources/META-INF/spring.provides | 0 ...rk.boot.autoconfigure.AutoConfiguration.imports | 0 .../spring/boot/SpringBootStarterTest.java | 0 .../boot/jndi/SpringBootJNDIDataSourceTest.java | 0 .../InitialDataSourceInitialContextFactory.java | 0 .../src/test/resources/application-jndi.properties | 0 .../src/test/resources/application.properties | 0 .../src/test/resources/logback-test.xml | 0 .../pom.xml | 0 .../handler/DataSourceNamespaceHandler.java | 0 .../ClusterPersistRepositoryNamespaceHandler.java | 0 ...tandalonePersistRepositoryNamespaceHandler.java | 0 .../parser/DataSourceBeanDefinitionParser.java | 0 ...TransactionTypeScannerBeanDefinitionParser.java | 0 ...epositoryConfigurationBeanDefinitionParser.java | 0 ...epositoryConfigurationBeanDefinitionParser.java | 0 .../namespace/tag/DataSourceBeanDefinitionTag.java | 0 .../TransactionTypeScannerBeanDefinitionTag.java | 0 .../ClusterPersistRepositoryBeanDefinitionTag.java | 0 .../namespace/tag/mode/ModeBeanDefinitionTag.java | 0 ...andalonePersistRepositoryBeanDefinitionTag.java | 0 .../resources/META-INF/namespace/datasource.xsd | 0 .../META-INF/namespace/mode/cluster/repository.xsd | 0 .../namespace/mode/standalone/repository.xsd | 0 .../src/main/resources/META-INF/spring.handlers | 0 .../src/main/resources/META-INF/spring.schemas | 0 .../namespace/AbstractSpringNamespaceTest.java | 0 .../namespace/ClusterModeSpringNamespaceTest.java | 0 .../namespace/MemoryModeSpringNamespaceTest.java | 0 .../StandaloneModeSpringNamespaceTest.java | 0 .../fixture/FixtureClusterPersistRepository.java | 5 - ...ode.repository.cluster.ClusterPersistRepository | 0 .../src/test/resources/logback-test.xml | 0 .../spring/cluster-application-context.xml | 0 .../src/test/resources/spring/conf/conf.properties | 0 .../spring/included/data-sources-context.xml | 0 .../resources/spring/included/rules-context.xml | 0 .../spring/memory-application-context.xml | 0 .../spring/standalone-application-context.xml | 0 jdbc/spring/infra/pom.xml | 4 +- .../pom.xml | 0 ...NoneShardingStrategyConfigurationConverter.java | 0 .../spring/boot/datasource/AopProxyUtils.java | 0 .../boot/datasource/DataSourceMapSetter.java | 0 .../DataSourceJndiNotFoundServerException.java | 0 .../AbstractAlgorithmProvidedBeanRegistry.java | 0 .../spring/boot/schema/DatabaseNameSetter.java | 0 .../spring/boot/util/PropertyUtil.java | 0 ...ShardingStrategyConfigurationConverterTest.java | 0 .../boot/datasource/DataSourceMapSetterTest.java | 0 .../spring/boot/schema/DatabaseNameSetterTest.java | 0 .../spring/boot/util/PropertyUtilTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../pom.xml | 0 .../ShardingSphereAlgorithmFactoryBean.java | 0 ...hardingSphereAlgorithmBeanDefinitionParser.java | 0 .../ShardingSphereAlgorithmBeanRegistry.java | 0 .../ShardingSphereAlgorithmBeanDefinitionTag.java | 0 ...ShardingSphereAlgorithmSpringNamespaceTest.java | 0 .../fixture/FooShardingSphereFixtureAlgorithm.java | 0 .../fixture/ShardingSphereFixtureAlgorithm.java | 0 .../ShardingSphereAlgorithmFixtureFactoryBean.java | 0 ...dingSphereAlgorithmFixtureNamespaceHandler.java | 0 .../ShardingSphereAlgorithmBeanRegistryTest.java | 0 .../META-INF/namespace/algorithm-fixture.xsd | 0 ...amespace.fixture.ShardingSphereFixtureAlgorithm | 0 .../src/test/resources/META-INF/spring.handlers | 0 .../src/test/resources/META-INF/spring.schemas | 0 .../META-INF/spring/application-context.xml | 0 .../src/test/resources/conf/conf.properties | 0 .../src/test/resources/logback-test.xml | 0 .../database/builder/DatabasePrivilegeBuilder.java | 2 +- .../job/ConsistencyCheckJobConfiguration.java | 2 - .../api/config/job/MigrationJobConfiguration.java | 2 - .../core/api/impl/AbstractPipelineJobAPIImpl.java | 2 +- ...AbstractInventoryIncrementalProcessContext.java | 2 - .../ShardingSphereDataScheduleCollector.java | 2 +- .../memory/MultiplexMemoryPipelineChannel.java | 2 - .../pipeline/core/job/AbstractPipelineJob.java | 2 - .../metadata/node/PipelineMetaDataNodeWatcher.java | 2 - .../impl/BarrierMetaDataChangedEventHandler.java | 2 - .../core/prepare/InventoryTaskSplitter.java | 2 +- .../CoordinatorRegistryCenterInitializer.java | 2 +- .../ConsistencyCheckJobItemContext.java | 2 - .../migration/MigrationDataConsistencyChecker.java | 2 - .../pipeline/scenario/migration/MigrationJob.java | 3 +- .../migration/MigrationJobItemContext.java | 2 - .../migration/MigrationProcessContext.java | 2 - .../opengauss/ingest/OpenGaussWalDumper.java | 2 - .../postgresql/ingest/PostgreSQLWalDumper.java | 2 - .../schedule/core/ScheduleContextFactory.java | 2 +- .../core/context/ClusterScheduleContext.java | 2 - .../SingleTableSchemaMetaDataDecorator.java | 4 +- .../SingleTableSchemaMetaDataDecoratorTest.java | 4 +- .../mode/manager/ContextManager.java | 12 +- .../fixture/ClusterPersistRepositoryFixture.java | 5 - ...ProcessListClusterPersistRepositoryFixture.java | 5 - .../cluster/ClusterPersistRepository.java | 8 - .../cluster/LeaderExecutionCallback.java | 29 -- .../cluster/consul/ConsulRepository.java | 6 - .../repository/cluster/etcd/EtcdRepository.java | 8 - .../repository/cluster/nacos/NacosRepository.java | 6 - .../zookeeper/CuratorZookeeperRepository.java | 6 - .../zookeeper/CuratorZookeeperRepositoryTest.java | 16 + pom.xml | 1 - .../backend/config/ProxyConfigurationLoader.java | 9 +- .../ral/queryable/ShowInstanceListHandler.java | 4 +- .../rdl/rule/RuleDefinitionBackendHandler.java | 7 +- .../proxy/backend/session/ConnectionSession.java | 2 +- ...Statement.java => ServerPreparedStatement.java} | 10 +- ...y.java => ServerPreparedStatementRegistry.java} | 24 +- .../config/ProxyConfigurationLoaderTest.java | 17 +- ...ServerServerPreparedStatementRegistryTest.java} | 8 +- .../config-empty.yaml => empty/server.yaml} | 0 .../fixture/ClusterPersistRepositoryFixture.java | 5 - .../mysql/command/MySQLCommandPacketFactory.java | 7 +- .../binary/MySQLComStmtSendLongDataExecutor.java | 2 +- ...ment.java => MySQLServerPreparedStatement.java} | 4 +- .../binary/close/MySQLComStmtCloseExecutor.java | 2 +- .../execute/MySQLComStmtExecuteExecutor.java | 8 +- .../prepare/MySQLComStmtPrepareExecutor.java | 4 +- .../binary/reset/MySQLComStmtResetExecutor.java | 4 +- .../command/MySQLCommandPacketFactoryTest.java | 10 +- .../MySQLComStmtSendLongDataExecutorTest.java | 8 +- .../close/MySQLComStmtCloseExecutorTest.java | 2 +- .../execute/MySQLComStmtExecuteExecutorTest.java | 14 +- .../prepare/MySQLComStmtPrepareExecutorTest.java | 10 +- .../reset/MySQLComStmtResetExecutorTest.java | 10 +- .../bind/OpenGaussComBatchBindExecutor.java | 4 +- .../bind/OpenGaussComBatchBindExecutorTest.java | 8 +- .../command/query/extended/JDBCPortal.java | 2 +- ...AggregatedBatchedStatementsCommandExecutor.java | 6 +- .../PostgreSQLBatchedStatementsExecutor.java | 4 +- ...java => PostgreSQLServerPreparedStatement.java} | 4 +- .../extended/bind/PostgreSQLComBindExecutor.java | 4 +- .../extended/close/PostgreSQLComCloseExecutor.java | 2 +- .../describe/PostgreSQLComDescribeExecutor.java | 16 +- .../extended/parse/PostgreSQLComParseExecutor.java | 5 +- .../command/query/extended/JDBCPortalTest.java | 22 +- ...egatedBatchedStatementsCommandExecutorTest.java | 8 +- .../PostgreSQLBatchedStatementsExecutorTest.java | 2 +- .../bind/PostgreSQLComBindExecutorTest.java | 8 +- .../close/PostgreSQLComCloseExecutorTest.java | 4 +- .../PostgreSQLComDescribeExecutorTest.java | 16 +- .../parse/PostgreSQLComParseExecutorTest.java | 12 +- .../command/ReactiveCommandExecuteTask.java | 2 +- .../ReactiveMySQLComStmtExecuteExecutor.java | 8 +- .../fixture/TestClusterPersistRepository.java | 5 - .../atomic/adapter/AdapterContainerFactory.java | 4 +- .../cases/rql/dataset/db/show_single_tables.xml | 2 +- .../count_single_table_rule.xml | 2 +- .../show_sharding_broadcast_rules.xml | 2 + .../show_single_tables.xml | 4 + .../data/actual/dataset.xml | 523 +++++++++++++++++++++ .../data/actual/init-sql/h2/01-actual-init.sql | 4 + .../actual/init-sql/h2/actual-read_ds_0-init.sql | 4 + .../actual/init-sql/h2/actual-read_ds_1-init.sql | 4 + .../actual/init-sql/h2/actual-write_ds_0-init.sql | 4 + .../actual/init-sql/h2/actual-write_ds_1-init.sql | 4 + .../data/actual/init-sql/mysql/01-actual-init.sql | 48 ++ .../actual/init-sql/opengauss/01-actual-init.sql | 96 ++++ .../data/actual/init-sql/oracle/01-actual-init.sql | 48 ++ .../actual/init-sql/postgresql/01-actual-init.sql | 96 ++++ .../actual/init-sql/sqlserver/01-actual-init.sql | 48 ++ .../data/expected/dataset.xml | 235 +++++++++ .../data/expected/init-sql/h2/01-expected-init.sql | 13 + .../expected/init-sql/mysql/01-expected-init.sql | 22 +- .../init-sql/opengauss/01-expected-init.sql | 28 ++ .../expected/init-sql/oracle/01-expected-init.sql | 14 + .../init-sql/postgresql/01-expected-init.sql | 28 ++ .../init-sql/sqlserver/01-expected-init.sql | 14 + .../config-dbtbl-with-readwrite-splitting.yaml | 2 + .../config-dbtbl-with-readwrite-splitting.yaml | 2 + .../config-dbtbl-with-readwrite-splitting.yaml | 2 + .../dbtbl_with_readwrite_splitting/rules.yaml | 2 + .../core/api/impl/MigrationJobAPIImplTest.java | 33 +- 245 files changed, 2357 insertions(+), 699 deletions(-) create mode 100644 docs/document/content/reference/distsql/syntax/rdl/rule-definition/encrypt/alter-encrypt-rule.en.md create mode 100644 docs/document/content/reference/distsql/syntax/rdl/rule-definition/encrypt/drop-encrypt-rule.en.md create mode 100644 docs/document/content/reference/distsql/syntax/rql/rule-query/sharding/show-default-sharding-strategy.cn.md create mode 100644 docs/document/content/reference/distsql/syntax/rql/rule-query/sharding/show-default-sharding-strategy.en.md create mode 100644 docs/document/content/reference/distsql/syntax/rql/rule-query/sharding/show-sharding-key-generator.cn.md create mode 100644 docs/document/content/reference/distsql/syntax/rql/rule-query/sharding/show-sharding-key-generator.en.md rename infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/{GenericSchemaBuilderMaterials.java => GenericSchemaBuilderMaterial.java} (91%) rename infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/{SchemaMetaDataLoaderMaterials.java => SchemaMetaDataLoaderMaterial.java} (85%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/pom.xml (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/main/java/org/apache/shardingsphere/spring/boot/ShardingSphereAutoConfiguration.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/main/java/org/apache/shardingsphere/spring/boot/prop/SpringBootPropertiesConfiguration.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/main/java/org/apache/shardingsphere/spring/boot/rule/LocalRulesCondition.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/main/resources/META-INF/additional-spring-configuration-metadata.json (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/main/resources/META-INF/spring.factories (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/main/resources/META-INF/spring.provides (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/test/java/org/apache/shardingsphere/spring/boot/jndi/SpringBootJNDIDataSourceTest.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/test/java/org/apache/shardingsphere/spring/boot/jndi/fixture/InitialDataSourceInitialContextFactory.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/test/resources/application-jndi.properties (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/test/resources/application.properties (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-boot-starter => spring-boot-starter}/src/test/resources/logback-test.xml (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/pom.xml (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/handler/DataSourceNamespaceHandler.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/handler/mode/ClusterPersistRepositoryNamespaceHandler.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/handler/mode/StandalonePersistRepositoryNamespaceHandler.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/parser/DataSourceBeanDefinitionParser.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/parser/TransactionTypeScannerBeanDefinitionParser.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/parser/mode/ClusterPersistRepositoryConfigurationBeanDefinitionParser.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/parser/mode/StandalonePersistRepositoryConfigurationBeanDefinitionParser.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/tag/DataSourceBeanDefinitionTag.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/tag/TransactionTypeScannerBeanDefinitionTag.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/tag/mode/ClusterPersistRepositoryBeanDefinitionTag.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/tag/mode/ModeBeanDefinitionTag.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/tag/mode/StandalonePersistRepositoryBeanDefinitionTag.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/resources/META-INF/namespace/datasource.xsd (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/resources/META-INF/namespace/mode/cluster/repository.xsd (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/resources/META-INF/namespace/mode/standalone/repository.xsd (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/resources/META-INF/spring.handlers (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/main/resources/META-INF/spring.schemas (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/AbstractSpringNamespaceTest.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/ClusterModeSpringNamespaceTest.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/MemoryModeSpringNamespaceTest.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/StandaloneModeSpringNamespaceTest.java (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java (95%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/resources/logback-test.xml (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/resources/spring/cluster-application-context.xml (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/resources/spring/conf/conf.properties (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/resources/spring/included/data-sources-context.xml (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/resources/spring/included/rules-context.xml (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/resources/spring/memory-application-context.xml (100%) rename jdbc/spring/core/{shardingsphere-jdbc-core-spring-namespace => spring-namespace}/src/test/resources/spring/standalone-application-context.xml (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/pom.xml (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/main/java/org/apache/shardingsphere/spring/boot/converter/StringToNoneShardingStrategyConfigurationConverter.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/main/java/org/apache/shardingsphere/spring/boot/datasource/AopProxyUtils.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/main/java/org/apache/shardingsphere/spring/boot/datasource/DataSourceMapSetter.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/main/java/org/apache/shardingsphere/spring/boot/exception/DataSourceJndiNotFoundServerException.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/main/java/org/apache/shardingsphere/spring/boot/registry/AbstractAlgorithmProvidedBeanRegistry.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/main/java/org/apache/shardingsphere/spring/boot/schema/DatabaseNameSetter.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/main/java/org/apache/shardingsphere/spring/boot/util/PropertyUtil.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/test/java/org/apache/shardingsphere/spring/boot/converter/StringToNoneShardingStrategyConfigurationConverterTest.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/test/java/org/apache/shardingsphere/spring/boot/datasource/DataSourceMapSetterTest.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/test/java/org/apache/shardingsphere/spring/boot/schema/DatabaseNameSetterTest.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/test/java/org/apache/shardingsphere/spring/boot/util/PropertyUtilTest.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-boot-starter-infra => spring-boot-starter}/src/test/resources/logback-test.xml (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/pom.xml (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/factorybean/ShardingSphereAlgorithmFactoryBean.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/parser/ShardingSphereAlgorithmBeanDefinitionParser.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/registry/ShardingSphereAlgorithmBeanRegistry.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/main/java/org/apache/shardingsphere/spring/namespace/tag/ShardingSphereAlgorithmBeanDefinitionTag.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/ShardingSphereAlgorithmSpringNamespaceTest.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FooShardingSphereFixtureAlgorithm.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/ShardingSphereFixtureAlgorithm.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/factorybean/ShardingSphereAlgorithmFixtureFactoryBean.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/handler/ShardingSphereAlgorithmFixtureNamespaceHandler.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/java/org/apache/shardingsphere/spring/namespace/registry/ShardingSphereAlgorithmBeanRegistryTest.java (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/resources/META-INF/namespace/algorithm-fixture.xsd (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/resources/META-INF/services/org.apache.shardingsphere.spring.namespace.fixture.ShardingSphereFixtureAlgorithm (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/resources/META-INF/spring.handlers (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/resources/META-INF/spring.schemas (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/resources/META-INF/spring/application-context.xml (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/resources/conf/conf.properties (100%) rename jdbc/spring/infra/{shardingsphere-jdbc-spring-namespace-infra => spring-namespace}/src/test/resources/logback-test.xml (100%) delete mode 100644 mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/LeaderExecutionCallback.java rename proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/{PreparedStatement.java => ServerPreparedStatement.java} (82%) rename proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/{PreparedStatementRegistry.java => ServerPreparedStatementRegistry.java} (63%) rename proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/session/{PreparedStatementRegistryTest.java => ServerServerPreparedStatementRegistryTest.java} (86%) copy proxy/backend/src/test/resources/conf/{config_loader/config-empty.yaml => empty/server.yaml} (100%) rename proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/{MySQLPreparedStatement.java => MySQLServerPreparedStatement.java} (92%) rename proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/{PostgreSQLPreparedStatement.java => PostgreSQLServerPreparedStatement.java} (93%)