This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a change to branch yy2so-patch-2
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
from 733b52e0f9d Update mask.en.md
add 80e7a9ffbc0 Update mask.en.md (#23205)
add e82d9235c9c add `count mask rule` DistSQL resultSet (#23207)
add 58946adaf34 Method parameter adjustment in
RuleDefinitionCreateUpdater. (#23172)
add f238a87cc39 Update `create mask rule` DistSQL document (#23208)
add 8aa2ed1b7df Update `alter mask rule` DistSQL document (#23209)
add e9d241a331f Update `drop mask rule` DistSQL document (#23210)
add 6b9f510befc Fix `count mask rule` (#23213)
add 79ef9840b0c Update `show mask rule` DistSQL document (#23211)
add 88676bfea39 Update `count mask rule` DistSQL document (#23212)
add ea9cee49978 Implement TELEPHONE_RANDOM_REPLACE Algorithm (#23171)
add 1d2194bbb02 Adjust DatabaseDiscoveryDataSourceRule getDataSourceMapper
for primary datasource first (#23214)
add f42d2296f75 Move AdvisorConfiguration from agent-api to agent-core
module (#23215)
add 6cd883214f6 Remove bytebuddy dependency from agent-api module (#23217)
add d964a9f9003 Refactor ClassLoaderContext (#23221)
add 0353f875d1b Revise pr 23171 (#23222)
add e515314b78d Fix PipelineDataSourceConfiguration side effect (#23216)
add 1b8d9539a32 Add JDBCRepositoryProvider implementation of MYSQL (#23176)
add 3ab8747cdeb Add plugin-core to lib folder (#23223)
add 9f6dc8b7988 implements PERSONAL_IDENTITY_NUMBER_RANDOM_REPLACE mask
algorithm (#23220)
add 807acd0457d Revise #23176 (#23224)
add 9a6812d4bdc Add commons.logging shade for agent (#23225)
add 6e73293504d Update documentation for MySQL's JDBCRepositoryProvider
implementation (#23226)
add eae509351d2 Reconstruct the JDBCRepository#delete function (#23228)
add 54702712cae Revise pr 23220 (#23227)
add ec631968983 Rename package name of agent-api (#23229)
add fd87956909e Refactor agent shade plugin usage (#23203)
add 7dbd39bb842 Add `create mask rule` DistSQL unit test (#23219)
add 6a6466bfb2e Add `alter mask rule` DistSQL unit test (#23231)
add c02b78c23fa Refactor ifNotExists of CREATE DEFAULT SHADOW ALGORITHM.
(#23230)
add 47c695304b5 Refactor ifNotExists of CREATE DEFAULT SHADOW ALGORITHM.
(#23230)
add b8e24e026aa Add `drop mask rule` DistSQL unit test (#23232)
add b292b3de3bd Merge branch 'master' into yy2so-patch-2
No new revisions were added by this update.
Summary of changes:
.../plugin => api}/PluginConfiguration.java | 2 +-
.../agent/{ => api}/advice/AgentAdvice.java | 2 +-
.../agent/{ => api}/advice/TargetAdviceObject.java | 2 +-
.../{ => api}/advice/type/ConstructorAdvice.java | 6 +-
.../advice/type/InstanceMethodAdvice.java | 6 +-
.../{ => api}/advice/type/StaticMethodAdvice.java | 4 +-
.../agent/spi/PluginBootService.java | 2 +-
agent/core/pom.xml | 23 ++--
.../agent/core/ShardingSphereAgent.java | 4 +-
.../agent/core/classloader/AgentClassLoader.java | 6 +-
.../agent/core/classloader/ClassLoaderContext.java | 2 +-
.../config/loader/PluginConfigurationLoader.java | 2 +-
.../swapper/YamlPluginsConfigurationSwapper.java | 2 +-
.../core/plugin/PluginBootServiceManager.java | 8 +-
.../core/plugin}/advisor/AdvisorConfiguration.java | 2 +-
.../advisor/AdvisorConfigurationRegistry.java | 2 -
.../advisor/MethodAdvisorConfiguration.java | 2 +-
.../executor/type/ConstructorAdviceExecutor.java | 4 +-
.../type/InstanceMethodAdviceExecutor.java | 4 +-
.../executor/type/StaticMethodAdviceExecutor.java | 2 +-
.../plugin/loader/AdvisorConfigurationLoader.java | 26 ++---
.../swapper/YamlAdvisorConfigurationSwapper.java | 4 +-
.../swapper/YamlAdvisorsConfigurationSwapper.java | 2 +-
.../agent/core/transformer/AgentJunction.java | 2 +-
.../agent/core/transformer/AgentTransformer.java | 15 +--
.../transformer/builder/MethodAdvisorBuilder.java | 10 +-
.../transformer/builder/advise/AdviceFactory.java | 8 +-
.../advisor/AdvisorConfigurationRegistryTest.java | 1 -
.../plugin/yaml/fixture/YamlAdviceFixture.java | 8 +-
.../YamlAdvisorsConfigurationSwapperTest.java | 4 +-
.../core/transformer/AgentTransformerTest.java | 4 +-
.../core/transformer/fixture/advice/BarAdvice.java | 8 +-
.../core/transformer/fixture/advice/FooAdvice.java | 8 +-
.../shardingsphere-agent-binary-distribution.xml | 18 +--
agent/plugins/core/pom.xml | 15 +++
.../validator/PluginConfigurationValidator.java | 2 +-
.../PluginConfigurationValidatorTest.java | 2 +-
agent/plugins/logging/base/pom.xml | 43 +++++++
.../logging/base/BaseLoggingPluginBootService.java | 2 +-
.../base/advice/MetaDataContextsFactoryAdvice.java | 2 +-
agent/plugins/logging/pom.xml | 15 ---
agent/plugins/metrics/core/pom.xml | 34 +++++-
.../metrics/core/advice/ChannelHandlerAdvice.java | 4 +-
.../core/advice/CommandExecutorTaskAdvice.java | 4 +-
.../core/advice/MetaDataContextsFactoryAdvice.java | 2 +-
.../metrics/core/advice/SQLParserEngineAdvice.java | 4 +-
.../metrics/core/advice/SQLRouteEngineAdvice.java | 4 +-
.../metrics/core/advice/TransactionAdvice.java | 4 +-
.../core/advice/MockTargetAdviceObject.java | 2 +-
agent/plugins/metrics/type/pom.xml | 15 ---
agent/plugins/metrics/type/prometheus/pom.xml | 53 +++++++++
.../prometheus/PrometheusPluginBootService.java | 6 +-
.../PrometheusPluginBootServiceTest.java | 2 +-
agent/plugins/pom.xml | 77 ++-----------
agent/plugins/tracing/pom.xml | 13 ---
.../agent/plugin/tracing/AgentRunner.java | 2 +-
.../AbstractCommandExecutorTaskAdviceTest.java | 2 +-
.../AbstractJDBCExecutorCallbackAdviceTest.java | 2 +-
.../advice/AbstractSQLParserEngineAdviceTest.java | 2 +-
agent/plugins/tracing/type/jaeger/pom.xml | 75 ++++++++++++
.../jaeger/JaegerTracingPluginBootService.java | 2 +-
.../jaeger/advice/CommandExecutorTaskAdvice.java | 4 +-
.../jaeger/advice/JDBCExecutorCallbackAdvice.java | 4 +-
.../jaeger/advice/SQLParserEngineAdvice.java | 4 +-
.../jaeger/JaegerTracingPluginBootServiceTest.java | 2 +-
agent/plugins/tracing/type/opentelemetry/pom.xml | 79 +++++++++++++
.../OpenTelemetryTracingPluginBootService.java | 2 +-
.../advice/CommandExecutorTaskAdvice.java | 4 +-
.../advice/JDBCExecutorCallbackAdvice.java | 4 +-
.../advice/SQLParserEngineAdvice.java | 4 +-
.../OpenTelemetryTracingPluginBootServiceTest.java | 2 +-
agent/plugins/tracing/type/opentracing/pom.xml | 51 +++++++++
.../opentracing/OpenTracingPluginBootService.java | 2 +-
.../advice/CommandExecutorTaskAdvice.java | 4 +-
.../advice/JDBCExecutorCallbackAdvice.java | 4 +-
.../opentracing/advice/SQLParserEngineAdvice.java | 4 +-
.../OpenTracingPluginBootServiceTest.java | 2 +-
.../opentracing/advice/MockTargetAdviceObject.java | 2 +-
agent/plugins/tracing/type/pom.xml | 13 +--
agent/plugins/tracing/type/zipkin/pom.xml | 59 ++++++++++
.../zipkin/ZipkinTracingPluginBootService.java | 2 +-
.../zipkin/advice/CommandExecutorTaskAdvice.java | 4 +-
.../zipkin/advice/JDBCExecutorCallbackAdvice.java | 4 +-
.../zipkin/advice/SQLParserEngineAdvice.java | 4 +-
.../zipkin/ZipkinTracingPluginBootServiceTest.java | 2 +-
agent/pom.xml | 16 +--
.../update/RuleDefinitionCreateUpdater.java | 9 +-
docs/document/content/dev-manual/mask.cn.md | 20 ++--
docs/document/content/dev-manual/mask.en.md | 20 ++--
.../encrypt/create-encrypt-rule.en.md | 4 +-
.../syntax/rdl/rule-definition/mask/_index.cn.md | 7 ++
.../syntax/rdl/rule-definition/mask/_index.en.md | 7 ++
.../rdl/rule-definition/mask/alter-mask-rule.cn.md | 74 ++++++++++++
.../rdl/rule-definition/mask/alter-mask-rule.en.md | 74 ++++++++++++
.../rule-definition/mask/create-mask-rule.cn.md | 75 ++++++++++++
.../rule-definition/mask/create-mask-rule.en.md | 75 ++++++++++++
.../rdl/rule-definition/mask/drop-mask-rule.cn.md | 41 +++++++
.../rdl/rule-definition/mask/drop-mask-rule.en.md | 41 +++++++
.../syntax/rql/rule-query/mask/_index.cn.md | 7 ++
.../syntax/rql/rule-query/mask/_index.en.md | 7 ++
.../rql/rule-query/mask/count-mask-rule.cn.md | 81 +++++++++++++
.../rql/rule-query/mask/count-mask-rule.en.md | 80 +++++++++++++
.../rql/rule-query/mask/show-mask-rule.cn.md | 124 ++++++++++++++++++++
.../rql/rule-query/mask/show-mask-rule.en.md | 126 +++++++++++++++++++++
.../common-config/builtin-algorithm/mask.cn.md | 20 +++-
.../common-config/builtin-algorithm/mask.en.md | 26 ++++-
.../builtin-algorithm/metadata-repository.cn.md | 12 +-
.../builtin-algorithm/metadata-repository.en.md | 12 +-
.../yaml-config/rules/mask.en.md | 2 +-
.../optional-plugins/_index.cn.md | 3 +
.../optional-plugins/_index.en.md | 3 +
.../rule/DatabaseDiscoveryDataSourceRule.java | 12 +-
.../rule/DatabaseDiscoveryDataSourceRuleTest.java | 13 +--
.../rule/DatabaseDiscoveryRuleTest.java | 13 +--
...DatabaseDiscoveryHeartbeatStatementUpdater.java | 3 +-
...reateDatabaseDiscoveryRuleStatementUpdater.java | 2 +-
...reateDatabaseDiscoveryTypeStatementUpdater.java | 2 +-
...baseDiscoveryHeartbeatStatementUpdaterTest.java | 2 +-
...overyProviderAlgorithmStatementUpdaterTest.java | 8 +-
...eDatabaseDiscoveryRuleStatementUpdaterTest.java | 16 +--
.../update/CreateEncryptRuleStatementUpdater.java | 2 +-
.../CreateEncryptRuleStatementUpdaterTest.java | 2 +-
...rsonalIdentityNumberRandomReplaceAlgorithm.java | 81 +++++++++++++
.../replace/TelephoneRandomReplaceAlgorithm.java | 95 ++++++++++++++++
...rg.apache.shardingsphere.mask.spi.MaskAlgorithm | 2 +
...alIdentityNumberRandomReplaceAlgorithmTest.java | 32 +++---
.../TelephoneRandomReplaceAlgorithmTest.java | 63 +++++++++++
.../handler/query/CountMaskRuleResultSet.java | 91 +++++++++++++++
.../update/AlterMaskRuleStatementUpdater.java | 3 +-
.../update/CreateMaskRuleStatementUpdater.java | 3 +-
...here.distsql.handler.resultset.DistSQLResultSet | 2 +-
.../update/AlterMaskRuleStatementUpdaterTest.java | 100 ++++++++++++++++
.../update/CreateMaskRuleStatementUpdaterTest.java | 103 +++++++++++++++++
.../update/DropMaskRuleStatementUpdaterTest.java | 73 ++++++++++++
.../parser/core/MaskDistSQLStatementVisitor.java | 18 ++-
.../parser/statement/CountMaskRuleStatement.java | 24 ++--
...eateReadwriteSplittingRuleStatementUpdater.java | 3 +-
...ReadwriteSplittingRuleStatementUpdaterTest.java | 2 +-
...eateDefaultShadowAlgorithmStatementUpdater.java | 56 +++++----
.../update/CreateShadowRuleStatementUpdater.java | 2 +-
.../CreateBroadcastTableRuleStatementUpdater.java | 2 +-
...ateDefaultShardingStrategyStatementUpdater.java | 8 +-
...ShardingTableReferenceRuleStatementUpdater.java | 4 +-
.../CreateShardingTableRuleStatementUpdater.java | 2 +-
...eateBroadcastTableRuleStatementUpdaterTest.java | 6 +-
...efaultShardingStrategyStatementUpdaterTest.java | 16 +--
...dingTableReferenceRuleStatementUpdaterTest.java | 2 +-
...reateShardingTableRuleStatementUpdaterTest.java | 6 +-
...rdingSpherePipelineDataSourceConfiguration.java | 7 +-
.../StandardPipelineDataSourceConfiguration.java | 5 +-
...gSpherePipelineDataSourceConfigurationTest.java | 20 +++-
...tandardPipelineDataSourceConfigurationTest.java | 13 +++
.../repository/standalone/jdbc/JDBCRepository.java | 2 +-
.../repository/provider/jdbc/mysql}/pom.xml | 21 ++--
.../jdbc/mysql/MySQLJDBCRepositoryProvider.java | 66 +++++++++++
...standalone.jdbc.provider.JDBCRepositoryProvider | 3 +-
.../mysql/MySQLJDBCRepositoryProviderTest.java | 118 +++++++++++++++++++
.../standalone/repository/provider/jdbc/pom.xml | 1 +
.../rdl/rule/RuleDefinitionBackendHandler.java | 2 +-
...aultSingleTableStorageUnitStatementUpdater.java | 4 +-
.../FixtureRuleDefinitionCreateUpdater.java | 4 +-
...etDefaultSingleTableStorageUnitUpdaterTest.java | 8 +-
src/resources/checkstyle.xml | 2 +-
src/resources/checkstyle_ci.xml | 2 +-
...ngsphere-proxy-agent-opentelemetry-assembly.xml | 2 +-
165 files changed, 2484 insertions(+), 497 deletions(-)
copy agent/api/src/main/java/org/apache/shardingsphere/agent/{config/plugin =>
api}/PluginConfiguration.java (95%)
rename agent/api/src/main/java/org/apache/shardingsphere/agent/{ =>
api}/advice/AgentAdvice.java (94%)
rename agent/api/src/main/java/org/apache/shardingsphere/agent/{ =>
api}/advice/TargetAdviceObject.java (95%)
rename agent/api/src/main/java/org/apache/shardingsphere/agent/{ =>
api}/advice/type/ConstructorAdvice.java (86%)
rename agent/api/src/main/java/org/apache/shardingsphere/agent/{ =>
api}/advice/type/InstanceMethodAdvice.java (91%)
rename agent/api/src/main/java/org/apache/shardingsphere/agent/{ =>
api}/advice/type/StaticMethodAdvice.java (94%)
rename agent/{api/src/main/java/org/apache/shardingsphere/agent/config =>
core/src/main/java/org/apache/shardingsphere/agent/core/plugin}/advisor/AdvisorConfiguration.java
(95%)
rename agent/{api/src/main/java/org/apache/shardingsphere/agent/config =>
core/src/main/java/org/apache/shardingsphere/agent/core/plugin}/advisor/MethodAdvisorConfiguration.java
(95%)
create mode 100644
docs/document/content/reference/distsql/syntax/rdl/rule-definition/mask/_index.cn.md
create mode 100644
docs/document/content/reference/distsql/syntax/rdl/rule-definition/mask/_index.en.md
create mode 100644
docs/document/content/reference/distsql/syntax/rdl/rule-definition/mask/alter-mask-rule.cn.md
create mode 100644
docs/document/content/reference/distsql/syntax/rdl/rule-definition/mask/alter-mask-rule.en.md
create mode 100644
docs/document/content/reference/distsql/syntax/rdl/rule-definition/mask/create-mask-rule.cn.md
create mode 100644
docs/document/content/reference/distsql/syntax/rdl/rule-definition/mask/create-mask-rule.en.md
create mode 100644
docs/document/content/reference/distsql/syntax/rdl/rule-definition/mask/drop-mask-rule.cn.md
create mode 100644
docs/document/content/reference/distsql/syntax/rdl/rule-definition/mask/drop-mask-rule.en.md
create mode 100644
docs/document/content/reference/distsql/syntax/rql/rule-query/mask/_index.cn.md
create mode 100644
docs/document/content/reference/distsql/syntax/rql/rule-query/mask/_index.en.md
create mode 100644
docs/document/content/reference/distsql/syntax/rql/rule-query/mask/count-mask-rule.cn.md
create mode 100644
docs/document/content/reference/distsql/syntax/rql/rule-query/mask/count-mask-rule.en.md
create mode 100644
docs/document/content/reference/distsql/syntax/rql/rule-query/mask/show-mask-rule.cn.md
create mode 100644
docs/document/content/reference/distsql/syntax/rql/rule-query/mask/show-mask-rule.en.md
create mode 100644
features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/PersonalIdentityNumberRandomReplaceAlgorithm.java
create mode 100644
features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/TelephoneRandomReplaceAlgorithm.java
copy
agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootServiceTest.java
=>
features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/replace/PersonalIdentityNumberRandomReplaceAlgorithmTest.java
(50%)
create mode 100644
features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/replace/TelephoneRandomReplaceAlgorithmTest.java
create mode 100644
features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleResultSet.java
create mode 100644
features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdaterTest.java
create mode 100644
features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdaterTest.java
create mode 100644
features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleStatementUpdaterTest.java
rename
agent/api/src/main/java/org/apache/shardingsphere/agent/config/plugin/PluginConfiguration.java
=>
features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/CountMaskRuleStatement.java
(65%)
copy {agent/plugins/tracing/type/opentracing =>
mode/type/standalone/repository/provider/jdbc/mysql}/pom.xml (67%)
create mode 100644
mode/type/standalone/repository/provider/jdbc/mysql/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/mysql/MySQLJDBCRepositoryProvider.java
copy
features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
=>
mode/type/standalone/repository/provider/jdbc/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.standalone.jdbc.provider.JDBCRepositoryProvider
(84%)
create mode 100644
mode/type/standalone/repository/provider/jdbc/mysql/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/mysql/MySQLJDBCRepositoryProviderTest.java