You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2021/10/13 05:14:00 UTC
[shardingsphere] branch master updated: For #12986,
Migrate the sharding-readwrite-splitting example. (#13012)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new c4b6b04 For #12986, Migrate the sharding-readwrite-splitting example. (#13012)
c4b6b04 is described below
commit c4b6b041c77aa700d4200ca4ae42df5ccc17d33c
Author: yx9o <ya...@163.com>
AuthorDate: Wed Oct 13 13:13:08 2021 +0800
For #12986, Migrate the sharding-readwrite-splitting example. (#13012)
---
.../pom.xml | 13 +++++++++-
...writeSplittingRawJavaConfigurationExample.java} | 14 ++++-------
...SplittingRawJavaRangeConfigurationExample.java} | 14 ++++-------
...writeSplittingRawYamlConfigurationExample.java} | 13 +++-------
...SplittingRawYamlRangeConfigurationExample.java} | 12 +++------
...dingReadwriteSplittingConfigurationPrecise.java | 9 ++++---
...ardingReadwriteSplittingConfigurationRange.java | 2 +-
.../splitting/raw}/factory/DataSourceFactory.java | 16 ++----------
.../raw}/factory/RangeDataSourceFactory.java | 16 ++----------
.../raw}/factory/YamlDataSourceFactory.java | 12 ++-------
.../raw}/factory/YamlRangeDataSourceFactory.java | 14 +++--------
.../sharding-readwrite-splitting-range.yaml | 15 +++++++----
.../META-INF}/sharding-readwrite-splitting.yaml | 15 +++++++----
.../{pom.xml => src/main/resources/logback.xml} | 29 ++++++++++++----------
.../jdbc/ShardingRawJavaConfigurationExample.java | 1 -
.../ShardingRawJavaRangeConfigurationExample.java | 1 -
.../jdbc/ShardingRawYamlConfigurationExample.java | 1 -
.../ShardingRawYamlRangeConfigurationExample.java | 1 -
.../raw/jdbc/factory/DataSourceFactory.java | 3 ---
.../raw/jdbc/factory/RangeDataSourceFactory.java | 3 ---
.../raw/jdbc/factory/YamlDataSourceFactory.java | 2 --
.../jdbc/factory/YamlRangeDataSourceFactory.java | 2 --
22 files changed, 81 insertions(+), 127 deletions(-)
diff --git a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/pom.xml b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/pom.xml
index 2bd404a..f92961f 100644
--- a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/pom.xml
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/pom.xml
@@ -26,6 +26,17 @@
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>sharding-readwrite-splitting-raw-jdbc-example</artifactId>
- <packaging>pom</packaging>
<name>${project.artifactId}</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere.example</groupId>
+ <artifactId>example-raw-jdbc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-jdbc-core</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaConfigurationExample.java b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawJavaConfiguratio [...]
similarity index 75%
copy from examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaConfigurationExample.java
copy to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawJavaConfigurationExample.java
index 67082b3..e27ba69 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaConfigurationExample.java
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawJavaConfigurationExample.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc;
+package org.apache.shardingsphere.example.sharding.readwrite.splitting.raw;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
import org.apache.shardingsphere.example.core.jdbc.service.OrderServiceImpl;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.factory.DataSourceFactory;
+import org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.factory.DataSourceFactory;
import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
@@ -29,13 +29,9 @@ import java.sql.SQLException;
/*
* Please make sure primary replica data replication sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
*/
-public final class ShardingRawJavaConfigurationExample {
-
- private static ShardingType shardingType = ShardingType.SHARDING_DATABASES;
-// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
-// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.READWRITE_SPLITTING;
-// private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
+public final class ShardingReadwriteSplittingRawJavaConfigurationExample {
+
+ private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
public static void main(final String[] args) throws SQLException {
DataSource dataSource = DataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaRangeConfigurationExample.java b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawJavaRangeCo [...]
similarity index 78%
copy from examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaRangeConfigurationExample.java
copy to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawJavaRangeConfigurationExample.java
index 7ee3c27..164cb5d 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaRangeConfigurationExample.java
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawJavaRangeConfigurationExample.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc;
+package org.apache.shardingsphere.example.sharding.readwrite.splitting.raw;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.example.core.jdbc.repository.AddressRepositoryI
import org.apache.shardingsphere.example.core.jdbc.repository.OrderItemRepositoryImpl;
import org.apache.shardingsphere.example.core.jdbc.repository.RangeOrderRepositoryImpl;
import org.apache.shardingsphere.example.core.jdbc.service.OrderServiceImpl;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.factory.RangeDataSourceFactory;
+import org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.factory.RangeDataSourceFactory;
import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
@@ -32,13 +32,9 @@ import java.sql.SQLException;
/*
* Please make sure primary replica data replication sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
*/
-public final class ShardingRawJavaRangeConfigurationExample {
-
- private static ShardingType shardingType = ShardingType.SHARDING_DATABASES;
-// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
-// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.READWRITE_SPLITTING;
-// private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
+public final class ShardingReadwriteSplittingRawJavaRangeConfigurationExample {
+
+ private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
public static void main(final String[] args) throws SQLException {
DataSource dataSource = RangeDataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlConfigurationExample.java b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawYamlConfiguratio [...]
similarity index 72%
copy from examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlConfigurationExample.java
copy to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawYamlConfigurationExample.java
index 54f43f8..be4cd90 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlConfigurationExample.java
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawYamlConfigurationExample.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc;
+package org.apache.shardingsphere.example.sharding.readwrite.splitting.raw;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.jdbc.service.AccountServiceImpl;
import org.apache.shardingsphere.example.core.jdbc.service.OrderServiceImpl;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.factory.YamlDataSourceFactory;
+import org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.factory.YamlDataSourceFactory;
import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
@@ -30,14 +30,9 @@ import java.sql.SQLException;
/*
* Please make sure primary replica data replication sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
*/
-public final class ShardingRawYamlConfigurationExample {
+public final class ShardingReadwriteSplittingRawYamlConfigurationExample {
-// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES;
-// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
-// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.READWRITE_SPLITTING;
-// private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
- private static ShardingType shardingType = ShardingType.SHARDING_AUTO_TABLES;
+ private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
public static void main(final String[] args) throws SQLException, IOException {
DataSource dataSource = YamlDataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlRangeConfigurationExample.java b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawYamlRangeCo [...]
similarity index 74%
copy from examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlRangeConfigurationExample.java
copy to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawYamlRangeConfigurationExample.java
index 02faec6..85984f6 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlRangeConfigurationExample.java
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/ShardingReadwriteSplittingRawYamlRangeConfigurationExample.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc;
+package org.apache.shardingsphere.example.sharding.readwrite.splitting.raw;
import org.apache.shardingsphere.example.core.api.ExampleExecuteTemplate;
import org.apache.shardingsphere.example.core.jdbc.service.AccountServiceImpl;
import org.apache.shardingsphere.example.core.jdbc.service.OrderServiceImpl;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.factory.YamlRangeDataSourceFactory;
+import org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.factory.YamlRangeDataSourceFactory;
import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
@@ -30,13 +30,9 @@ import java.sql.SQLException;
/*
* Please make sure primary replica data replication sync on MySQL is running correctly. Otherwise this example will query empty data from replica.
*/
-public final class ShardingRawYamlRangeConfigurationExample {
+public final class ShardingReadwriteSplittingRawYamlRangeConfigurationExample {
- private static ShardingType shardingType = ShardingType.SHARDING_DATABASES;
-// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
-// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.READWRITE_SPLITTING;
-// private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
+ private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
public static void main(final String[] args) throws SQLException, IOException {
DataSource dataSource = YamlRangeDataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingReadwriteSplittingConfigurationPrecise.java b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/config/ShardingReadwriteSpl [...]
similarity index 91%
rename from examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingReadwriteSplittingConfigurationPrecise.java
rename to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/config/ShardingReadwriteSplittingConfigurationPrecise.java
index 39a66fe..2d039f8 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingReadwriteSplittingConfigurationPrecise.java
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/config/ShardingReadwriteSplittingConfigurationPrecise.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
+package org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.config;
import org.apache.shardingsphere.driver.api.ShardingSphereDataSourceFactory;
import org.apache.shardingsphere.example.config.ExampleConfiguration;
@@ -40,7 +40,8 @@ public final class ShardingReadwriteSplittingConfigurationPrecise implements Exa
@Override
public DataSource getDataSource() throws SQLException {
- return ShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(), Arrays.asList(createShardingRuleConfiguration(), createReadwriteSplittingConfiguration()), new Properties());
+ return ShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(),
+ Arrays.asList(createShardingRuleConfiguration(), createReadwriteSplittingConfiguration()), new Properties());
}
private static Map<String, DataSource> createDataSourceMap() {
@@ -62,8 +63,8 @@ public final class ShardingReadwriteSplittingConfigurationPrecise implements Exa
result.getBroadcastTables().add("t_address");
result.setDefaultDatabaseShardingStrategy(new StandardShardingStrategyConfiguration("user_id", "standard_test_db"));
result.setDefaultTableShardingStrategy(new StandardShardingStrategyConfiguration("order_id", "standard_test_tbl"));
- result.getShardingAlgorithms() .put("standard_test_db", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST_DB", new Properties()));
- result.getShardingAlgorithms() .put("standard_test_tbl", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST_TBL", new Properties()));
+ result.getShardingAlgorithms().put("standard_test_db", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST_DB", new Properties()));
+ result.getShardingAlgorithms().put("standard_test_tbl", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST_TBL", new Properties()));
result.getKeyGenerators().put("snowflake", new ShardingSphereAlgorithmConfiguration("SNOWFLAKE", getProperties()));
return result;
}
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingReadwriteSplittingConfigurationRange.java b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/config/ShardingReadwriteSplit [...]
similarity index 98%
rename from examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingReadwriteSplittingConfigurationRange.java
rename to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/config/ShardingReadwriteSplittingConfigurationRange.java
index 7c22b08..cc567f1 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingReadwriteSplittingConfigurationRange.java
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/config/ShardingReadwriteSplittingConfigurationRange.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
+package org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.config;
import org.apache.shardingsphere.driver.api.ShardingSphereDataSourceFactory;
import org.apache.shardingsphere.example.config.ExampleConfiguration;
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/DataSourceFactory.java
similarity index 55%
copy from examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java
copy to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/DataSourceFactory.java
index b9bfca9..da00b5a 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/DataSourceFactory.java
@@ -15,13 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc.factory;
+package org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.factory;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ReadwriteSplittingConfiguration;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesAndTablesConfigurationPrecise;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesConfigurationPrecise;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingReadwriteSplittingConfigurationPrecise;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingTablesConfigurationPrecise;
+import org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.config.ShardingReadwriteSplittingConfigurationPrecise;
import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
@@ -31,14 +27,6 @@ public final class DataSourceFactory {
public static DataSource newInstance(final ShardingType shardingType) throws SQLException {
switch (shardingType) {
- case SHARDING_DATABASES:
- return new ShardingDatabasesConfigurationPrecise().getDataSource();
- case SHARDING_TABLES:
- return new ShardingTablesConfigurationPrecise().getDataSource();
- case SHARDING_DATABASES_AND_TABLES:
- return new ShardingDatabasesAndTablesConfigurationPrecise().getDataSource();
- case READWRITE_SPLITTING:
- return new ReadwriteSplittingConfiguration().getDataSource();
case SHARDING_READWRITE_SPLITTING:
return new ShardingReadwriteSplittingConfigurationPrecise().getDataSource();
default:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/RangeDataSourceFactory.java
similarity index 55%
copy from examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java
copy to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/RangeDataSourceFactory.java
index 0544c89..27fe94d 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/RangeDataSourceFactory.java
@@ -15,13 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc.factory;
+package org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.factory;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ReadwriteSplittingConfiguration;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesAndTablesConfigurationRange;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesConfigurationRange;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingReadwriteSplittingConfigurationRange;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingTablesConfigurationRange;
+import org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.config.ShardingReadwriteSplittingConfigurationRange;
import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
@@ -31,14 +27,6 @@ public final class RangeDataSourceFactory {
public static DataSource newInstance(final ShardingType shardingType) throws SQLException {
switch (shardingType) {
- case SHARDING_DATABASES:
- return new ShardingDatabasesConfigurationRange().getDataSource();
- case SHARDING_TABLES:
- return new ShardingTablesConfigurationRange().getDataSource();
- case SHARDING_DATABASES_AND_TABLES:
- return new ShardingDatabasesAndTablesConfigurationRange().getDataSource();
- case READWRITE_SPLITTING:
- return new ReadwriteSplittingConfiguration().getDataSource();
case SHARDING_READWRITE_SPLITTING:
return new ShardingReadwriteSplittingConfigurationRange().getDataSource();
default:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlDataSourceFactory.java b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/YamlDataSourceFactory.java
similarity index 70%
copy from examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlDataSourceFactory.java
copy to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/YamlDataSourceFactory.java
index 7577606..3828057 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlDataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/YamlDataSourceFactory.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc.factory;
+package org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.factory;
-import org.apache.shardingsphere.example.type.ShardingType;
import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
+import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
import java.io.File;
@@ -29,14 +29,6 @@ public final class YamlDataSourceFactory {
public static DataSource newInstance(final ShardingType shardingType) throws SQLException, IOException {
switch (shardingType) {
- case SHARDING_DATABASES:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-databases.yaml"));
- case SHARDING_TABLES:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-tables.yaml"));
- case SHARDING_DATABASES_AND_TABLES:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-databases-tables.yaml"));
- case READWRITE_SPLITTING:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/readwrite-splitting.yaml"));
case SHARDING_READWRITE_SPLITTING:
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-readwrite-splitting.yaml"));
default:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/YamlRangeDataSourceFactory.java
similarity index 66%
copy from examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java
copy to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/YamlRangeDataSourceFactory.java
index 81ac3cc..6b7ed98 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/readwrite/splitting/raw/factory/YamlRangeDataSourceFactory.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc.factory;
+package org.apache.shardingsphere.example.sharding.readwrite.splitting.raw.factory;
-import org.apache.shardingsphere.example.type.ShardingType;
import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
+import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
import java.io.File;
@@ -29,16 +29,8 @@ public final class YamlRangeDataSourceFactory {
public static DataSource newInstance(final ShardingType shardingType) throws SQLException, IOException {
switch (shardingType) {
- case SHARDING_DATABASES:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-databases-range.yaml"));
- case SHARDING_TABLES:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-tables-range.yaml"));
- case SHARDING_DATABASES_AND_TABLES:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-databases-tables-range.yaml"));
- case READWRITE_SPLITTING:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/readwrite-splitting.yaml"));
case SHARDING_READWRITE_SPLITTING:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-readwrite-splitting.yaml"));
+ return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-readwrite-splitting-range.yaml"));
default:
throw new UnsupportedOperationException(shardingType.name());
}
diff --git a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/sharding-readwrite-splitting-range.yaml b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/resources/META-INF/sharding-readwrite-splitting-range.yaml
similarity index 98%
rename from examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/sharding-readwrite-splitting-range.yaml
rename to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/resources/META-INF/sharding-readwrite-splitting-range.yaml
index cfde808..524e56a 100644
--- a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/sharding-readwrite-splitting-range.yaml
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/resources/META-INF/sharding-readwrite-splitting-range.yaml
@@ -22,43 +22,48 @@ dataSources:
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
+
write_ds_0_read_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_0_read_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
+
write_ds_0_read_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_0_read_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
+
write_ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
+
write_ds_1_read_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_1_read_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
+
write_ds_1_read_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_1_read_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
-
+
rules:
- !SHARDING
tables:
- t_order:
+ t_order:
actualDataNodes: ds_${0..1}.t_order_${0..1}
- tableStrategy:
+ tableStrategy:
standard:
shardingColumn: order_id
shardingAlgorithmName: standard_test_tbl
@@ -82,13 +87,13 @@ rules:
standard:
shardingColumn: user_id
shardingAlgorithmName: standard_test_db
-
+
shardingAlgorithms:
standard_test_db:
type: STANDARD_TEST_DB
standard_test_tbl:
type: STANDARD_TEST_TBL
-
+
keyGenerators:
snowflake:
type: SNOWFLAKE
diff --git a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/sharding-readwrite-splitting.yaml b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/resources/META-INF/sharding-readwrite-splitting.yaml
similarity index 98%
rename from examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/sharding-readwrite-splitting.yaml
rename to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/resources/META-INF/sharding-readwrite-splitting.yaml
index 4617937..69c15f0 100644
--- a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/sharding-readwrite-splitting.yaml
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/resources/META-INF/sharding-readwrite-splitting.yaml
@@ -22,43 +22,48 @@ dataSources:
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
+
write_ds_0_read_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_0_read_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
+
write_ds_0_read_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_0_read_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
+
write_ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
+
write_ds_1_read_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_1_read_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
+
write_ds_1_read_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.jdbc.Driver
jdbcUrl: jdbc:mysql://localhost:3306/demo_write_ds_1_read_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
username: root
password:
-
+
rules:
- !SHARDING
tables:
- t_order:
+ t_order:
actualDataNodes: ds_${0..1}.t_order_${0..1}
- tableStrategy:
+ tableStrategy:
standard:
shardingColumn: order_id
shardingAlgorithmName: t_order_inline
@@ -82,7 +87,7 @@ rules:
standard:
shardingColumn: user_id
shardingAlgorithmName: database_inline
-
+
shardingAlgorithms:
database_inline:
type: INLINE
@@ -96,7 +101,7 @@ rules:
type: INLINE
props:
algorithm-expression: t_order_item_${order_id % 2}
-
+
keyGenerators:
snowflake:
type: SNOWFLAKE
diff --git a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/pom.xml b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/resources/logback.xml
similarity index 58%
copy from examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/pom.xml
copy to examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/resources/logback.xml
index 2bd404a..ba35801 100644
--- a/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/pom.xml
+++ b/examples/shardingsphere-jdbc-example/mixed-feature-example/sharding-readwrite-splitting-example/sharding-readwrite-splitting-raw-jdbc-example/src/main/resources/logback.xml
@@ -16,16 +16,19 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.shardingsphere.example</groupId>
- <artifactId>sharding-readwrite-splitting-example</artifactId>
- <version>5.0.0-RC1-SNAPSHOT</version>
- </parent>
- <artifactId>sharding-readwrite-splitting-raw-jdbc-example</artifactId>
- <packaging>pom</packaging>
- <name>${project.artifactId}</name>
-</project>
+<configuration>
+ <property name="log.context.name" value="sharding-readwrite-splitting-raw-jdbc-example" />
+ <property name="log.charset" value="UTF-8" />
+ <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger] %msg %n" />
+ <contextName>${log.context.name}</contextName>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder charset="${log.charset}">
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
+ <root>
+ <level value="INFO" />
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaConfigurationExample.java b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaConfigurationExample.java
index 67082b3..a897aeb 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaConfigurationExample.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaConfigurationExample.java
@@ -35,7 +35,6 @@ public final class ShardingRawJavaConfigurationExample {
// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
// private static ShardingType shardingType = ShardingType.READWRITE_SPLITTING;
-// private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
public static void main(final String[] args) throws SQLException {
DataSource dataSource = DataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaRangeConfigurationExample.java b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaRangeConfigurationExample.java
index 7ee3c27..c290bf6 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaRangeConfigurationExample.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawJavaRangeConfigurationExample.java
@@ -38,7 +38,6 @@ public final class ShardingRawJavaRangeConfigurationExample {
// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
// private static ShardingType shardingType = ShardingType.READWRITE_SPLITTING;
-// private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
public static void main(final String[] args) throws SQLException {
DataSource dataSource = RangeDataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlConfigurationExample.java b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlConfigurationExample.java
index 54f43f8..09ff68f 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlConfigurationExample.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlConfigurationExample.java
@@ -36,7 +36,6 @@ public final class ShardingRawYamlConfigurationExample {
// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
// private static ShardingType shardingType = ShardingType.READWRITE_SPLITTING;
-// private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
private static ShardingType shardingType = ShardingType.SHARDING_AUTO_TABLES;
public static void main(final String[] args) throws SQLException, IOException {
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlRangeConfigurationExample.java b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlRangeConfigurationExample.java
index 02faec6..8a20c56 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlRangeConfigurationExample.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/ShardingRawYamlRangeConfigurationExample.java
@@ -36,7 +36,6 @@ public final class ShardingRawYamlRangeConfigurationExample {
// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
// private static ShardingType shardingType = ShardingType.READWRITE_SPLITTING;
-// private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
public static void main(final String[] args) throws SQLException, IOException {
DataSource dataSource = YamlRangeDataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java
index b9bfca9..b4cd7e3 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/DataSourceFactory.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.example.sharding.raw.jdbc.factory;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ReadwriteSplittingConfiguration;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesAndTablesConfigurationPrecise;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesConfigurationPrecise;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingReadwriteSplittingConfigurationPrecise;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingTablesConfigurationPrecise;
import org.apache.shardingsphere.example.type.ShardingType;
@@ -39,8 +38,6 @@ public final class DataSourceFactory {
return new ShardingDatabasesAndTablesConfigurationPrecise().getDataSource();
case READWRITE_SPLITTING:
return new ReadwriteSplittingConfiguration().getDataSource();
- case SHARDING_READWRITE_SPLITTING:
- return new ShardingReadwriteSplittingConfigurationPrecise().getDataSource();
default:
throw new UnsupportedOperationException(shardingType.name());
}
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java
index 0544c89..acbe3d6 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/RangeDataSourceFactory.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.example.sharding.raw.jdbc.factory;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ReadwriteSplittingConfiguration;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesAndTablesConfigurationRange;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingDatabasesConfigurationRange;
-import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingReadwriteSplittingConfigurationRange;
import org.apache.shardingsphere.example.sharding.raw.jdbc.config.ShardingTablesConfigurationRange;
import org.apache.shardingsphere.example.type.ShardingType;
@@ -39,8 +38,6 @@ public final class RangeDataSourceFactory {
return new ShardingDatabasesAndTablesConfigurationRange().getDataSource();
case READWRITE_SPLITTING:
return new ReadwriteSplittingConfiguration().getDataSource();
- case SHARDING_READWRITE_SPLITTING:
- return new ShardingReadwriteSplittingConfigurationRange().getDataSource();
default:
throw new UnsupportedOperationException(shardingType.name());
}
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlDataSourceFactory.java b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlDataSourceFactory.java
index 7577606..3ebf70b 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlDataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlDataSourceFactory.java
@@ -37,8 +37,6 @@ public final class YamlDataSourceFactory {
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-databases-tables.yaml"));
case READWRITE_SPLITTING:
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/readwrite-splitting.yaml"));
- case SHARDING_READWRITE_SPLITTING:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-readwrite-splitting.yaml"));
default:
throw new UnsupportedOperationException(shardingType.name());
}
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java
index 81ac3cc..258ca06 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java
@@ -37,8 +37,6 @@ public final class YamlRangeDataSourceFactory {
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-databases-tables-range.yaml"));
case READWRITE_SPLITTING:
return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/readwrite-splitting.yaml"));
- case SHARDING_READWRITE_SPLITTING:
- return YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-readwrite-splitting.yaml"));
default:
throw new UnsupportedOperationException(shardingType.name());
}