You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/08/18 07:35:17 UTC
[shardingsphere] branch master updated (a6b327d -> f34ab74)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from a6b327d Refine release doc (#6907)
add f34ab74 Move spring namespace' test cases to correct modules (#6908)
No new revisions were added by this update.
Summary of changes:
pom.xml | 4 +-
.../query/PostgreSQLColumnDescriptionTest.java | 13 +-
.../metadata/EncryptMetaDataLoaderTest.java | 4 +-
.../dal/MergedEncryptColumnsMergedResultTest.java | 63 +++-----
.../boot/EncryptSpringBootConditionTest.java | 10 +-
.../pom.xml | 4 +
.../namespace/EncryptSpringNamespaceTest.java | 98 +++++++++++++
.../spring/encrypt-application-context.xml | 25 ++--
.../src/test/resources/conf/conf.properties | 2 +-
.../src/test/resources/logback-test.xml | 3 +-
.../boot/MasterSlaveSpringBootConditionTest.java | 10 +-
.../pom.xml | 4 +
.../namespace/MasterSlaveSpringNamespaceTest.java | 85 +++++++++++
.../spring/master-slave-application-context.xml | 24 ++-
.../src/test/resources/logback-test.xml | 3 +-
.../spring/boot/ShadowSpringBootConditionTest.java | 10 +-
.../shardingsphere-shadow-spring-namespace/pom.xml | 9 ++
.../namespace/ShadowSpringNamespaceTest.java} | 23 +--
.../META-INF/spring/shadow-application-context.xml | 13 +-
.../src/test/resources/logback-test.xml | 3 +-
.../boot/ShardingSpringBootConditionTest.java | 10 +-
.../pom.xml | 4 +
.../namespace/ShardingSpringNamespaceTest.java | 162 +++++++++++++++++++++
.../keygen}/IncrementKeyGenerateAlgorithm.java | 2 +-
.../ComplexKeysShardingAlgorithmFixture.java | 2 +-
.../sharding/HintShardingAlgorithmFixture.java | 4 +-
.../spring/namespace}/util/FieldValueUtil.java | 2 +-
...hardingsphere.sharding.spi.KeyGenerateAlgorithm | 2 +-
...e.shardingsphere.sharding.spi.ShardingAlgorithm | 4 +-
.../spring/sharding-application-context.xml | 101 +++++++++++++
.../src/test/resources/logback-test.xml | 0
.../driver/jdbc/adapter/StatementAdapterTest.java | 12 +-
.../GeneratedKeysResultSetMetaDataTest.java | 4 +-
.../core/resultset/GeneratedKeysResultSetTest.java | 4 +-
.../pom.xml | 7 +
...actShardingBothDataBasesAndTablesJUnitTest.java | 101 -------------
.../spring/AbstractSpringJUnitTest.java | 125 ----------------
.../spring/EncryptNamespaceTest.java | 59 --------
.../spring/GenerateKeyJUnitTest.java | 86 -----------
.../spring/KeyGenerateAlgorithmTest.java | 56 -------
.../spring/MasterSlaveNamespaceTest.java | 75 ----------
.../shardingsphere/spring/ShadowNamespaceTest.java | 53 -------
...NamespaceTest.java => SpringNamespaceTest.java} | 2 +-
.../cases/WithNamespaceAlgorithmClassTest.java | 25 ----
.../WithNamespaceAlgorithmExpressionTest.java | 25 ----
.../cases/WithNamespaceBindingTablesTest.java | 25 ----
.../cases/WithNamespaceBroadcastTablesTest.java | 25 ----
.../cases/WithNamespaceDefaultStrategyTest.java | 25 ----
.../cases/WithNamespaceDifferentTablesTest.java | 25 ----
...spaceForMasterSlaveWithDefaultStrategyTest.java | 34 -----
...NamespaceForMasterSlaveWithStrategyRefTest.java | 34 -----
...amespaceForMasterSlaveWithStrategyTypeTest.java | 34 -----
.../META-INF/rdb/datasource/dataSource.xml | 17 +--
.../rdb/datasource/masterSlaveDataSource.xml | 52 +------
.../META-INF/rdb/masterSlaveNamespace.xml | 64 --------
.../META-INF/rdb/withNamespaceAlgorithmClass.xml | 46 ------
.../rdb/withNamespaceAlgorithmClassAndProps.xml | 50 -------
.../rdb/withNamespaceAlgorithmExpression.xml | 60 --------
.../META-INF/rdb/withNamespaceBindingTables.xml | 49 -------
.../META-INF/rdb/withNamespaceBroadcastTables.xml | 52 -------
.../META-INF/rdb/withNamespaceDefaultStrategy.xml | 46 ------
.../META-INF/rdb/withNamespaceDifferentTables.xml | 60 --------
...hNamespaceForMasterSlaveWithDefaultStrategy.xml | 68 ---------
.../withNamespaceForMasterSlaveWithStrategyRef.xml | 68 ---------
...withNamespaceForMasterSlaveWithStrategyType.xml | 68 ---------
.../rdb/withNamespaceGenerateKeyColumns.xml | 53 -------
.../META-INF/rdb/withNamespaceLogicIndex.xml | 49 -------
.../src/test/resources/schema/dbtbl_0.sql | 37 -----
.../src/test/resources/schema/dbtbl_0_master.sql | 37 -----
.../src/test/resources/schema/dbtbl_0_slave_0.sql | 37 -----
.../src/test/resources/schema/dbtbl_0_slave_1.sql | 37 -----
.../src/test/resources/schema/dbtbl_1.sql | 37 -----
.../src/test/resources/schema/dbtbl_1_master.sql | 37 -----
.../src/test/resources/schema/dbtbl_1_slave_0.sql | 37 -----
.../src/test/resources/schema/dbtbl_1_slave_1.sql | 37 -----
.../pom.xml | 5 +
.../pom.xml | 14 +-
.../shardingsphere/test/MockedDataSource.java | 46 ++++--
78 files changed, 640 insertions(+), 2062 deletions(-)
create mode 100644 shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-spring/shardingsphere-encrypt-spring-namespace/src/test/java/org/apache/shardingsphere/encrypt/spring/namespace/EncryptSpringNamespaceTest.java
rename shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/encryptNamespace.xml => shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-spring/shardingsphere-encrypt-spring-namespace/src/test/resources/META-INF/spring/encrypt-application-context.xml (66%)
copy shardingsphere-control-panel/shardingsphere-opentracing/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker => shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-spring/shardingsphere-encrypt-spring-namespace/src/test/resources/conf/conf.properties (97%)
copy {shardingsphere-jdbc/shardingsphere-jdbc-orchestration => shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-spring/shardingsphere-encrypt-spring-namespace}/src/test/resources/logback-test.xml (93%)
create mode 100644 shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-spring/shardingsphere-master-slave-spring-namespace/src/test/java/org/apache/shardingsphere/masterslave/spring/namespace/MasterSlaveSpringNamespaceTest.java
copy shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingMasterSlaveOrchestration.xml => shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-spring/shardingsphere-master-slave-spring-namespace/src/test/resources/META-INF/spring/master-slave-application-context.xml (58%)
copy {shardingsphere-jdbc/shardingsphere-jdbc-orchestration => shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-spring/shardingsphere-master-slave-spring-namespace}/src/test/resources/logback-test.xml (93%)
copy shardingsphere-features/shardingsphere-shadow/{shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationYamlSwapperTest.java => shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowSpringNamespaceTest.java} (57%)
rename shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/shadowNamespace.xml => shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/resources/META-INF/spring/shadow-application-context.xml (69%)
copy {shardingsphere-jdbc/shardingsphere-jdbc-orchestration => shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace}/src/test/resources/logback-test.xml (93%)
create mode 100644 shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/ShardingSpringNamespaceTest.java
copy {shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/fixture => shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/keygen}/IncrementKeyGenerateAlgorithm.java (95%)
copy shardingsphere-features/shardingsphere-sharding/{shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture => shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/sharding}/ComplexKeysShardingAlgorithmFixture.java (95%)
copy shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/algorithm/DefaultHintShardingAlgorithm.java => shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/sharding/HintShardingAlgorithmFixture.java (91%)
copy {shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring => shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace}/util/FieldValueUtil.java (97%)
copy shardingsphere-features/shardingsphere-sharding/{shardingsphere-sharding-rewrite => shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace}/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm (89%)
copy {examples/example-core/config-utility/src/main => shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test}/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm (79%)
create mode 100644 shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/resources/META-INF/spring/sharding-application-context.xml
copy {shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace => shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace}/src/test/resources/logback-test.xml (100%)
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/AbstractShardingBothDataBasesAndTablesJUnitTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/AbstractSpringJUnitTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/EncryptNamespaceTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/GenerateKeyJUnitTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/KeyGenerateAlgorithmTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/MasterSlaveNamespaceTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/ShadowNamespaceTest.java
rename shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/{ShardingNamespaceTest.java => SpringNamespaceTest.java} (99%)
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/cases/WithNamespaceAlgorithmClassTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/cases/WithNamespaceAlgorithmExpressionTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/cases/WithNamespaceBindingTablesTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/cases/WithNamespaceBroadcastTablesTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/cases/WithNamespaceDefaultStrategyTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/cases/WithNamespaceDifferentTablesTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/cases/WithNamespaceForMasterSlaveWithDefaultStrategyTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/cases/WithNamespaceForMasterSlaveWithStrategyRefTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/cases/WithNamespaceForMasterSlaveWithStrategyTypeTest.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveNamespace.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClass.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClassAndProps.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmExpression.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceBindingTables.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceBroadcastTables.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDefaultStrategy.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDifferentTables.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithDefaultStrategy.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithStrategyRef.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithStrategyType.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceGenerateKeyColumns.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceLogicIndex.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/schema/dbtbl_0.sql
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/schema/dbtbl_0_master.sql
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/schema/dbtbl_0_slave_0.sql
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/schema/dbtbl_0_slave_1.sql
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/schema/dbtbl_1.sql
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/schema/dbtbl_1_master.sql
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/schema/dbtbl_1_slave_0.sql
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/schema/dbtbl_1_slave_1.sql
copy {shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common => shardingsphere-test}/pom.xml (81%)
copy shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java => shardingsphere-test/src/main/java/org/apache/shardingsphere/test/MockedDataSource.java (53%)