You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/06/15 13:29:07 UTC
[shardingsphere] branch master updated (8375f484142 -> 0acf9b41bcb)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
from 8375f484142 Add GlobalRuleConfigurationEventBuilder SPI and adjustment NewMetaDataChangedWatcher (#26368)
add 0acf9b41bcb Change sharding broadcast tables to global broadcast tables (#26300)
No new revisions were added by this update.
Summary of changes:
features/{ => broadcast/api}/pom.xml | 24 +--
.../api/config/BroadcastRuleConfiguration.java} | 19 +--
.../rewriter => features/broadcast/core}/pom.xml | 41 +++--
.../broadcast/constant/BroadcastOrder.java | 18 +-
.../broadcast/route/BroadcastSQLRouter.java | 160 +++++++++++++++++
.../route/engine/BroadcastRouteEngineFactory.java | 178 +++++++++++++++++++
.../route/engine/type/BroadcastRouteEngine.java} | 21 ++-
.../BroadcastDatabaseBroadcastRoutingEngine.java | 40 +++++
.../BroadcastInstanceBroadcastRoutingEngine.java | 48 ++++++
.../BroadcastTableBroadcastRoutingEngine.java | 74 ++++++++
.../type/ignore/BroadcastIgnoreRoutingEngine.java} | 16 +-
.../unicast/BroadcastUnicastRoutingEngine.java | 87 ++++++++++
.../broadcast/rule/BroadcastRule.java | 190 +++++++++++++++++++++
.../rule/builder/BroadcastRuleBuilder.java | 51 ++++++
.../config/YamlBroadcastRuleConfiguration.java} | 21 ++-
.../YamlBroadcastRuleConfigurationSwapper.java | 58 +++++++
...org.apache.shardingsphere.infra.route.SQLRouter | 18 ++
...infra.rule.builder.database.DatabaseRuleBuilder | 18 ++
...onfig.swapper.rule.YamlRuleConfigurationSwapper | 18 ++
.../broadcast/distsql/handler}/pom.xml | 54 +-----
.../query/ShowBroadcastTableRuleExecutor.java | 10 +-
.../CreateBroadcastTableRuleStatementUpdater.java | 40 ++---
.../DropBroadcastTableRuleStatementUpdater.java | 44 ++---
...hardingsphere.distsql.handler.query.RQLExecutor | 18 ++
...re.distsql.handler.update.RuleDefinitionUpdater | 19 +++
features/broadcast/distsql/parser/pom.xml | 99 +++++++++++
.../parser/autogen/BroadcastDistSQLStatement.g4 | 12 +-
.../src/main/antlr4/imports/broadcast}/Alphabet.g4 | 0
.../src/main/antlr4/imports/broadcast/BaseRule.g4 | 25 ++-
.../src/main/antlr4/imports/broadcast/Keyword.g4 | 57 ++++++-
.../src/main/antlr4/imports/broadcast}/Literals.g4 | 0
.../main/antlr4/imports/broadcast/RDLStatement.g4 | 13 +-
.../main/antlr4/imports/broadcast/RQLStatement.g4 | 9 +-
.../src/main/antlr4/imports/broadcast}/Symbol.g4 | 0
.../parser/core/BroadcastDistSQLLexer.java} | 15 +-
.../parser/core/BroadcastDistSQLParser.java} | 27 +--
.../core/BroadcastDistSQLStatementVisitor.java | 66 +++++++
.../BroadcastDistSQLStatementParserFacade.java | 53 ++++++
...engine.spi.FeaturedDistSQLStatementParserFacade | 18 ++
features/{ => broadcast/distsql}/pom.xml | 12 +-
features/{ => broadcast/distsql/statement}/pom.xml | 19 +--
.../CreateBroadcastTableRuleStatement.java | 2 +-
.../statement/DropBroadcastTableRuleStatement.java | 2 +-
.../ShowBroadcastTableRulesStatement.java | 2 +-
features/{ => broadcast}/pom.xml | 12 +-
features/pom.xml | 1 +
.../api/config/ShardingRuleConfiguration.java | 2 -
...MLShardingConditionsShardingAuditAlgorithm.java | 2 +-
.../checker/ShardingRouteCacheableChecker.java | 7 +-
.../engine/type/ShardingRouteEngineFactory.java | 9 -
.../ShardingTableBroadcastRoutingEngine.java | 4 +-
.../type/unicast/ShardingUnicastRoutingEngine.java | 8 +-
.../ddl/ShardingDDLStatementValidator.java | 3 +-
.../impl/ShardingAlterTableStatementValidator.java | 6 +-
.../impl/ShardingAlterViewStatementValidator.java | 2 -
.../impl/ShardingCreateViewStatementValidator.java | 14 --
.../ShardingRenameTableStatementValidator.java | 6 +-
.../dml/ShardingDMLStatementValidator.java | 3 +-
.../dml/impl/ShardingDeleteStatementValidator.java | 3 +-
.../dml/impl/ShardingInsertStatementValidator.java | 2 +-
.../dml/impl/ShardingUpdateStatementValidator.java | 2 +-
.../rule/BindingTableCheckedConfiguration.java | 2 -
.../shardingsphere/sharding/rule/ShardingRule.java | 54 +-----
.../ShardingTableConfigurationSubscriber.java | 9 -
.../yaml/config/YamlShardingRuleConfiguration.java | 2 -
.../NewYamlShardingRuleConfigurationSwapper.java | 5 -
.../YamlShardingRuleConfigurationSwapper.java | 2 -
...ardingConditionsShardingAuditAlgorithmTest.java | 17 --
.../checker/ShardingRouteCacheableCheckerTest.java | 11 --
.../ShardingRoutingEngineFixtureBuilder.java | 2 -
.../type/ShardingRouteEngineFactoryTest.java | 30 ----
.../ShardingTableBroadcastRoutingEngineTest.java | 26 +--
.../unicast/ShardingUnicastRoutingEngineTest.java | 14 +-
.../ShardingAlterTableStatementValidatorTest.java | 40 -----
.../ShardingAlterViewStatementValidatorTest.java | 16 --
.../ShardingCreateTableStatementValidatorTest.java | 19 ---
.../ShardingCreateViewStatementValidatorTest.java | 14 --
.../ShardingDropIndexStatementValidatorTest.java | 37 ----
.../ShardingDropTableStatementValidatorTest.java | 15 --
.../ShardingRenameTableStatementValidatorTest.java | 9 -
.../dml/ShardingInsertStatementValidatorTest.java | 3 -
.../dml/ShardingUpdateStatementValidatorTest.java | 1 -
.../sharding/rule/ShardingRuleTest.java | 54 +-----
.../yaml/ShardingRuleConfigurationYamlIT.java | 6 -
...ewYamlShardingRuleConfigurationSwapperTest.java | 12 +-
.../src/test/resources/yaml/sharding-rule.yaml | 2 -
.../checker/ShardingTableRuleStatementChecker.java | 20 +--
.../handler/query/CountShardingRuleExecutor.java | 1 -
.../DropDefaultStrategyStatementUpdater.java | 2 +-
.../DropShardingTableRuleStatementUpdater.java | 2 +-
...hardingsphere.distsql.handler.query.RQLExecutor | 1 -
...re.distsql.handler.update.RuleDefinitionUpdater | 2 -
.../query/CountShardingRuleExecutorTest.java | 8 +-
.../query/ShowBroadcastTableRuleExecutorTest.java | 71 --------
...eateBroadcastTableRuleStatementUpdaterTest.java | 105 ------------
...DropBroadcastTableRuleStatementUpdaterTest.java | 111 ------------
.../src/main/antlr4/imports/sharding/Keyword.g4 | 4 -
.../main/antlr4/imports/sharding/RDLStatement.g4 | 8 -
.../main/antlr4/imports/sharding/RQLStatement.g4 | 4 -
.../parser/autogen/ShardingDistSQLStatement.g4 | 3 -
.../core/ShardingDistSQLStatementVisitor.java | 22 ---
.../collector/tables/PgClassTableCollector.java | 25 +--
jdbc/core/pom.xml | 5 +
.../resultset/ShardingSphereResultSetMetaData.java | 17 +-
proxy/backend/core/pom.xml | 5 +
.../ConvertYamlConfigurationExecutor.java | 9 -
.../resources/conf/convert/config-sharding.yaml | 2 -
.../test/resources/expected/convert-sharding.yaml | 2 -
.../src/test/resources/config/config-sharding.yaml | 8 +-
.../src/test/resources/sql/single_jdbc_init.sql | 2 +
.../BroadcastTableTransactionTestCase.java | 3 +-
.../cases/cursor/OpenGaussCursorTestCase.java | 3 +-
.../env/jdbc/mysql/config-sharding-local.yaml | 6 +-
.../jdbc/mysql/config-sharding-xa-atomikos.yaml | 6 +-
.../jdbc/mysql/config-sharding-xa-bitronix.yaml | 6 +-
.../jdbc/mysql/config-sharding-xa-narayana.yaml | 8 +-
.../env/jdbc/opengauss/config-sharding-local.yaml | 6 +-
.../opengauss/config-sharding-xa-atomikos.yaml | 6 +-
.../opengauss/config-sharding-xa-bitronix.yaml | 6 +-
.../opengauss/config-sharding-xa-narayana.yaml | 6 +-
.../env/jdbc/postgresql/config-sharding-local.yaml | 6 +-
.../postgresql/config-sharding-xa-atomikos.yaml | 6 +-
.../postgresql/config-sharding-xa-bitronix.yaml | 6 +-
.../postgresql/config-sharding-xa-narayana.yaml | 6 +-
.../env/scenario/cursor/proxy/conf/mysql/rule.yaml | 12 +-
.../proxy/conf/opengauss/config-sharding.yaml | 9 +-
.../cursor/proxy/conf/postgresql/rule.yaml | 6 +-
.../default/proxy/conf/mysql/config-sharding.yaml | 6 +-
.../proxy/conf/opengauss/config-sharding.yaml | 6 +-
.../proxy/conf/postgresql/config-sharding.yaml | 6 +-
.../cases/rql/dataset/db/count_sharding_rule.xml | 1 -
.../count_sharding_rule.xml | 1 -
.../count_sharding_rule.xml | 1 -
.../readwrite_splitting/count_sharding_rule.xml | 1 -
.../sharding_and_encrypt/count_sharding_rule.xml | 1 -
.../cases/rql/dataset/tbl/count_sharding_rule.xml | 1 -
.../scenario/db/proxy/conf/mysql/config-db.yaml | 12 +-
.../db/proxy/conf/opengauss/config-db.yaml | 12 +-
.../db/proxy/conf/postgresql/config-db.yaml | 12 +-
.../src/test/resources/env/scenario/db/rules.yaml | 12 +-
.../config-dbtbl-with-readwrite-splitting.yaml | 12 +-
.../config-dbtbl-with-readwrite-splitting.yaml | 14 +-
.../config-dbtbl-with-readwrite-splitting.yaml | 14 +-
.../dbtbl_with_readwrite_splitting/rules.yaml | 12 +-
...dbtbl-with-readwrite-splitting-and-encrypt.yaml | 8 +-
...dbtbl-with-readwrite-splitting-and-encrypt.yaml | 8 +-
...dbtbl-with-readwrite-splitting-and-encrypt.yaml | 8 +-
.../rules.yaml | 9 +-
.../conf/mysql/config-sharding-and-encrypt.yaml | 8 +-
.../opengauss/config-sharding-and-encrypt.yaml | 8 +-
.../postgresql/config-sharding-and-encrypt.yaml | 8 +-
.../env/scenario/sharding_and_encrypt/rules.yaml | 8 +-
.../scenario/tbl/proxy/conf/mysql/config-tbl.yaml | 8 +-
.../tbl/proxy/conf/opengauss/config-tbl.yaml | 8 +-
.../tbl/proxy/conf/postgresql/config-tbl.yaml | 8 +-
.../src/test/resources/env/scenario/tbl/rules.yaml | 8 +-
test/it/parser/pom.xml | 5 +
.../rdl/create/CreateRuleStatementAssert.java | 2 +-
.../CreateBroadcastTableRuleStatementAssert.java | 2 +-
.../rdl/drop/DropRuleStatementAssert.java | 8 +-
.../DropBroadcastTableRuleStatementAssert.java | 2 +-
test/it/rewriter/pom.xml | 6 +
.../scenario/sharding/case/ddl/alter-table.xml | 8 -
.../scenario/sharding/case/ddl/create-table.xml | 17 +-
.../scenario/sharding/config/sharding-rule.yaml | 10 +-
165 files changed, 1835 insertions(+), 1196 deletions(-)
copy features/{ => broadcast/api}/pom.xml (68%)
copy features/{sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropBroadcastTableRuleStatement.java => broadcast/api/src/main/java/org/apache/shardingsphere/broadcast/api/config/BroadcastRuleConfiguration.java} (63%)
copy {test/it/rewriter => features/broadcast/core}/pom.xml (75%)
copy test/e2e/driver/src/test/resources/sql/single_jdbc_init.sql => features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/constant/BroadcastOrder.java (71%)
create mode 100644 features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/BroadcastSQLRouter.java
create mode 100644 features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactory.java
copy features/{sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowBroadcastTableRulesStatement.java => broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/BroadcastRouteEngine.java} (62%)
create mode 100644 features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRoutingEngine.java
create mode 100644 features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRoutingEngine.java
create mode 100644 features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRoutingEngine.java
copy features/{sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowBroadcastTableRulesStatement.java => broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRoutingEngine.java} (60%)
create mode 100644 features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRoutingEngine.java
create mode 100644 features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastRule.java
create mode 100644 features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/builder/BroadcastRuleBuilder.java
copy features/{sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropBroadcastTableRuleStatement.java => broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/config/YamlBroadcastRuleConfiguration.java} (56%)
create mode 100644 features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/YamlBroadcastRuleConfigurationSwapper.java
create mode 100644 features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.route.SQLRouter
create mode 100644 features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.database.DatabaseRuleBuilder
create mode 100644 features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper
copy {test/it/rewriter => features/broadcast/distsql/handler}/pom.xml (50%)
rename features/{sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding => broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast}/distsql/handler/query/ShowBroadcastTableRuleExecutor.java (81%)
rename features/{sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding => broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast}/distsql/handler/update/CreateBroadcastTableRuleStatementUpdater.java (66%)
rename features/{sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding => broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast}/distsql/handler/update/DropBroadcastTableRuleStatementUpdater.java (65%)
create mode 100644 features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
create mode 100644 features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.update.RuleDefinitionUpdater
create mode 100644 features/broadcast/distsql/parser/pom.xml
copy test/e2e/driver/src/test/resources/sql/single_jdbc_init.sql => features/broadcast/distsql/parser/src/main/antlr4/broadcast/org/apache/shardingsphere/distsql/parser/autogen/BroadcastDistSQLStatement.g4 (77%)
copy features/{encrypt/distsql/parser/src/main/antlr4/imports/encrypt => broadcast/distsql/parser/src/main/antlr4/imports/broadcast}/Alphabet.g4 (100%)
copy test/e2e/driver/src/test/resources/sql/single_jdbc_init.sql => features/broadcast/distsql/parser/src/main/antlr4/imports/broadcast/BaseRule.g4 (75%)
copy test/e2e/driver/src/test/resources/sql/single_jdbc_init.sql => features/broadcast/distsql/parser/src/main/antlr4/imports/broadcast/Keyword.g4 (65%)
copy features/{sharding/distsql/parser/src/main/antlr4/imports/sharding => broadcast/distsql/parser/src/main/antlr4/imports/broadcast}/Literals.g4 (100%)
copy test/e2e/driver/src/test/resources/sql/single_jdbc_init.sql => features/broadcast/distsql/parser/src/main/antlr4/imports/broadcast/RDLStatement.g4 (76%)
copy test/e2e/driver/src/test/resources/sql/single_jdbc_init.sql => features/broadcast/distsql/parser/src/main/antlr4/imports/broadcast/RQLStatement.g4 (77%)
copy features/{encrypt/distsql/parser/src/main/antlr4/imports/encrypt => broadcast/distsql/parser/src/main/antlr4/imports/broadcast}/Symbol.g4 (100%)
copy features/{sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowBroadcastTableRulesStatement.java => broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLLexer.java} (63%)
copy features/{sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CreateBroadcastTableRuleStatement.java => broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLParser.java} (51%)
create mode 100644 features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLStatementVisitor.java
create mode 100644 features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/facade/BroadcastDistSQLStatementParserFacade.java
create mode 100644 features/broadcast/distsql/parser/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade
copy features/{ => broadcast/distsql}/pom.xml (83%)
copy features/{ => broadcast/distsql/statement}/pom.xml (76%)
rename features/{sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding => broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast}/distsql/parser/statement/CreateBroadcastTableRuleStatement.java (94%)
rename features/{sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding => broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast}/distsql/parser/statement/DropBroadcastTableRuleStatement.java (94%)
rename features/{sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding => broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast}/distsql/parser/statement/ShowBroadcastTableRulesStatement.java (94%)
copy features/{ => broadcast}/pom.xml (83%)
delete mode 100644 features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowBroadcastTableRuleExecutorTest.java
delete mode 100644 features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateBroadcastTableRuleStatementUpdaterTest.java
delete mode 100644 features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropBroadcastTableRuleStatementUpdaterTest.java