You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/07/05 17:21:15 UTC

[shardingsphere] 01/01: Merge branch 'master' into yy2so-patch-2

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch yy2so-patch-2
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git

commit 82fe4375d6365a8bacab55b7616d4cc264c20f30
Merge: 4634f0ee8ef 5197d62a4bb
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jul 6 01:21:07 2023 +0800

    Merge branch 'master' into yy2so-patch-2

 .../content/features/transaction/appendix.en.md    |   6 +-
 .../content/reference/management/_index.en.md      |  10 +-
 .../yaml-config/rules/broadcast.en.md              |  10 +-
 ...show-status-from-readwrite-splitting-rule.cn.md |  62 ++--
 ...show-status-from-readwrite-splitting-rule.en.md |  62 ++--
 .../ral/global-rule/alter-sql-parser-rule.en.md    |  12 +-
 .../api/config/BroadcastRuleConfiguration.java     |   5 +
 .../subscriber/BroadcastTableChangedGenerator.java |  70 +++++
 .../subscriber/BroadcastTableSubscriber.java       |  84 -----
 ...ubsciber.RuleItemConfigurationChangedGenerator} |   2 +-
 .../config/CompatibleEncryptRuleConfiguration.java |   5 +
 .../api/config/EncryptRuleConfiguration.java       |   5 +
 .../subscriber/EncryptTableChangedGenerator.java   |  81 +++++
 .../encrypt/subscriber/EncryptTableSubscriber.java | 102 ------
 .../subscriber/EncryptorChangedGenerator.java      |  80 +++++
 .../encrypt/subscriber/EncryptorSubscriber.java    |  86 ------
 .../CompatibleEncryptTableChangedGenerator.java    |  83 +++++
 .../CompatibleEncryptTableSubscriber.java          |  90 ------
 .../CompatibleEncryptorChangedGenerator.java       |  82 +++++
 .../compatible/CompatibleEncryptorSubscriber.java  |  88 ------
 ...ubsciber.RuleItemConfigurationChangedGenerator} |   8 +-
 .../mask/api/config/MaskRuleConfiguration.java     |   5 +
 .../subscriber/MaskAlgorithmChangedGenerator.java  |  79 +++++
 .../mask/subscriber/MaskAlgorithmSubscriber.java   |  85 -----
 .../mask/subscriber/MaskTableChangedGenerator.java |  80 +++++
 .../mask/subscriber/MaskTableSubscriber.java       |  92 ------
 ...ubsciber.RuleItemConfigurationChangedGenerator} |   4 +-
 .../api/ReadwriteSplittingRuleConfiguration.java   |   5 +
 ...dwriteSplittingDataSourceRuleConfiguration.java |   3 +-
 ...adwriteSplittingDataSourceChangedGenerator.java |  89 ++++++
 .../ReadwriteSplittingDataSourceSubscriber.java    | 116 -------
 .../ReadwriteSplittingLoadBalanceSubscriber.java   | 104 -------
 ...writeSplittingLoadBalancerChangedGenerator.java |  75 +++++
 ...ubsciber.RuleItemConfigurationChangedGenerator} |   4 +-
 .../shadow/api/config/ShadowRuleConfiguration.java |   5 +
 ...DefaultShadowAlgorithmNameChangedGenerator.java |  66 ++++
 .../DefaultShadowAlgorithmNameSubscriber.java      |  78 -----
 .../ShadowAlgorithmChangedGenerator.java           |  72 +++++
 .../subscriber/ShadowAlgorithmSubscriber.java      |  88 ------
 .../ShadowDataSourceChangedGenerator.java          |  74 +++++
 .../subscriber/ShadowDataSourceSubscriber.java     |  84 -----
 .../subscriber/ShadowTableChangedGenerator.java    |  72 +++++
 .../shadow/subscriber/ShadowTableSubscriber.java   |  78 -----
 ...ubsciber.RuleItemConfigurationChangedGenerator} |   8 +-
 .../api/config/ShardingRuleConfiguration.java      |   5 +
 ...ltDatabaseShardingStrategyChangedGenerator.java |  70 +++++
 ...DefaultKeyGenerateStrategyChangedGenerator.java |  70 +++++
 ...ultShardingAuditorStrategyChangedGenerator.java |  70 +++++
 .../DefaultShardingColumnChangedGenerator.java     |  66 ++++
 ...faultTableShardingStrategyChangedGenerator.java |  70 +++++
 .../subscriber/KeyGeneratorChangedGenerator.java   |  72 +++++
 .../ShardingAlgorithmChangedGenerator.java         |  72 +++++
 .../subscriber/ShardingAlgorithmSubscriber.java    | 148 ---------
 .../ShardingAuditorChangedGenerator.java           |  72 +++++
 .../ShardingAutoTableChangedGenerator.java         |  73 +++++
 .../subscriber/ShardingCacheChangedGenerator.java  |  70 +++++
 .../subscriber/ShardingCacheSubscriber.java        |  78 -----
 .../ShardingDefaultStrategySubscriber.java         | 233 --------------
 .../subscriber/ShardingTableChangedGenerator.java  |  73 +++++
 .../ShardingTableReferenceChangedGenerator.java    |  71 +++++
 .../subscriber/ShardingTableSubscriber.java        | 161 ----------
 ...dingsphere.mode.subsciber.RuleChangedSubscriber |  10 +-
 ...subsciber.RuleItemConfigurationChangedGenerator |  29 ++
 .../rule/scope/DatabaseRuleConfiguration.java      |   7 +
 .../builder/database/DatabaseRulesBuilder.java     |   6 +-
 .../rule/event/rule/alter/AlterRuleItemEvent.java  |  21 ++
 .../rule/event/rule/drop/DropRuleItemEvent.java    |   7 +
 .../fixture/FixtureDatabaseRuleConfiguration.java  |   5 +
 .../executor/sql/context/ExecutionContext.java     |   4 +-
 .../infra/parser/sql/SQLStatementParserEngine.java |  13 +
 .../sql/SQLStatementParserEngineFactory.java       |   3 +
 .../sql/SQLStatementParserEngineFactoryTest.java   |  41 +++
 .../data/pipeline/cdc/api/impl/CDCJobAPI.java      |   6 +-
 .../cdc/context/{job => }/CDCJobItemContext.java   |   3 +-
 .../cdc/core/importer/sink/CDCSocketSink.java      |   5 +-
 .../data/pipeline/cdc/core/job/CDCJob.java         |   4 +-
 .../pipeline/cdc/core/prepare/CDCJobPreparer.java  |   6 +-
 .../cdc/generator/CDCResponseGenerator.java        |  53 ----
 .../pipeline/cdc/generator/CDCResponseUtils.java   |  88 ++++++
 .../pipeline/cdc/handler/CDCBackendHandler.java    |   5 +-
 .../{job => config}/YamlCDCJobConfiguration.java   |   2 +-
 .../YamlCDCJobConfigurationSwapper.java            |   5 +-
 .../job/YamlCDCJobConfigurationSwapperTest.java    |   4 +-
 .../single/api/config/SingleRuleConfiguration.java |   5 +
 .../subscriber/SingleTableChangedGenerator.java    |  72 +++++
 .../single/subscriber/SingleTableSubscriber.java   |  93 ------
 ...ubsciber.RuleItemConfigurationChangedGenerator} |   2 +-
 kernel/sql-federation/core/pom.xml                 |  32 +-
 .../src/main/antlr4/imports/rexnode/Alphabet.g4    |  50 ---
 .../src/main/antlr4/imports/rexnode/Keyword.g4     |  42 ---
 .../src/main/antlr4/imports/rexnode/Literals.g4    |  62 ----
 .../core/src/main/antlr4/imports/rexnode/Symbol.g4 |  42 ---
 .../rexnode/autogen/SQLOptimizerRexNode.g4         |  84 -----
 .../parser/OptimizerParserContextFactory.java      |   6 +-
 .../metadata/schema/SQLFederationTable.java        |  89 ++----
 .../compiler/operator/logical/LogicalScan.java     | 111 +++++++
 .../compiler/operator/physical/EnumerableScan.java | 106 +++++++
 .../enumerable/EnumerablePushDownTableScan.java    | 215 -------------
 .../util/LogicalScanPushDownRelBuilder.java        |  45 +++
 .../operator/util/LogicalScanRelShuttle.java       |  50 +++
 .../planner/cache/ExecutionPlanCacheKey.java       |   2 +
 .../planner/cache/ExecutionPlanCacheLoader.java    |   2 +-
 .../converter/EnumerableScanConverterRule.java     |  45 +++
 .../transformation/PushFilterIntoScanRule.java     |  66 ++--
 .../transformation/PushProjectIntoScanRule.java    |  82 ++---
 .../planner/util/SQLFederationPlannerUtils.java    |  31 +-
 .../compiler/statement/SQLStatementCompiler.java   |  13 +-
 .../statement/SQLStatementCompilerEngine.java      |   2 +-
 .../sqlfederation/engine/SQLFederationEngine.java  |  12 +-
 ...anExecutor.java => EnumerableScanExecutor.java} | 223 ++------------
 ...ext.java => EnumerableScanExecutorContext.java} |   6 +-
 .../executor/row/EmptyRowEnumerator.java           |  16 +-
 .../executor/row/MemoryEnumerator.java             |  10 +-
 .../executor/row/SQLFederationRowEnumerator.java   |  21 +-
 .../executor/util/SQLOptimizerRexNodeVisitor.java  | 342 ---------------------
 .../executor/util/StringToRexNodeUtils.java        |  59 ----
 ...erEngineIT.java => SQLStatementCompilerIT.java} |  25 +-
 ...orTest.java => EnumerableScanExecutorTest.java} |  25 +-
 .../resultset/SQLFederationResultSetTest.java      |   3 +-
 .../resources/cases/federation-query-sql-cases.xml | 231 +++++++-------
 .../mode/subsciber/RuleChangedSubscriber.java      |  33 --
 .../mode/subsciber/RuleItemChangedSubscriber.java  |  78 +++++
 .../RuleItemConfigurationChangedGenerator.java     |  69 +++++
 .../cluster/NewClusterContextManagerBuilder.java   |  12 +-
 .../src/main/antlr4/imports/mysql/BaseRule.g4      |   2 +-
 .../visitor/statement/MySQLStatementVisitor.java   |  16 +
 .../shardingsphere/sql/parser/api/CacheOption.java |   2 +
 pom.xml                                            |   7 +
 .../handler/distsql/rul/sql/PreviewExecutor.java   |   8 +-
 .../frontend/netty/CDCChannelInboundHandler.java   |  14 +-
 .../cases/dql/dql-integration-select-combine.xml   |  10 +-
 ...preview_sql_hint_comment_parse_enable_false.xml |  24 ++
 .../resources/cases/ral/ral-integration-alter.xml  |  26 ++
 .../asserts/statement/dcl/DCLStatementAssert.java  |   6 +-
 .../dcl/impl/mysql/MySQLGrantStatementAssert.java  |   2 +-
 .../dcl/impl/mysql/MySQLRevokeStatementAssert.java |   4 +-
 .../sqlserver/SQLServerGrantStatementAssert.java   |   2 +-
 .../sqlserver/SQLServerRevokeStatementAssert.java  |   4 +-
 .../sqlserver/SQLServerSetUserStatementAssert.java |   2 +-
 .../rdl/create/CreateRuleStatementAssert.java      |  11 +-
 .../main/resources/case/dml/select-expression.xml  |  76 +++++
 .../parser/src/main/resources/case/dml/select.xml  |  37 +++
 .../sql/supported/dml/select-expression.xml        |   2 +
 .../main/resources/sql/supported/dml/select.xml    |   1 +
 144 files changed, 3366 insertions(+), 3604 deletions(-)