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 2022/12/16 06:58:55 UTC
[shardingsphere] branch master updated: Modify datasource rule order for mask feature (#22906)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 0298cae83f7 Modify datasource rule order for mask feature (#22906)
0298cae83f7 is described below
commit 0298cae83f743b34dba4606d321b2619c6411220
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Fri Dec 16 14:58:48 2022 +0800
Modify datasource rule order for mask feature (#22906)
---
.../shardingsphere/dbdiscovery/constant/DatabaseDiscoveryOrder.java | 2 +-
.../readwritesplitting/constant/ReadwriteSplittingOrder.java | 2 +-
.../java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java | 2 +-
.../test/e2e/data/pipeline/cases/task/MySQLIncrementTask.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/constant/DatabaseDiscoveryOrder.java b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/constant/DatabaseDiscoveryOrder.java
index f9ec2c6fa79..37bbc7a6809 100644
--- a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/constant/DatabaseDiscoveryOrder.java
+++ b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/constant/DatabaseDiscoveryOrder.java
@@ -29,5 +29,5 @@ public final class DatabaseDiscoveryOrder {
/**
* Database discovery order.
*/
- public static final int ORDER = 40;
+ public static final int ORDER = 50;
}
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/constant/ReadwriteSplittingOrder.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/constant/ReadwriteSplittingOrder.java
index 112b720cf66..15e1e3e4d5e 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/constant/ReadwriteSplittingOrder.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/constant/ReadwriteSplittingOrder.java
@@ -29,5 +29,5 @@ public final class ReadwriteSplittingOrder {
/**
* Readwrite-splitting order.
*/
- public static final int ORDER = 30;
+ public static final int ORDER = 40;
}
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java
index 3541d474e72..8fd9d61b374 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java
@@ -29,5 +29,5 @@ public final class ShadowOrder {
/**
* Shadow order.
*/
- public static final int ORDER = 50;
+ public static final int ORDER = 60;
}
diff --git a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/MySQLIncrementTask.java b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/MySQLIncrementTask.java
index b0297b6dab1..e6f487762a9 100644
--- a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/MySQLIncrementTask.java
+++ b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/MySQLIncrementTask.java
@@ -81,8 +81,8 @@ public final class MySQLIncrementTask extends BaseIncrementTask {
// TODO 0000-00-00 00:00:00 now will cause consistency check failed.
// jdbcTemplate.update(String.format("UPDATE %s SET t_char = null,t_unsigned_int = 299,t_datetime='0000-00-00 00:00:00' WHERE order_id = ?", orderTableName), primaryKey);
/*
- DataSourceUtil.execute(dataSource, String.format("UPDATE %s SET t_char = null,t_unsigned_int = 299,t_datetime='0000-00-00 00:00:00' WHERE order_id = ?", orderTableName),
- new Object[]{primaryKey});
+ * DataSourceUtil.execute(dataSource, String.format("UPDATE %s SET t_char = null,t_unsigned_int = 299,t_datetime='0000-00-00 00:00:00' WHERE order_id = ?", orderTableName), new
+ * Object[]{primaryKey});
*/
}