You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/06/13 09:00:07 UTC
[shardingsphere] branch master updated: Fixes #26315, adjust rule order for sharding, single and shadow. (#26318)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 ff3c948146a Fixes #26315, adjust rule order for sharding, single and shadow. (#26318)
ff3c948146a is described below
commit ff3c948146ad26adc11c0b2d88fd629009aa01ea
Author: Raigor <ra...@gmail.com>
AuthorDate: Tue Jun 13 16:59:54 2023 +0800
Fixes #26315, adjust rule order for sharding, single and shadow. (#26318)
---
.../java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java | 2 +-
.../java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java | 2 +-
.../infra/rule/builder/fixture/FixtureDatabaseRuleBuilder.java | 2 +-
.../java/org/apache/shardingsphere/single/constant/SingleOrder.java | 2 +-
.../shardingsphere/mode/fixture/FixtureDistributedRuleBuilder.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
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 8fd9d61b374..3541d474e72 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 = 60;
+ public static final int ORDER = 50;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java
index 1f101d40fef..f7a443647f2 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java
@@ -29,5 +29,5 @@ public final class ShardingOrder {
/**
* Sharding order.
*/
- public static final int ORDER = -10;
+ public static final int ORDER = 0;
}
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureDatabaseRuleBuilder.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureDatabaseRuleBuilder.java
index b6ae1d9895c..00d9627d660 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureDatabaseRuleBuilder.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureDatabaseRuleBuilder.java
@@ -35,7 +35,7 @@ public final class FixtureDatabaseRuleBuilder implements DatabaseRuleBuilder<Fix
@Override
public int getOrder() {
- return 0;
+ return 1;
}
@Override
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/constant/SingleOrder.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/constant/SingleOrder.java
index 461eeb7526c..2ec63fdf11b 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/constant/SingleOrder.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/constant/SingleOrder.java
@@ -29,5 +29,5 @@ public final class SingleOrder {
/**
* Single order.
*/
- public static final int ORDER = 0;
+ public static final int ORDER = 30;
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDistributedRuleBuilder.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDistributedRuleBuilder.java
index 3972dae6ebf..58eb10f9e5f 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDistributedRuleBuilder.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDistributedRuleBuilder.java
@@ -38,7 +38,7 @@ public final class FixtureDistributedRuleBuilder implements DatabaseRuleBuilder<
@Override
public int getOrder() {
- return 0;
+ return 2;
}
@Override