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 55d5898 Migrate the readwrite-splitting example. (#13236)
55d5898 is described below
commit 55d5898784ce8f65f5b883dce6c00c4048ee7f7e
Author: yx9o <[email protected]>
AuthorDate: Sat Oct 23 23:22:09 2021 +0800
Migrate the readwrite-splitting example. (#13236)
* Migrate the readwrite-splitting example.
* delete range
---
.../META-INF/readwrite-splitting-hint.yaml | 46 ----------------------
.../raw/jdbc/ReadwriteSplittingHintRawExample.java | 6 +--
...writeSplittingRawJavaConfigurationExample.java} | 13 +++---
...writeSplittingRawYamlConfigurationExample.java} | 12 ++----
.../config/ReadwriteSplittingConfiguration.java | 8 ++--
.../raw/jdbc/factory/DataSourceFactory.java | 13 +-----
.../raw/jdbc/factory/YamlDataSourceFactory.java | 12 +-----
...plitting-hint.yaml => readwrite-splitting.yaml} | 0
.../src/main/resources/logback.xml | 36 +++++++++++++++++
.../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 -
17 files changed, 56 insertions(+), 104 deletions(-)
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/META-INF/readwrite-splitting-hint.yaml
b/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/META-INF/readwrite-splitting-hint.yaml
deleted file mode 100644
index 9604e64..0000000
---
a/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/META-INF/readwrite-splitting-hint.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-dataSources:
- write_ds:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: com.mysql.jdbc.Driver
- jdbcUrl:
jdbc:mysql://localhost:3306/demo_write_ds?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
- username: root
- password:
- read_ds_0:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: com.mysql.jdbc.Driver
- jdbcUrl:
jdbc:mysql://localhost:3306/demo_read_ds_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
- username: root
- password:
- read_ds_1:
- dataSourceClassName: com.zaxxer.hikari.HikariDataSource
- driverClassName: com.mysql.jdbc.Driver
- jdbcUrl:
jdbc:mysql://localhost:3306/demo_read_ds_1?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
- username: root
- password:
-
-rules:
-- !READWRITE_SPLITTING
- dataSources:
- pr_ds:
- writeDataSourceName: write_ds
- readDataSourceNames: [read_ds_0, read_ds_1]
-
-props:
- sql-show: true
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ReadwriteSplittingHintRawExample.java
b/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/ReadwriteSplittingHintRawExample.java
similarity index 96%
rename from
examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ReadwriteSplittingHintRawExample.java
rename to
examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/ReadwriteSplittingHintRawExample.java
index 0744272..e58dac9 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ReadwriteSplittingHintRawExample.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/ReadwriteSplittingHintRawExample.java
@@ -1,4 +1,4 @@
-package org.apache.shardingsphere.example.hint.raw.jdbc;/*
+package org.apache.shardingsphere.example.readwrite.splitting.raw.jdbc;/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -29,7 +29,7 @@ import java.sql.SQLException;
import java.sql.Statement;
public final class ReadwriteSplittingHintRawExample {
-
+
private static final ShardingType TYPE =
ShardingType.READWRITE_SPLITTING_HINT;
public static void main(final String[] args) throws SQLException,
IOException {
@@ -43,7 +43,7 @@ public final class ReadwriteSplittingHintRawExample {
private static DataSource getDataSource() throws IOException, SQLException
{
switch (TYPE) {
case READWRITE_SPLITTING_HINT:
- return
YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/readwrite-splitting-hint.yaml"));
+ return
YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/readwrite-splitting.yaml"));
default:
throw new UnsupportedOperationException("unsupported type");
}
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/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/ReadwriteSplittingRawJavaConfigurationExample.java
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/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/ReadwriteSplittingRawJavaConfigurationExample.java
index a897aeb..12cb4bd 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/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/ReadwriteSplittingRawJavaConfigurationExample.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc;
+package org.apache.shardingsphere.example.readwrite.splitting.raw.jdbc;
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.readwrite.splitting.raw.jdbc.factory.DataSourceFactory;
import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
@@ -29,12 +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;
+public final class ReadwriteSplittingRawJavaConfigurationExample {
+
+ private static ShardingType shardingType =
ShardingType.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/ShardingRawYamlConfigurationExample.java
b/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/ReadwriteSplittingRawYamlConfigurationExample.java
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/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/ReadwriteSplittingRawYamlConfigurationExample.java
index 09ff68f..837a85d 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/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/ReadwriteSplittingRawYamlConfigurationExample.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc;
+package org.apache.shardingsphere.example.readwrite.splitting.raw.jdbc;
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.readwrite.splitting.raw.jdbc.factory.YamlDataSourceFactory;
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 ShardingRawYamlConfigurationExample {
+public final class ReadwriteSplittingRawYamlConfigurationExample {
-// 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_AUTO_TABLES;
+ private static ShardingType shardingType =
ShardingType.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/config/ReadwriteSplittingConfiguration.java
b/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/config/ReadwriteSplittingConfiguration.java
similarity index 97%
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/ReadwriteSplittingConfiguration.java
rename to
examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/config/ReadwriteSplittingConfiguration.java
index 6d9ead7..97f82d1 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/ReadwriteSplittingConfiguration.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/config/ReadwriteSplittingConfiguration.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc.config;
+package org.apache.shardingsphere.example.readwrite.splitting.raw.jdbc.config;
-import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
+import org.apache.shardingsphere.driver.api.ShardingSphereDataSourceFactory;
import org.apache.shardingsphere.example.config.ExampleConfiguration;
import org.apache.shardingsphere.example.core.api.DataSourceUtil;
-import org.apache.shardingsphere.driver.api.ShardingSphereDataSourceFactory;
+import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
+import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import javax.sql.DataSource;
import java.sql.SQLException;
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/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/factory/DataSourceFactory.java
similarity index 60%
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/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/factory/DataSourceFactory.java
index b4cd7e3..69121a6 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/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/factory/DataSourceFactory.java
@@ -15,12 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.sharding.raw.jdbc.factory;
+package org.apache.shardingsphere.example.readwrite.splitting.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.ShardingTablesConfigurationPrecise;
+import
org.apache.shardingsphere.example.readwrite.splitting.raw.jdbc.config.ReadwriteSplittingConfiguration;
import org.apache.shardingsphere.example.type.ShardingType;
import javax.sql.DataSource;
@@ -30,12 +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();
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/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/factory/YamlDataSourceFactory.java
similarity index 69%
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/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/factory/YamlDataSourceFactory.java
index a55a74c..55e577b 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/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/readwrite/splitting/raw/jdbc/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.readwrite.splitting.raw.jdbc.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 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_AUTO_TABLES:
- return
YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-auto-tables.yaml"));
default:
throw new UnsupportedOperationException(shardingType.name());
}
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/resources/META-INF/readwrite-splitting-hint.yaml
b/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/resources/META-INF/readwrite-splitting.yaml
similarity index 100%
rename from
examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/resources/META-INF/readwrite-splitting-hint.yaml
rename to
examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/resources/META-INF/readwrite-splitting.yaml
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/resources/logback.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/resources/logback.xml
new file mode 100644
index 0000000..77b8ccb
--- /dev/null
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/readwrite-splitting-example/readwrite-splitting-raw-jdbc-example/src/main/resources/logback.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <property name="log.context.name"
value="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>
+ <logger name="org.springframework" level="WARN" />
+ <logger name="com.zaxxer.hikari" level="WARN" />
+ <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 a897aeb..70d866b 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
@@ -34,7 +34,6 @@ 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;
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 c290bf6..d45ea64 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
@@ -37,7 +37,6 @@ 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;
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 09ff68f..6ef2867 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
@@ -35,7 +35,6 @@ public final class ShardingRawYamlConfigurationExample {
// 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_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 8a20c56..ac8ec6b 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
@@ -35,7 +35,6 @@ public final class ShardingRawYamlRangeConfigurationExample {
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;
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 b4cd7e3..a81591b 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
@@ -17,7 +17,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.ShardingTablesConfigurationPrecise;
@@ -36,8 +35,6 @@ public final class DataSourceFactory {
return new
ShardingTablesConfigurationPrecise().getDataSource();
case SHARDING_DATABASES_AND_TABLES:
return new
ShardingDatabasesAndTablesConfigurationPrecise().getDataSource();
- case READWRITE_SPLITTING:
- return new ReadwriteSplittingConfiguration().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 acbe3d6..c13fb2f 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
@@ -17,7 +17,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.ShardingTablesConfigurationRange;
@@ -36,8 +35,6 @@ public final class RangeDataSourceFactory {
return new ShardingTablesConfigurationRange().getDataSource();
case SHARDING_DATABASES_AND_TABLES:
return new
ShardingDatabasesAndTablesConfigurationRange().getDataSource();
- case READWRITE_SPLITTING:
- return new ReadwriteSplittingConfiguration().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 a55a74c..6f6b9f9 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
@@ -35,8 +35,6 @@ public final class YamlDataSourceFactory {
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_AUTO_TABLES:
return
YamlShardingSphereDataSourceFactory.createDataSource(getFile("/META-INF/sharding-auto-tables.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/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/factory/YamlRangeDataSourceFactory.java
index 258ca06..8f86aae 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
@@ -35,8 +35,6 @@ public final class YamlRangeDataSourceFactory {
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"));
default:
throw new UnsupportedOperationException(shardingType.name());
}
