You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/06/05 08:48:39 UTC
[shardingsphere] branch master updated (dd4349f -> 78da9d0)
This is an automated email from the ASF dual-hosted git repository.
wuweijie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from dd4349f Merge shadow feature to core module (#10666)
add 78da9d0 Merge encrypt feature to core module (#10667)
No new revisions were added by this update.
Summary of changes:
examples/example-core/config-utility/pom.xml | 6 +-
examples/pom.xml | 7 +-
.../shardingsphere-encrypt/pom.xml | 5 +-
.../shardingsphere-encrypt-api/pom.xml | 38 ---------
.../shardingsphere-encrypt-common/pom.xml | 43 ----------
.../shardingsphere-encrypt-core}/pom.xml | 15 ++--
.../encrypt/algorithm/AESEncryptAlgorithm.java | 0
.../encrypt/algorithm/MD5EncryptAlgorithm.java | 0
.../encrypt/algorithm/RC4EncryptAlgorithm.java | 0
.../AlgorithmProvidedEncryptRuleConfiguration.java | 0
.../api/config/EncryptRuleConfiguration.java | 0
.../rule/EncryptColumnRuleConfiguration.java | 0
.../config/rule/EncryptTableRuleConfiguration.java | 0
.../encrypt/constant/EncryptOrder.java | 0
.../merge/EncryptResultDecoratorEngine.java | 0
.../merge/dal/EncryptDALResultDecorator.java | 0
.../impl/DecoratedEncryptColumnsMergedResult.java | 0
.../merge/dal/impl/EncryptColumnsMergedResult.java | 0
.../dal/impl/MergedEncryptColumnsMergedResult.java | 0
.../merge/dql/EncryptAlgorithmMetaData.java | 0
.../merge/dql/EncryptDQLResultDecorator.java | 0
.../encrypt/merge/dql/EncryptMergedResult.java | 0
.../metadata/EncryptTableMetaDataBuilder.java | 0
.../rewrite/aware/QueryWithCipherColumnAware.java | 0
.../rewrite/condition/EncryptCondition.java | 0
.../rewrite/condition/EncryptConditionEngine.java | 0
.../condition/impl/EncryptEqualCondition.java | 0
.../rewrite/condition/impl/EncryptInCondition.java | 0
.../context/EncryptSQLRewriteContextDecorator.java | 0
.../parameter/EncryptParameterRewriter.java | 0
.../parameter/EncryptParameterRewriterBuilder.java | 0
.../impl/EncryptAssignmentParameterRewriter.java | 0
...OnDuplicateKeyUpdateValueParameterRewriter.java | 0
.../impl/EncryptInsertValueParameterRewriter.java | 0
.../impl/EncryptPredicateParameterRewriter.java | 0
.../rewrite/token/EncryptTokenGenerateBuilder.java | 0
.../generator/BaseEncryptSQLTokenGenerator.java | 0
...stQueryAndPlainInsertColumnsTokenGenerator.java | 0
.../impl/EncryptAlterTableTokenGenerator.java | 0
.../impl/EncryptAssignmentTokenGenerator.java | 0
.../impl/EncryptCreateTableTokenGenerator.java | 0
...ptForUseDefaultInsertColumnsTokenGenerator.java | 0
.../impl/EncryptInsertOnUpdateTokenGenerator.java | 0
.../impl/EncryptInsertValuesTokenGenerator.java | 0
.../impl/EncryptPredicateColumnTokenGenerator.java | 0
.../EncryptPredicateRightValueTokenGenerator.java | 0
.../impl/EncryptProjectionTokenGenerator.java | 0
.../impl/InsertCipherNameTokenGenerator.java | 0
.../rewrite/token/pojo/EncryptAlterTableToken.java | 0
.../rewrite/token/pojo/EncryptAssignmentToken.java | 0
.../token/pojo/EncryptInsertValuesToken.java | 0
.../token/pojo/EncryptLiteralAssignmentToken.java | 0
.../pojo/EncryptParameterAssignmentToken.java | 0
.../pojo/EncryptPredicateEqualRightValueToken.java | 0
.../pojo/EncryptPredicateInRightValueToken.java | 0
.../shardingsphere/encrypt/rule/EncryptColumn.java | 0
.../shardingsphere/encrypt/rule/EncryptRule.java | 0
.../shardingsphere/encrypt/rule/EncryptTable.java | 0
.../encrypt/rule/aware/EncryptRuleAware.java | 0
.../AlgorithmProvidedEncryptRuleBuilder.java | 0
.../encrypt/rule/builder/EncryptRuleBuilder.java | 0
.../AbstractEncryptRuleConfigurationChecker.java | 0
...thmProvidedEncryptRuleConfigurationChecker.java | 0
.../checker/EncryptRuleConfigurationChecker.java | 0
.../encrypt/spi/EncryptAlgorithm.java | 0
.../encrypt/spi/QueryAssistedEncryptAlgorithm.java | 0
.../yaml/config/YamlEncryptRuleConfiguration.java | 0
.../rule/YamlEncryptColumnRuleConfiguration.java | 0
.../rule/YamlEncryptTableRuleConfiguration.java | 0
.../converter/EncryptRuleStatementConverter.java | 0
...eAlgorithmProviderConfigurationYamlSwapper.java | 0
.../EncryptRuleConfigurationYamlSwapper.java | 0
.../EncryptColumnRuleConfigurationYamlSwapper.java | 0
.../EncryptTableRuleConfigurationYamlSwapper.java | 0
...che.shardingsphere.encrypt.spi.EncryptAlgorithm | 0
...ngsphere.infra.merge.engine.ResultProcessEngine | 17 ++++
...chema.builder.spi.RuleBasedTableMetaDataBuilder | 0
...nfra.rewrite.context.SQLRewriteContextDecorator | 0
...here.infra.rule.builder.scope.SchemaRuleBuilder | 0
...ere.infra.rule.checker.RuleConfigurationChecker | 0
...infra.yaml.swapper.YamlRuleConfigurationSwapper | 0
.../encrypt/algorithm/AESEncryptAlgorithmTest.java | 0
.../encrypt/algorithm/MD5EncryptAlgorithmTest.java | 0
.../encrypt/algorithm/RC4EncryptAlgorithmTest.java | 0
.../encrypt/fixture/TestEncryptAlgorithm.java | 0
.../fixture/TestQueryAssistedEncryptAlgorithm.java | 0
.../merge/EncryptResultDecoratorEngineTest.java | 0
.../merge/dal/EncryptDALResultDecoratorTest.java | 0
.../dal/MergedEncryptColumnsMergedResultTest.java | 0
.../DecoratedEncryptColumnsMergedResultTest.java | 0
.../dal/impl/fixture/TestStatementContext.java | 0
.../merge/dql/EncryptAlgorithmMetaDataTest.java | 0
.../merge/dql/EncryptDQLResultDecoratorTest.java | 0
.../encrypt/merge/dql/EncryptMergedResultTest.java | 0
.../fixture/EncryptColumnsMergedResultFixture.java | 0
...ableAvailableAndSqlStatementContextFixture.java | 0
.../metadata/EncryptTableMetaDataBuilderTest.java | 0
.../rewrite}/impl/EncryptEqualConditionTest.java | 3 +-
.../rewrite}/impl/EncryptInConditionTest.java | 3 +-
.../pojo/EncryptLiteralAssignmentTokenTest.java | 0
.../pojo/EncryptParameterAssignmentTokenTest.java | 0
.../EncryptPredicateEqualRightValueTokenTest.java | 0
.../EncryptPredicateInRightValueTokenTest.java | 0
.../encrypt/rule/EncryptColumnTest.java | 0
.../encrypt/rule/EncryptRuleTest.java | 0
.../encrypt/rule/EncryptTableTest.java | 0
.../AlgorithmProvidedEncryptRuleBuilderTest.java | 0
.../rule/builder/EncryptRuleBuilderTest.java | 0
.../EncryptRuleStatementConverterTest.java | 0
...orithmProviderConfigurationYamlSwapperTest.java | 0
.../EncryptRuleConfigurationYamlSwapperTest.java | 0
...ryptColumnRuleConfigurationYamlSwapperTest.java | 0
...cryptTableRuleConfigurationYamlSwapperTest.java | 0
...che.shardingsphere.encrypt.spi.EncryptAlgorithm | 0
.../shardingsphere-encrypt-merge/pom.xml | 43 ----------
.../shardingsphere-encrypt-rewrite/pom.xml | 95 ----------------------
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../RandomReplicaLoadBalanceAlgorithmTest.java | 0
.../RoundRobinReplicaLoadBalanceAlgorithmTest.java | 12 +++
.../route/ReadwriteSplittingSQLRouterTest.java | 0
.../rule/ReadwriteSplittingDataSourceRuleTest.java | 0
.../test/java/rule/ReadwriteSplittingRuleTest.java | 0
...mProvidedReadwriteSplittingRuleBuilderTest.java | 0
.../biulder/ReadwriteSplittingRuleBuilderTest.java | 0
...orithmProviderConfigurationYamlSwapperTest.java | 0
...eSplittingRuleConfigurationYamlSwapperTest.java | 0
...amlReadwriteSplittingRuleConfigurationTest.java | 0
.../src/{main => }/test/resources/logback-test.xml | 0
.../resources/yaml/readwrite-splitting-rule.yaml | 0
.../shardingsphere-jdbc-core/pom.xml | 7 +-
.../shardingsphere-proxy-backend/pom.xml | 7 +-
.../shardingsphere-proxy-common/pom.xml | 2 +-
.../shardingsphere-rewrite-test/pom.xml | 6 +-
134 files changed, 52 insertions(+), 261 deletions(-)
delete mode 100644 shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-api/pom.xml
delete mode 100644 shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/pom.xml
copy {shardingsphere-infra/shardingsphere-infra-executor => shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core}/pom.xml (84%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/algorithm/AESEncryptAlgorithm.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/algorithm/MD5EncryptAlgorithm.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/algorithm/RC4EncryptAlgorithm.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/algorithm/config/AlgorithmProvidedEncryptRuleConfiguration.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-api => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/api/config/EncryptRuleConfiguration.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-api => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/api/config/rule/EncryptColumnRuleConfiguration.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-api => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/api/config/rule/EncryptTableRuleConfiguration.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/constant/EncryptOrder.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/merge/EncryptResultDecoratorEngine.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecorator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/DecoratedEncryptColumnsMergedResult.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/EncryptColumnsMergedResult.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/MergedEncryptColumnsMergedResult.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptAlgorithmMetaData.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptDQLResultDecorator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptMergedResult.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptTableMetaDataBuilder.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/aware/QueryWithCipherColumnAware.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptCondition.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptEqualCondition.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptInCondition.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecorator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriter.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/impl/EncryptAssignmentParameterRewriter.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/impl/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/impl/EncryptInsertValueParameterRewriter.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/impl/EncryptPredicateParameterRewriter.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilder.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/BaseEncryptSQLTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/AssistQueryAndPlainInsertColumnsTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptAlterTableTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptAssignmentTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptCreateTableTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptForUseDefaultInsertColumnsTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptInsertOnUpdateTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptInsertValuesTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateColumnTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateRightValueTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptProjectionTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/InsertCipherNameTokenGenerator.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptAlterTableToken.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptAssignmentToken.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptInsertValuesToken.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptLiteralAssignmentToken.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptParameterAssignmentToken.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateInRightValueToken.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumn.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rule/aware/EncryptRuleAware.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/AlgorithmProvidedEncryptRuleBuilder.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rule/checker/AbstractEncryptRuleConfigurationChecker.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rule/checker/AlgorithmProvidedEncryptRuleConfigurationChecker.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/rule/checker/EncryptRuleConfigurationChecker.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-api => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/spi/EncryptAlgorithm.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-api => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/spi/QueryAssistedEncryptAlgorithm.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/yaml/config/YamlEncryptRuleConfiguration.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/yaml/config/rule/YamlEncryptColumnRuleConfiguration.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/yaml/config/rule/YamlEncryptTableRuleConfiguration.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/yaml/converter/EncryptRuleStatementConverter.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleAlgorithmProviderConfigurationYamlSwapper.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapper.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/rule/EncryptColumnRuleConfigurationYamlSwapper.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/rule/EncryptTableRuleConfigurationYamlSwapper.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.merge.engine.ResultProcessEngine (52%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.schema.builder.spi.RuleBasedTableMetaDataBuilder (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContextDecorator (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.scope.SchemaRuleBuilder (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.checker.RuleConfigurationChecker (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/algorithm/AESEncryptAlgorithmTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/algorithm/MD5EncryptAlgorithmTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/algorithm/RC4EncryptAlgorithmTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/fixture/TestEncryptAlgorithm.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/fixture/TestQueryAssistedEncryptAlgorithm.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/merge/EncryptResultDecoratorEngineTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecoratorTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/MergedEncryptColumnsMergedResultTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/impl/DecoratedEncryptColumnsMergedResultTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/impl/fixture/TestStatementContext.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptAlgorithmMetaDataTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptDQLResultDecoratorTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptMergedResultTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/merge/dql/fixture/EncryptColumnsMergedResultFixture.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-merge => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/merge/dql/fixture/TableAvailableAndSqlStatementContextFixture.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/metadata/EncryptTableMetaDataBuilderTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/condition => shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite}/impl/EncryptEqualConditionTest.java (90%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/condition => shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite}/impl/EncryptInConditionTest.java (91%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/rewrite/pojo/EncryptLiteralAssignmentTokenTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/rewrite/pojo/EncryptParameterAssignmentTokenTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/rewrite/pojo/EncryptPredicateEqualRightValueTokenTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-rewrite => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/rewrite/pojo/EncryptPredicateInRightValueTokenTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptTableTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/rule/builder/AlgorithmProvidedEncryptRuleBuilderTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilderTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/yaml/converter/EncryptRuleStatementConverterTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleAlgorithmProviderConfigurationYamlSwapperTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapperTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/rule/EncryptColumnRuleConfigurationYamlSwapperTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/rule/EncryptTableRuleConfigurationYamlSwapperTest.java (100%)
rename shardingsphere-features/shardingsphere-encrypt/{shardingsphere-encrypt-common => shardingsphere-encrypt-core}/src/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm (100%)
delete mode 100644 shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/pom.xml
delete mode 100644 shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/pom.xml
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/java/algorithm/RandomReplicaLoadBalanceAlgorithmTest.java (100%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/java/algorithm/RoundRobinReplicaLoadBalanceAlgorithmTest.java (81%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/java/route/ReadwriteSplittingSQLRouterTest.java (100%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/java/rule/ReadwriteSplittingDataSourceRuleTest.java (100%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/java/rule/ReadwriteSplittingRuleTest.java (100%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/java/rule/biulder/AlgorithmProvidedReadwriteSplittingRuleBuilderTest.java (100%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/java/rule/biulder/ReadwriteSplittingRuleBuilderTest.java (100%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/java/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapperTest.java (100%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/java/swapper/ReadwriteSplittingRuleConfigurationYamlSwapperTest.java (100%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/java/swapper/YamlRootRuleConfigurationsForYamlReadwriteSplittingRuleConfigurationTest.java (100%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/resources/logback-test.xml (100%)
rename shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/{main => }/test/resources/yaml/readwrite-splitting-rule.yaml (100%)