You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2021/05/28 12:56:20 UTC
[shardingsphere] branch master updated: fix example error (#10532)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 c228b73 fix example error (#10532)
c228b73 is described below
commit c228b73acc718176af9b165d3c754890059e7788
Author: totalo <48...@qq.com>
AuthorDate: Fri May 28 20:55:51 2021 +0800
fix example error (#10532)
* fix example error
---
.../example/core/jpa/repository/OrderItemRepositoryImpl.java | 2 +-
.../src/main/resources/META-INF/mappers/OrderItemMapper.xml | 2 +-
.../example/sharding/raw/jdbc/JavaConfigurationExampleMain.java | 6 +++---
.../sharding/raw/jdbc/JavaRangeConfigurationExampleMain.java | 6 +++---
.../example/sharding/raw/jdbc/YamlConfigurationExampleMain.java | 6 +++---
.../sharding/raw/jdbc/YamlRangeConfigurationExampleMain.java | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/repository/OrderItemRepositoryImpl.java b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/repository/OrderItemRepositoryImpl.java
index 861f7aa..e091d7e 100644
--- a/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/repository/OrderItemRepositoryImpl.java
+++ b/examples/example-core/example-spring-jpa/src/main/java/org/apache/shardingsphere/example/core/jpa/repository/OrderItemRepositoryImpl.java
@@ -65,6 +65,6 @@ public class OrderItemRepositoryImpl implements OrderItemRepository {
@Override
@SuppressWarnings("unchecked")
public List<OrderItem> selectAll() {
- return (List<OrderItem>) entityManager.createQuery("SELECT i FROM OrderEntity o, OrderItemEntity i WHERE o.orderId = i.orderId").getResultList();
+ return (List<OrderItem>) entityManager.createQuery("SELECT o from OrderItemEntity o").getResultList();
}
}
diff --git a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderItemMapper.xml b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderItemMapper.xml
index 2fdfe34..48aae45 100644
--- a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderItemMapper.xml
+++ b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderItemMapper.xml
@@ -46,7 +46,7 @@
</delete>
<select id="selectAll" resultMap="baseResultMap">
- SELECT i.* FROM t_order o, t_order_item i WHERE o.order_id = i.order_id;
+ SELECT * from t_order_item
</select>
<select id="selectRange" resultMap="baseResultMap">
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaConfigurationExampleMain.java
index e82fd2f..eb52903 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaConfigurationExampleMain.java
@@ -30,12 +30,12 @@ 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 JavaConfigurationExampleMain {
-
+
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.REPLICA_QUERY;
-// private static ShardingType shardingType = ShardingType.SHARDING_REPLICA_QUERY;
+// 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/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaRangeConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaRangeConfigurationExampleMain.java
index 448f72e..4681367 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaRangeConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/JavaRangeConfigurationExampleMain.java
@@ -33,12 +33,12 @@ 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 JavaRangeConfigurationExampleMain {
-
+
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.REPLICA_QUERY;
-// private static ShardingType shardingType = ShardingType.SHARDING_REPLICA_QUERY;
+// 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/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlConfigurationExampleMain.java
index ac26931..a015a3d 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlConfigurationExampleMain.java
@@ -32,11 +32,11 @@ import java.sql.SQLException;
*/
public final class YamlConfigurationExampleMain {
- private static ShardingType shardingType = ShardingType.SHARDING_DATABASES;
+ private static ShardingType shardingType = ShardingType.SHARDING_READWRITE_SPLITTING;
// private static ShardingType shardingType = ShardingType.SHARDING_TABLES;
// private static ShardingType shardingType = ShardingType.SHARDING_DATABASES_AND_TABLES;
-// private static ShardingType shardingType = ShardingType.REPLICA_QUERY;
-// private static ShardingType shardingType = ShardingType.SHARDING_REPLICA_QUERY;
+// 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 = YamlDataSourceFactory.newInstance(shardingType);
diff --git a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlRangeConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlRangeConfigurationExampleMain.java
index c791c90..51fff00 100644
--- a/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlRangeConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/YamlRangeConfigurationExampleMain.java
@@ -35,8 +35,8 @@ public final class YamlRangeConfigurationExampleMain {
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.REPLICA_QUERY;
-// private static ShardingType shardingType = ShardingType.SHARDING_REPLICA_QUERY;
+// 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);