You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/08/18 10:55:52 UTC
[shardingsphere] branch master updated (6c6d131 -> 4c95421)
This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from 6c6d131 Sharding proxy support show tables (#6916)
new bea3433 Refactor SpringNamespaceTest
new 4a560b3 Refactor SpringNamespaceTest
new 597b89b Refactor SpringNamespaceTest
new 527453b Remove useless fixture
new 2203677 Update EncryptSpringNamespaceTest
new 7bcfe97 Update ShardingSpringNamespaceTest
new 4c95421 Merge pull request #6917 from terrymanu/dev
The 26187 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../namespace/EncryptSpringNamespaceTest.java | 14 +-
.../spring/encrypt-application-context.xml | 4 +-
.../namespace/ShardingSpringNamespaceTest.java | 4 +-
.../spring/sharding-application-context.xml | 6 +-
.../shardingsphere/spring/SpringNamespaceTest.java | 266 ++++-----------------
.../DefaultComplexKeysShardingAlgorithm.java | 47 ----
.../algorithm/DefaultHintShardingAlgorithm.java | 47 ----
.../StandardModuloDatabaseShardingAlgorithm.java | 67 ------
.../StandardModuloTableShardingAlgorithm.java | 67 ------
.../fixture/DecrementKeyGenerateAlgorithm.java | 48 ----
.../fixture/IncrementKeyGenerateAlgorithm.java | 48 ----
.../spring/fixture/TestEncryptAlgorithm.java | 50 ----
.../shardingsphere/spring/util/FieldValueUtil.java | 65 -----
.../META-INF/rdb/datasource/dataSource.xml | 31 ---
.../rdb/datasource/masterSlaveDataSource.xml | 36 ---
.../resources/META-INF/rdb/shardingNamespace.xml | 218 -----------------
...che.shardingsphere.encrypt.spi.EncryptAlgorithm | 18 --
...hardingsphere.sharding.spi.KeyGenerateAlgorithm | 19 --
...e.shardingsphere.sharding.spi.ShardingAlgorithm | 21 --
.../META-INF/spring/application-context.xml | 93 +++++++
.../src/test/resources/conf/rdb/conf.properties | 13 +-
.../conf/rdb/master_slave_conf.properties | 47 ----
.../src/test/resources/logback-test.xml | 1 -
23 files changed, 154 insertions(+), 1076 deletions(-)
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/algorithm/DefaultComplexKeysShardingAlgorithm.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/algorithm/DefaultHintShardingAlgorithm.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/algorithm/StandardModuloDatabaseShardingAlgorithm.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/algorithm/StandardModuloTableShardingAlgorithm.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/fixture/DecrementKeyGenerateAlgorithm.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/fixture/IncrementKeyGenerateAlgorithm.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/fixture/TestEncryptAlgorithm.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/util/FieldValueUtil.java
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/datasource/dataSource.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/datasource/masterSlaveDataSource.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/rdb/shardingNamespace.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
create mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml
delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/conf/rdb/master_slave_conf.properties