This is an automated email from the ASF dual-hosted git repository.
panjuan 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 eb28b12 Optimizate shadow algorithm type (#13432)
eb28b12 is described below
commit eb28b124bae6104490a36be18affc4a3c1bee729
Author: gin <[email protected]>
AuthorDate: Thu Nov 4 11:51:25 2021 +0800
Optimizate shadow algorithm type (#13432)
---
.../document/content/features/shadow/concept.cn.md | 2 +-
.../document/content/features/shadow/concept.en.md | 2 +-
.../document/content/reference/shadow/_index.cn.md | 44 +++++++++++-----------
.../document/content/reference/shadow/_index.en.md | 42 ++++++++++-----------
.../configuration/built-in-algorithm/shadow.cn.md | 6 +--
.../configuration/built-in-algorithm/shadow.en.md | 6 +--
.../raw/jdbc/config/BaseShadowConfiguration.java | 10 ++---
.../META-INF/shadow-default-algorithm.yaml | 12 +++---
.../main/resources/META-INF/shadow-encrypt.yaml | 12 +++---
.../src/main/resources/META-INF/shadow.yaml | 12 +++---
...application-shadow-default-algorithm.properties | 14 +++----
.../application-shadow-encrypt.properties | 14 +++----
...plication-shadow-readwrite-splitting.properties | 14 +++----
...pplication-shadow-sharding-databases.properties | 14 +++----
.../main/resources/application-shadow.properties | 14 +++----
.../application-shadow-default-algorithm.xml | 10 ++---
.../META-INF/application-shadow-encrypt.xml | 10 ++---
.../application-shadow-readwrite-splitting.xml | 10 ++---
.../application-shadow-sharding-databases.xml | 10 ++---
.../main/resources/META-INF/application-shadow.xml | 10 ++---
.../column/ColumnRegexMatchShadowAlgorithm.java | 2 +-
.../column/ColumnValueMatchShadowAlgorithm.java | 2 +-
.../shadow/note/SimpleSQLNoteShadowAlgorithm.java | 2 +-
.../src/test/resources/yaml/shadow-rule.yaml | 8 ++--
.../PropertiesShadowSpringBootStarterTest.java | 4 +-
.../YmlShadowDefaultSpringBootStarterTest.java | 2 +-
.../boot/YmlShadowSpringBootStarterTest.java | 6 +--
.../test/resources/application-shadow-default.yml | 2 +-
.../application-shadow-properties.properties | 4 +-
.../src/test/resources/application-shadow-yml.yml | 6 +--
.../main/resources/META-INF/namespace/shadow.xsd | 6 +--
.../ShadowAlgorithmSpringNamespaceTest.java | 6 +--
.../ShadowDefaultAlgorithmSpringNamespaceTest.java | 2 +-
.../shadow-algorithm-application-context.xml | 6 +--
...hadow-default-algorithm-application-context.xml | 2 +-
.../src/test/resources/config/config-shadow.yaml | 8 ++--
.../spring/boot/SpringBootStarterTest.java | 2 +-
.../test/resources/application-common.properties | 10 ++---
.../src/main/resources/conf/config-shadow.yaml | 20 +++++-----
39 files changed, 184 insertions(+), 184 deletions(-)
diff --git a/docs/document/content/features/shadow/concept.cn.md
b/docs/document/content/features/shadow/concept.cn.md
index 1b05f17..1579d72 100644
--- a/docs/document/content/features/shadow/concept.cn.md
+++ b/docs/document/content/features/shadow/concept.cn.md
@@ -24,7 +24,7 @@ weight = 1
通过识别 SQL 中的数据，匹配路由至影子库的场景。
适用于由压测数据名单驱动的压测场景。
-- 基于标记的影子算法
+- 基于 Hint 的影子算法
通过识别 SQL 中的注释，匹配路由至影子库的场景。
适用于由上游系统透传标识驱动的压测场景。
diff --git a/docs/document/content/features/shadow/concept.en.md
b/docs/document/content/features/shadow/concept.en.md
index 20f6b10..4ce0655 100644
--- a/docs/document/content/features/shadow/concept.en.md
+++ b/docs/document/content/features/shadow/concept.en.md
@@ -24,7 +24,7 @@ The shadow algorithms are closely related to business, there
are 2 types of shad
Recognize data from SQL and route to shadow databases.
Suitable for test data driven scenario.
-- Note based shadow algorithm
+- Hint based shadow algorithm
Recognize comment from SQL and route to shadow databases.
Suitable for identify passed by upstream system scenario.
diff --git a/docs/document/content/reference/shadow/_index.cn.md
b/docs/document/content/reference/shadow/_index.cn.md
index ae2c4c0..cf70347 100644
--- a/docs/document/content/reference/shadow/_index.cn.md
+++ b/docs/document/content/reference/shadow/_index.cn.md
@@ -71,16 +71,16 @@ tables:
t_order:
data-source-names: shadow-data-source
shadow-algorithm-names:
- - simple-note-algorithm
- - user-id-match-algorithm
+ - simple-hint-algorithm
+ - user-id-value-match-algorithm
shadow-algorithms:
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
- user-id-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ user-id-value-match-algorithm:
+ type: VALUE_MATCH
props:
operation: insert
column: user_id
@@ -121,8 +121,8 @@ INSERT INTO t_order (order_id, user_id, ...) VALUES
(xxx..., 0, ...)
```yaml
shadow-algorithms:
- user-id-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ user-id-value-match-algorithm:
+ type: VALUE_MATCH
props:
operation: insert
column: user_id
@@ -131,7 +131,7 @@ shadow-algorithms:
**注意**：影子表使用列影子算法时，相同类型操作（INSERT, UPDATE, DELETE, SELECT）目前仅支持单个字段。
-2. 使用注解影子算法
+2. 使用HINT影子算法
假设 `t_order` 表中不包含可以对值进行匹配的列。添加注解 `/*shadow:true,foo:bar,...*/` 到执行 SQL 中，即：
@@ -145,8 +145,8 @@ SELECT * FROM t_order WHERE order_id = xxx
/*shadow:true,foo:bar,...*/
```yaml
shadow-algorithms:
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
@@ -168,14 +168,14 @@ SELECT * FROM t_order WHERE order_id = xxx
/*shadow:true,foo:bar,...*/;
```yaml
shadow-algorithms:
- user-id-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ user-id-value-match-algorithm:
+ type: VALUE_MATCH
props:
operation: insert
column: user_id
value: 0
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
@@ -209,17 +209,17 @@ tables:
t_order:
data-source-names: shadow-data-source
shadow-algorithm-names:
- - simple-note-algorithm
- - user-id-match-algorithm
+ - simple-hint-algorithm
+ - user-id-value-match-algorithm
default-shadow-algorithm-name: simple-note-algorithm
shadow-algorithms:
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
- user-id-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ user-id-value-match-algorithm:
+ type: VALUE_MATCH
props:
operation: insert
column: user_id
@@ -229,4 +229,4 @@ props:
sql-comment-parse-enabled: true
```
-**注意**：默认影子算法仅支持注解影子算法。
+**注意**：默认影子算法仅支持HINT影子算法。
diff --git a/docs/document/content/reference/shadow/_index.en.md
b/docs/document/content/reference/shadow/_index.en.md
index 3323689..9219761 100644
--- a/docs/document/content/reference/shadow/_index.en.md
+++ b/docs/document/content/reference/shadow/_index.en.md
@@ -90,16 +90,16 @@ tables:
t_order:
data-source-names: shadow-data-source
shadow-algorithm-names:
- - simple-note-algorithm
- - user-id-match-algorithm
+ - simple-hint-algorithm
+ - user-id-value-match-algorithm
shadow-algorithms:
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
- user-id-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ user-id-value-match-algorithm:
+ type: VALUE_MATCH
props:
operation: insert
column: user_id
@@ -141,8 +141,8 @@ Column Shadow algorithm configuration (YAML):
```yaml
shadow-algorithms:
- user-id-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ user-id-value-match-algorithm:
+ type: VALUE_MATCH
props:
operation: insert
column: user_id
@@ -151,7 +151,7 @@ shadow-algorithms:
**Note**: When the shadow table uses the column shadow algorithm, the same
type of shadow operation (INSERT, UPDATE, DELETE, SELECT) currently only
supports a single column.
-2. Note shadow algorithm example
+2. Hint shadow algorithm example
Assume that the `t_order` table does not contain columns that can matching.
Executed SQL statement need to add SQL note `/*shadow:true,foo:bar,.. .*/`
@@ -164,8 +164,8 @@ Note Shadow algorithm configuration (YAML):
```yaml
shadow-algorithms:
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
@@ -187,14 +187,14 @@ Both will be executed to shadow DB, other data executed
to production DB.
```yaml
shadow-algorithms:
- user-id-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ user-id-value-match-algorithm:
+ type: VALUE_MATCH
props:
operation: insert
column: user_id
value: 0
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
@@ -228,17 +228,17 @@ tables:
t_order:
data-source-names: shadow-data-source
shadow-algorithm-names:
- - simple-note-algorithm
- - user-id-match-algorithm
+ - simple-hint-algorithm
+ - user-id-value-match-algorithm
default-shadow-algorithm-name: simple-note-algorithm
shadow-algorithms:
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
- user-id-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ user-id-value-match-algorithm:
+ type: VALUE_MATCH
props:
operation: insert
column: user_id
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/built-in-algorithm/shadow.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/built-in-algorithm/shadow.cn.md
index 250b118..a0310a2 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/built-in-algorithm/shadow.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/built-in-algorithm/shadow.cn.md
@@ -7,7 +7,7 @@ weight = 5
### 列值匹配影子算法
-类型：COLUMN_VALUE_MATCH
+类型：VALUE_MATCH
可配置属性：
@@ -19,7 +19,7 @@ weight = 5
### 列正则表达式匹配影子算法
-类型：COLUMN_REGEX_MATCH
+类型：REGEX_MATCH
可配置属性：
@@ -33,7 +33,7 @@ weight = 5
### 简单SQL注解匹配影子算法
-类型：SIMPLE_NOTE
+类型：SIMPLE_HINT
可配置属性：
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/built-in-algorithm/shadow.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/built-in-algorithm/shadow.en.md
index d9364a9..178fdd8 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/built-in-algorithm/shadow.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/built-in-algorithm/shadow.en.md
@@ -7,7 +7,7 @@ weight = 5
### Column Value Match Shadow Algorithm
-Type：COLUMN_VALUE_MATCH
+Type：VALUE_MATCH
Attributes:
@@ -19,7 +19,7 @@ Attributes:
### Column Regex Match Shadow Algorithm
-Type: COLUMN_REGEX_MATCH
+Type: REGEX_MATCH
Attributes:
@@ -33,7 +33,7 @@ Attributes:
### Simple SQL Note Shadow Algorithm
-Type: SIMPLE_NOTE
+Type: SIMPLE_HINT
Attributes:
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/raw/jdbc/config/BaseShadowConfiguration.java
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/raw/jdbc/config/BaseShadowConfiguration.java
index d226d39..9fdc5cc 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/raw/jdbc/config/BaseShadowConfiguration.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/raw/jdbc/config/BaseShadowConfiguration.java
@@ -50,7 +50,7 @@ public abstract class BaseShadowConfiguration implements
ExampleConfiguration {
result.add("user-id-insert-match-algorithm");
result.add("user-id-delete-match-algorithm");
result.add("user-id-select-match-algorithm");
- result.add("simple-note-algorithm");
+ result.add("simple-hint-algorithm");
return result;
}
@@ -60,21 +60,21 @@ public abstract class BaseShadowConfiguration implements
ExampleConfiguration {
userIdInsertProps.setProperty("operation", "insert");
userIdInsertProps.setProperty("column", "user_type");
userIdInsertProps.setProperty("value", "1");
- result.put("user-id-insert-match-algorithm", new
ShardingSphereAlgorithmConfiguration("COLUMN_VALUE_MATCH", userIdInsertProps));
+ result.put("user-id-insert-match-algorithm", new
ShardingSphereAlgorithmConfiguration("VALUE_MATCH", userIdInsertProps));
Properties userIdDeleteProps = new Properties();
userIdDeleteProps.setProperty("operation", "delete");
userIdDeleteProps.setProperty("column", "user_type");
userIdDeleteProps.setProperty("value", "1");
- result.put("user-id-delete-match-algorithm", new
ShardingSphereAlgorithmConfiguration("COLUMN_VALUE_MATCH", userIdDeleteProps));
+ result.put("user-id-delete-match-algorithm", new
ShardingSphereAlgorithmConfiguration("VALUE_MATCH", userIdDeleteProps));
Properties userIdSelectProps = new Properties();
userIdSelectProps.setProperty("operation", "select");
userIdSelectProps.setProperty("column", "user_type");
userIdSelectProps.setProperty("value", "1");
- result.put("user-id-select-match-algorithm", new
ShardingSphereAlgorithmConfiguration("COLUMN_VALUE_MATCH", userIdSelectProps));
+ result.put("user-id-select-match-algorithm", new
ShardingSphereAlgorithmConfiguration("VALUE_MATCH", userIdSelectProps));
Properties noteAlgorithmProps = new Properties();
noteAlgorithmProps.setProperty("shadow", "true");
noteAlgorithmProps.setProperty("foo", "bar");
- result.put("simple-note-algorithm", new
ShardingSphereAlgorithmConfiguration("SIMPLE_NOTE", noteAlgorithmProps));
+ result.put("simple-hint-algorithm", new
ShardingSphereAlgorithmConfiguration("SIMPLE_HINT", noteAlgorithmProps));
return result;
}
}
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-default-algorithm.yaml
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-default-algorithm.yaml
index 1d3c6ce..da46d11 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-default-algorithm.yaml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-default-algorithm.yaml
@@ -45,28 +45,28 @@ rules:
- user-id-select-match-algorithm
- user-id-update-match-algorithm
- user-id-delete-match-algorithm
- defaultShadowAlgorithmName: simple-note-algorithm
+ defaultShadowAlgorithmName: simple-hint-algorithm
shadowAlgorithms:
user-id-insert-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: insert
column: user_id
regex: "[1]"
user-id-select-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: select
column: user_id
regex: "[1]"
user-id-delete-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: delete
column: user_id
regex: "[1]"
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-encrypt.yaml
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-encrypt.yaml
index 02e02d8..a7bff6e 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-encrypt.yaml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow-encrypt.yaml
@@ -65,28 +65,28 @@ rules:
- user-id-select-match-algorithm
- user-id-update-match-algorithm
- user-id-delete-match-algorithm
- - simple-note-algorithm
+ - simple-hint-algorithm
shadowAlgorithms:
user-id-insert-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: insert
column: user_id
regex: "[1]"
user-id-select-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: select
column: user_id
regex: "[1]"
user-id-delete-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: delete
column: user_id
regex: "[1]"
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow.yaml
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow.yaml
index 409c5e2..843d64f 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow.yaml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/resources/META-INF/shadow.yaml
@@ -45,28 +45,28 @@ rules:
- user-id-select-match-algorithm
- user-id-update-match-algorithm
- user-id-delete-match-algorithm
- - simple-note-algorithm
+ - simple-hint-algorithm
shadowAlgorithms:
user-id-insert-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ type: VALUE_MATCH
props:
operation: insert
column: user_id
value: 1
user-id-select-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ type: VALUE_MATCH
props:
operation: select
column: user_id
value: 1
user-id-delete-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ type: VALUE_MATCH
props:
operation: delete
column: user_id
value: 1
- simple-note-algorithm:
- type: SIMPLE_NOTE
+ simple-hint-algorithm:
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-default-algorithm.properties
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-default-algorithm.properties
index c9cac83..cfb0d91 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-default-algorithm.properties
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-default-algorithm.properties
@@ -36,23 +36,23 @@
spring.shardingsphere.rules.shadow.data-sources.shadow-data-source.shadow-data-s
spring.shardingsphere.rules.shadow.tables.t_user.data-source-names=shadow-data-source
spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=user-id-insert-match-algorithm,user-id-delete-match-algorithm,user-id-select-match-algorithm
-spring.shardingsphere.rules.shadow.default-shadow-algorithm-name=simple-note-algorithm
+spring.shardingsphere.rules.shadow.default-shadow-algorithm-name=simple-hint-algorithm
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.operation=insert
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.operation=delete
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.operation=select
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.type=SIMPLE_NOTE
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.shadow=true
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.foo=bar
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.type=SIMPLE_HINT
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.shadow=true
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.foo=bar
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-encrypt.properties
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-encrypt.properties
index 4af3d7d..2c7eec7 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-encrypt.properties
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-encrypt.properties
@@ -46,23 +46,23 @@
spring.shardingsphere.rules.shadow.data-sources.shadow-data-source.source-data-s
spring.shardingsphere.rules.shadow.data-sources.shadow-data-source.shadow-data-source-name=shadow-ds
spring.shardingsphere.rules.shadow.tables.t_user.data-source-names=shadow-data-source
-spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=user-id-insert-match-algorithm,user-id-delete-match-algorithm,user-id-select-match-algorithm,simple-note-algorithm
+spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=user-id-insert-match-algorithm,user-id-delete-match-algorithm,user-id-select-match-algorithm,simple-hint-algorithm
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.operation=insert
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.operation=delete
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.operation=select
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.type=SIMPLE_NOTE
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.shadow=true
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.foo=bar
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.type=SIMPLE_HINT
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.shadow=true
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.foo=bar
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-readwrite-splitting.properties
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-readwrite-splitting.properties
index 1677b69..b6d66e1 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-readwrite-splitting.properties
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-readwrite-splitting.properties
@@ -54,23 +54,23 @@
spring.shardingsphere.rules.shadow.data-sources.shadow-data-source-read.source-d
spring.shardingsphere.rules.shadow.data-sources.shadow-data-source-read.shadow-data-source-name=shadow-read-ds
spring.shardingsphere.rules.shadow.tables.t_user.data-source-names=shadow-data-source-write,shadow-data-source-read
-spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=user-id-insert-match-algorithm,user-id-delete-match-algorithm,user-id-select-match-algorithm,simple-note-algorithm
+spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=user-id-insert-match-algorithm,user-id-delete-match-algorithm,user-id-select-match-algorithm,simple-hint-algorithm
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.operation=insert
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.operation=delete
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.operation=select
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.type=SIMPLE_NOTE
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.shadow=true
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.foo=bar
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.type=SIMPLE_HINT
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.shadow=true
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.foo=bar
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-sharding-databases.properties
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-sharding-databases.properties
index c36dd3d..15e87df 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-sharding-databases.properties
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow-sharding-databases.properties
@@ -56,23 +56,23 @@
spring.shardingsphere.rules.shadow.data-sources.shadow-data-source-1.source-data
spring.shardingsphere.rules.shadow.data-sources.shadow-data-source-1.shadow-data-source-name=shadow-ds-1
spring.shardingsphere.rules.shadow.tables.t_user.data-source-names=shadow-data-source-0,shadow-data-source-1
-spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=user-id-insert-match-algorithm,user-id-delete-match-algorithm,user-id-select-match-algorithm,simple-note-algorithm
+spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=user-id-insert-match-algorithm,user-id-delete-match-algorithm,user-id-select-match-algorithm,simple-hint-algorithm
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.operation=insert
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.operation=delete
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.operation=select
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.type=SIMPLE_NOTE
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.shadow=true
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.foo=bar
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.type=SIMPLE_HINT
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.shadow=true
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.foo=bar
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow.properties
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow.properties
index 2b795f9..7d77d56 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow.properties
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-boot-mybatis-example/src/main/resources/application-shadow.properties
@@ -34,23 +34,23 @@
spring.shardingsphere.rules.shadow.data-sources.shadow-data-source.source-data-s
spring.shardingsphere.rules.shadow.data-sources.shadow-data-source.shadow-data-source-name=shadow-ds
spring.shardingsphere.rules.shadow.tables.t_user.data-source-names=shadow-data-source
-spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=user-id-insert-match-algorithm,user-id-delete-match-algorithm,user-id-select-match-algorithm,simple-note-algorithm
+spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=user-id-insert-match-algorithm,user-id-delete-match-algorithm,user-id-select-match-algorithm,simple-hint-algorithm
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.type=COLUMN_VALUE_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.type=VALUE_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.operation=insert
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-insert-match-algorithm.props.value=1
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.type=COLUMN_VALUE_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.type=VALUE_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.operation=delete
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-delete-match-algorithm.props.value=1
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.type=COLUMN_VALUE_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.type=VALUE_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.operation=select
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.column=user_type
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-select-match-algorithm.props.value=1
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.type=SIMPLE_NOTE
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.shadow=true
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.foo=bar
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.type=SIMPLE_HINT
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.shadow=true
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.foo=bar
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-default-algorithm.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-default-algorithm.xml
index 2f3cea5..cc892f7 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-default-algorithm.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-default-algorithm.xml
@@ -49,7 +49,7 @@
<property name="password" value=""/>
</bean>
- <shadow:shadow-algorithm id="user-id-insert-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-insert-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">insert</prop>
<prop key="column">user_type</prop>
@@ -57,7 +57,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-delete-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-delete-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">delete</prop>
<prop key="column">user_type</prop>
@@ -65,7 +65,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-select-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-select-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">select</prop>
<prop key="column">user_type</prop>
@@ -73,7 +73,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="simple-note-algorithm" type="SIMPLE_NOTE">
+ <shadow:shadow-algorithm id="simple-hint-algorithm" type="SIMPLE_HINT">
<props>
<prop key="shadow">true</prop>
<prop key="foo">bar</prop>
@@ -87,7 +87,7 @@
<shadow:algorithm
shadow-algorithm-ref="user-id-delete-match-algorithm" />
<shadow:algorithm
shadow-algorithm-ref="user-id-select-match-algorithm" />
</shadow:shadow-table>
- <shadow:default-shadow-algorithm-name name="simple-note-algorithm"/>
+ <shadow:default-shadow-algorithm-name name="simple-hint-algorithm"/>
</shadow:rule>
<shardingsphere:data-source id="shadowDataSource"
data-source-names="ds,ds_shadow" rule-refs="shadowRule">
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-encrypt.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-encrypt.xml
index ac8df47..ee35d57 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-encrypt.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-encrypt.xml
@@ -67,7 +67,7 @@
</encrypt:table>
</encrypt:rule>
- <shadow:shadow-algorithm id="user-id-insert-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-insert-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">insert</prop>
<prop key="column">user_type</prop>
@@ -75,7 +75,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-delete-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-delete-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">delete</prop>
<prop key="column">user_type</prop>
@@ -83,7 +83,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-select-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-select-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">select</prop>
<prop key="column">user_type</prop>
@@ -91,7 +91,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="simple-note-algorithm" type="SIMPLE_NOTE">
+ <shadow:shadow-algorithm id="simple-hint-algorithm" type="SIMPLE_HINT">
<props>
<prop key="shadow">true</prop>
<prop key="foo">bar</prop>
@@ -104,7 +104,7 @@
<shadow:algorithm
shadow-algorithm-ref="user-id-insert-match-algorithm" />
<shadow:algorithm
shadow-algorithm-ref="user-id-delete-match-algorithm" />
<shadow:algorithm
shadow-algorithm-ref="user-id-select-match-algorithm" />
- <shadow:algorithm shadow-algorithm-ref="simple-note-algorithm" />
+ <shadow:algorithm shadow-algorithm-ref="simple-hint-algorithm" />
</shadow:shadow-table>
</shadow:rule>
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-readwrite-splitting.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-readwrite-splitting.xml
index ccf62d7..0ec5900 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-readwrite-splitting.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-readwrite-splitting.xml
@@ -72,7 +72,7 @@
<readwrite-splitting:data-source-rule id="demo_ds"
write-data-source-name="write_ds" read-data-source-names="read_ds"
load-balance-algorithm-ref="randomStrategy" />
</readwrite-splitting:rule>
- <shadow:shadow-algorithm id="user-id-insert-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-insert-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">insert</prop>
<prop key="column">user_type</prop>
@@ -80,7 +80,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-delete-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-delete-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">delete</prop>
<prop key="column">user_type</prop>
@@ -88,7 +88,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-select-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-select-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">select</prop>
<prop key="column">user_type</prop>
@@ -96,7 +96,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="simple-note-algorithm" type="SIMPLE_NOTE">
+ <shadow:shadow-algorithm id="simple-hint-algorithm" type="SIMPLE_HINT">
<props>
<prop key="shadow">true</prop>
<prop key="foo">bar</prop>
@@ -110,7 +110,7 @@
<shadow:algorithm
shadow-algorithm-ref="user-id-insert-match-algorithm" />
<shadow:algorithm
shadow-algorithm-ref="user-id-delete-match-algorithm" />
<shadow:algorithm
shadow-algorithm-ref="user-id-select-match-algorithm" />
- <shadow:algorithm shadow-algorithm-ref="simple-note-algorithm" />
+ <shadow:algorithm shadow-algorithm-ref="simple-hint-algorithm" />
</shadow:shadow-table>
</shadow:rule>
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-sharding-databases.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-sharding-databases.xml
index b658cb4..a973d0f 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-sharding-databases.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow-sharding-databases.xml
@@ -77,7 +77,7 @@
</props>
</sharding:sharding-algorithm>
- <shadow:shadow-algorithm id="user-id-insert-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-insert-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">insert</prop>
<prop key="column">user_type</prop>
@@ -85,7 +85,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-delete-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-delete-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">delete</prop>
<prop key="column">user_type</prop>
@@ -93,7 +93,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-select-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-select-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">select</prop>
<prop key="column">user_type</prop>
@@ -101,7 +101,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="simple-note-algorithm" type="SIMPLE_NOTE">
+ <shadow:shadow-algorithm id="simple-hint-algorithm" type="SIMPLE_HINT">
<props>
<prop key="shadow">true</prop>
<prop key="foo">bar</prop>
@@ -115,7 +115,7 @@
<shadow:algorithm
shadow-algorithm-ref="user-id-insert-match-algorithm" />
<shadow:algorithm
shadow-algorithm-ref="user-id-delete-match-algorithm" />
<shadow:algorithm
shadow-algorithm-ref="user-id-select-match-algorithm" />
- <shadow:algorithm shadow-algorithm-ref="simple-note-algorithm" />
+ <shadow:algorithm shadow-algorithm-ref="simple-hint-algorithm" />
</shadow:shadow-table>
</shadow:rule>
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow.xml
index a981f30..26e648e 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/shadow-example/shadow-spring-namespace-mybatis-example/src/main/resources/META-INF/application-shadow.xml
@@ -49,7 +49,7 @@
<property name="password" value=""/>
</bean>
- <shadow:shadow-algorithm id="user-id-insert-match-algorithm"
type="COLUMN_VALUE_MATCH">
+ <shadow:shadow-algorithm id="user-id-insert-match-algorithm"
type="VALUE_MATCH">
<props>
<prop key="operation">insert</prop>
<prop key="column">user_type</prop>
@@ -57,7 +57,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-delete-match-algorithm"
type="COLUMN_VALUE_MATCH">
+ <shadow:shadow-algorithm id="user-id-delete-match-algorithm"
type="VALUE_MATCH">
<props>
<prop key="operation">delete</prop>
<prop key="column">user_type</prop>
@@ -65,7 +65,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-select-match-algorithm"
type="COLUMN_VALUE_MATCH">
+ <shadow:shadow-algorithm id="user-id-select-match-algorithm"
type="VALUE_MATCH">
<props>
<prop key="operation">select</prop>
<prop key="column">user_type</prop>
@@ -73,7 +73,7 @@
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="simple-note-algorithm" type="SIMPLE_NOTE">
+ <shadow:shadow-algorithm id="simple-hint-algorithm" type="SIMPLE_HINT">
<props>
<prop key="shadow">true</prop>
<prop key="foo">bar</prop>
@@ -86,7 +86,7 @@
<shadow:algorithm
shadow-algorithm-ref="user-id-insert-match-algorithm" />
<shadow:algorithm
shadow-algorithm-ref="user-id-delete-match-algorithm" />
<shadow:algorithm
shadow-algorithm-ref="user-id-select-match-algorithm" />
- <shadow:algorithm shadow-algorithm-ref="simple-note-algorithm" />
+ <shadow:algorithm shadow-algorithm-ref="simple-hint-algorithm" />
</shadow:shadow-table>
</shadow:rule>
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithm.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithm.java
index 1b7c463..e3ce367 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchShadowAlgorithm.java
@@ -86,6 +86,6 @@ public final class ColumnRegexMatchShadowAlgorithm implements
ColumnShadowAlgori
@Override
public String getType() {
- return "COLUMN_REGEX_MATCH";
+ return "REGEX_MATCH";
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithm.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithm.java
index 20a44b8..d11759b 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchShadowAlgorithm.java
@@ -86,6 +86,6 @@ public final class ColumnValueMatchShadowAlgorithm implements
ColumnShadowAlgori
@Override
public String getType() {
- return "COLUMN_VALUE_MATCH";
+ return "VALUE_MATCH";
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/note/SimpleSQLNoteShadowAlgorithm.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/note/SimpleSQLNoteShadowAlgorithm.java
index e11382d..e657f0c 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/note/SimpleSQLNoteShadowAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/note/SimpleSQLNoteShadowAlgorithm.java
@@ -59,6 +59,6 @@ public final class SimpleSQLNoteShadowAlgorithm implements
NoteShadowAlgorithm<S
@Override
public String getType() {
- return "SIMPLE_NOTE";
+ return "SIMPLE_HINT";
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/resources/yaml/shadow-rule.yaml
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/resources/yaml/shadow-rule.yaml
index 4ed7b30..e1dbcd2 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/resources/yaml/shadow-rule.yaml
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/resources/yaml/shadow-rule.yaml
@@ -59,25 +59,25 @@ rules:
- simple-note-algorithm
shadowAlgorithms:
user-id-insert-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: insert
column: user_id
regex: "[1]"
user-id-update-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: update
column: user_id
regex: "[1]"
user-id-select-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: select
column: user_id
regex: "[1]"
simple-note-algorithm:
- type: SIMPLE_NOTE
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/PropertiesShadowSpringBootStarterTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/PropertiesShadowSpringBootStarterTest.java
index d88dc66..ddcfe6f 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/PropertiesShadowSpringBootStarterTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/PropertiesShadowSpringBootStarterTest.java
@@ -58,13 +58,13 @@ public class PropertiesShadowSpringBootStarterTest {
private void assertShadowAlgorithms(final Map<String, ShadowAlgorithm>
shadowAlgorithms) {
ShadowAlgorithm userIdMatchAlgorithm =
shadowAlgorithms.get("user-id-match-algorithm");
assertThat(userIdMatchAlgorithm instanceof
ColumnRegexMatchShadowAlgorithm, is(true));
- assertThat(userIdMatchAlgorithm.getType(), is("COLUMN_REGEX_MATCH"));
+ assertThat(userIdMatchAlgorithm.getType(), is("REGEX_MATCH"));
assertThat(userIdMatchAlgorithm.getProps().get("operation"),
is("insert"));
assertThat(userIdMatchAlgorithm.getProps().get("column"),
is("user_id"));
assertThat(userIdMatchAlgorithm.getProps().get("regex"), is("[1]"));
ShadowAlgorithm simpleNoteAlgorithm =
shadowAlgorithms.get("simple-note-algorithm");
assertThat(simpleNoteAlgorithm instanceof
SimpleSQLNoteShadowAlgorithm, is(true));
- assertThat(simpleNoteAlgorithm.getType(), is("SIMPLE_NOTE"));
+ assertThat(simpleNoteAlgorithm.getType(), is("SIMPLE_HINT"));
assertThat(simpleNoteAlgorithm.getProps().get("shadow"), is("true"));
assertThat(simpleNoteAlgorithm.getProps().get("foo"), is("bar"));
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowDefaultSpringBootStarterTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowDefaultSpringBootStarterTest.java
index d3a31bd..3ebaeb1 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowDefaultSpringBootStarterTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowDefaultSpringBootStarterTest.java
@@ -60,7 +60,7 @@ public class YmlShadowDefaultSpringBootStarterTest {
private void assertShadowAlgorithms(final Map<String, ShadowAlgorithm>
shadowAlgorithms) {
ShadowAlgorithm simpleNoteAlgorithm =
shadowAlgorithms.get("simple-note-algorithm");
assertThat(simpleNoteAlgorithm instanceof
SimpleSQLNoteShadowAlgorithm, is(true));
- assertThat(simpleNoteAlgorithm.getType(), is("SIMPLE_NOTE"));
+ assertThat(simpleNoteAlgorithm.getType(), is("SIMPLE_HINT"));
assertThat(simpleNoteAlgorithm.getProps().get("shadow"), is(true));
assertThat(simpleNoteAlgorithm.getProps().get("foo"), is("bar"));
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowSpringBootStarterTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowSpringBootStarterTest.java
index 39a513b..19a5c8a 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowSpringBootStarterTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/java/org/apache/shardingsphere/shadow/spring/boot/YmlShadowSpringBootStarterTest.java
@@ -58,19 +58,19 @@ public class YmlShadowSpringBootStarterTest {
private void assertShadowAlgorithms(final Map<String, ShadowAlgorithm>
shadowAlgorithms) {
ShadowAlgorithm userIdRegexMatchAlgorithm =
shadowAlgorithms.get("user-id-regex-match-algorithm");
assertThat(userIdRegexMatchAlgorithm instanceof
ColumnRegexMatchShadowAlgorithm, is(true));
- assertThat(userIdRegexMatchAlgorithm.getType(),
is("COLUMN_REGEX_MATCH"));
+ assertThat(userIdRegexMatchAlgorithm.getType(), is("REGEX_MATCH"));
assertThat(userIdRegexMatchAlgorithm.getProps().get("operation"),
is("insert"));
assertThat(userIdRegexMatchAlgorithm.getProps().get("column"),
is("user_id"));
assertThat(userIdRegexMatchAlgorithm.getProps().get("regex"),
is("[1]"));
ShadowAlgorithm userIdValueMatchAlgorithm =
shadowAlgorithms.get("user-id-value-match-algorithm");
assertThat(userIdValueMatchAlgorithm instanceof
ColumnValueMatchShadowAlgorithm, is(true));
- assertThat(userIdValueMatchAlgorithm.getType(),
is("COLUMN_VALUE_MATCH"));
+ assertThat(userIdValueMatchAlgorithm.getType(), is("VALUE_MATCH"));
assertThat(userIdValueMatchAlgorithm.getProps().get("operation"),
is("insert"));
assertThat(userIdValueMatchAlgorithm.getProps().get("column"),
is("user_id"));
assertThat(userIdValueMatchAlgorithm.getProps().get("value"), is(1));
ShadowAlgorithm simpleNoteAlgorithm =
shadowAlgorithms.get("simple-note-algorithm");
assertThat(simpleNoteAlgorithm instanceof
SimpleSQLNoteShadowAlgorithm, is(true));
- assertThat(simpleNoteAlgorithm.getType(), is("SIMPLE_NOTE"));
+ assertThat(simpleNoteAlgorithm.getType(), is("SIMPLE_HINT"));
assertThat(simpleNoteAlgorithm.getProps().get("shadow"), is(true));
assertThat(simpleNoteAlgorithm.getProps().get("foo"), is("bar"));
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-default.yml
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-default.yml
index 60c14fd..1b352df 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-default.yml
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-default.yml
@@ -27,7 +27,7 @@ spring:
default-shadow-algorithm-name: simple-note-algorithm
shadow-algorithms:
simple-note-algorithm:
- type: SIMPLE_NOTE
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-properties.properties
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-properties.properties
index 8f1c94d..1e8f17e 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-properties.properties
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-properties.properties
@@ -25,11 +25,11 @@
spring.shardingsphere.rules.shadow.tables.t_order.shadow-algorithm-names=user-id
spring.shardingsphere.rules.shadow.tables.t_user.data-source-names=shadow-data-source-1
spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=simple-note-algorithm
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-match-algorithm.props.operation=insert
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-match-algorithm.props.column=user_id
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.type=SIMPLE_NOTE
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.type=SIMPLE_HINT
spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.shadow=true
spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.foo=bar
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-yml.yml
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-yml.yml
index 6b55a24..f320d58 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-yml.yml
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/test/resources/application-shadow-yml.yml
@@ -40,19 +40,19 @@ spring:
- simple-note-algorithm
shadow-algorithms:
user-id-regex-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: insert
column: user_id
regex: "[1]"
user-id-value-match-algorithm:
- type: COLUMN_VALUE_MATCH
+ type: VALUE_MATCH
props:
operation: insert
column: user_id
value: 1
simple-note-algorithm:
- type: SIMPLE_NOTE
+ type: SIMPLE_HINT
props:
shadow: true
foo: bar
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/main/resources/META-INF/namespace/shadow.xsd
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/main/resources/META-INF/namespace/shadow.xsd
index c3a4e9f..5510cf8 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/main/resources/META-INF/namespace/shadow.xsd
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/main/resources/META-INF/namespace/shadow.xsd
@@ -78,9 +78,9 @@
<xsd:simpleType name="algorithmType">
<xsd:restriction base="xsd:string">
- <xsd:enumeration value="COLUMN_REGEX_MATCH" />
- <xsd:enumeration value="COLUMN_VALUE_MATCH" />
- <xsd:enumeration value="SIMPLE_NOTE" />
+ <xsd:enumeration value="REGEX_MATCH" />
+ <xsd:enumeration value="VALUE_MATCH" />
+ <xsd:enumeration value="SIMPLE_HINT" />
</xsd:restriction>
</xsd:simpleType>
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowAlgorithmSpringNamespaceTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowAlgorithmSpringNamespaceTest.java
index cf18830..ffe4097 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowAlgorithmSpringNamespaceTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowAlgorithmSpringNamespaceTest.java
@@ -52,19 +52,19 @@ public final class ShadowAlgorithmSpringNamespaceTest
extends AbstractJUnit4Spri
private void assertShadowAlgorithms(final Map<String, ShadowAlgorithm>
shadowAlgorithms) {
ShadowAlgorithm userIdRegexMatchAlgorithm =
shadowAlgorithms.get("user-id-regex-match-algorithm");
assertThat(userIdRegexMatchAlgorithm instanceof
ColumnRegexMatchShadowAlgorithm, is(true));
- assertThat(userIdRegexMatchAlgorithm.getType(),
is("COLUMN_REGEX_MATCH"));
+ assertThat(userIdRegexMatchAlgorithm.getType(), is("REGEX_MATCH"));
assertThat(userIdRegexMatchAlgorithm.getProps().get("operation"),
is("insert"));
assertThat(userIdRegexMatchAlgorithm.getProps().get("column"),
is("user_id"));
assertThat(userIdRegexMatchAlgorithm.getProps().get("regex"),
is("[1]"));
ShadowAlgorithm userIdValueMatchAlgorithm =
shadowAlgorithms.get("user-id-value-match-algorithm");
assertThat(userIdValueMatchAlgorithm instanceof
ColumnValueMatchShadowAlgorithm, is(true));
- assertThat(userIdValueMatchAlgorithm.getType(),
is("COLUMN_VALUE_MATCH"));
+ assertThat(userIdValueMatchAlgorithm.getType(), is("VALUE_MATCH"));
assertThat(userIdValueMatchAlgorithm.getProps().get("operation"),
is("insert"));
assertThat(userIdValueMatchAlgorithm.getProps().get("column"),
is("user_id"));
assertThat(userIdValueMatchAlgorithm.getProps().get("value"), is("1"));
ShadowAlgorithm simpleNoteAlgorithm =
shadowAlgorithms.get("simple-note-algorithm");
assertThat(simpleNoteAlgorithm instanceof
SimpleSQLNoteShadowAlgorithm, is(true));
- assertThat(simpleNoteAlgorithm.getType(), is("SIMPLE_NOTE"));
+ assertThat(simpleNoteAlgorithm.getType(), is("SIMPLE_HINT"));
assertThat(simpleNoteAlgorithm.getProps().get("shadow"), is("true"));
assertThat(simpleNoteAlgorithm.getProps().get("foo"), is("bar"));
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowDefaultAlgorithmSpringNamespaceTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowDefaultAlgorithmSpringNamespaceTest.java
index 288078d..a2bc074 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowDefaultAlgorithmSpringNamespaceTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/java/org/apache/shardingsphere/shadow/spring/namespace/ShadowDefaultAlgorithmSpringNamespaceTest.java
@@ -54,7 +54,7 @@ public final class ShadowDefaultAlgorithmSpringNamespaceTest
extends AbstractJUn
private void assertShadowAlgorithms(final Map<String, ShadowAlgorithm>
shadowAlgorithms) {
ShadowAlgorithm simpleNoteAlgorithm =
shadowAlgorithms.get("simple-note-algorithm");
assertThat(simpleNoteAlgorithm instanceof
SimpleSQLNoteShadowAlgorithm, is(true));
- assertThat(simpleNoteAlgorithm.getType(), is("SIMPLE_NOTE"));
+ assertThat(simpleNoteAlgorithm.getType(), is("SIMPLE_HINT"));
assertThat(simpleNoteAlgorithm.getProps().get("shadow"), is("true"));
assertThat(simpleNoteAlgorithm.getProps().get("foo"), is("bar"));
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/resources/META-INF/spring/shadow-algorithm-application-context.xml
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/resources/META-INF/spring/shadow-algorithm-application-context.xml
index 21b1da5..b8a0803 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/resources/META-INF/spring/shadow-algorithm-application-context.xml
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/resources/META-INF/spring/shadow-algorithm-application-context.xml
@@ -24,21 +24,21 @@
http://shardingsphere.apache.org/schema/shardingsphere/shadow
http://shardingsphere.apache.org/schema/shardingsphere/shadow/shadow.xsd
">
- <shadow:shadow-algorithm id="user-id-regex-match-algorithm"
type="COLUMN_REGEX_MATCH">
+ <shadow:shadow-algorithm id="user-id-regex-match-algorithm"
type="REGEX_MATCH">
<props>
<prop key="operation">insert</prop>
<prop key="column">user_id</prop>
<prop key="regex">[1]</prop>
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="user-id-value-match-algorithm"
type="COLUMN_VALUE_MATCH">
+ <shadow:shadow-algorithm id="user-id-value-match-algorithm"
type="VALUE_MATCH">
<props>
<prop key="operation">insert</prop>
<prop key="column">user_id</prop>
<prop key="value">1</prop>
</props>
</shadow:shadow-algorithm>
- <shadow:shadow-algorithm id="simple-note-algorithm" type="SIMPLE_NOTE">
+ <shadow:shadow-algorithm id="simple-note-algorithm" type="SIMPLE_HINT">
<props>
<prop key="shadow">true</prop>
<prop key="foo">bar</prop>
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/resources/META-INF/spring/shadow-default-algorithm-application-context.xml
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/resources/META-INF/spring/shadow-default-algorithm-application-context.xml
index 8b194b3..8b1fc68 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/resources/META-INF/spring/shadow-default-algorithm-application-context.xml
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-namespace/src/test/resources/META-INF/spring/shadow-default-algorithm-application-context.xml
@@ -24,7 +24,7 @@
http://shardingsphere.apache.org/schema/shardingsphere/shadow
http://shardingsphere.apache.org/schema/shardingsphere/shadow/shadow.xsd
">
- <shadow:shadow-algorithm id="simple-note-algorithm" type="SIMPLE_NOTE">
+ <shadow:shadow-algorithm id="simple-note-algorithm" type="SIMPLE_HINT">
<props>
<prop key="shadow">true</prop>
<prop key="foo">bar</prop>
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-shadow.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-shadow.yaml
index a4b5b12..424f2ef 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-shadow.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/config/config-shadow.yaml
@@ -38,25 +38,25 @@ rules:
- id-select-match-algorithm
shadowAlgorithms:
id-insert-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: insert
column: id
regex: "[1]"
id-update-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: update
column: id
regex: "[1]"
id-delete-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: delete
column: id
regex: "[1]"
id-select-match-algorithm:
- type: COLUMN_REGEX_MATCH
+ type: REGEX_MATCH
props:
operation: select
column: id
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
index 5601c41..847fa86 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
@@ -163,7 +163,7 @@ public class SpringBootStarterTest {
assertThat(shadowAlgorithms.size(), is(3));
assertThat(shadowAlgorithms.get("user-id-match-algorithm") instanceof
ColumnShadowAlgorithm, is(true));
assertThat(shadowAlgorithms.get("order-id-match-algorithm") instanceof
ColumnShadowAlgorithm, is(true));
- assertThat(shadowAlgorithms.get("simple-note-algorithm") instanceof
NoteShadowAlgorithm, is(true));
+ assertThat(shadowAlgorithms.get("simple-hint-algorithm") instanceof
NoteShadowAlgorithm, is(true));
}
private void assertShadowDataSourceMappings(final Map<String,
ShadowDataSourceRule> shadowDataSourceMappings) {
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application-common.properties
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application-common.properties
index 905f2a0..e2a141d 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application-common.properties
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/resources/application-common.properties
@@ -60,19 +60,19 @@
spring.shardingsphere.rules.shadow.tables.t_order.shadow-algorithm-names=user-id
spring.shardingsphere.rules.shadow.tables.t_user.data-source-names=shadow-data-source
spring.shardingsphere.rules.shadow.tables.t_user.shadow-algorithm-names=simple-note-algorithm
-spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-match-algorithm.props.operation=insert
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-match-algorithm.props.column=user_id
spring.shardingsphere.rules.shadow.shadow-algorithms.user-id-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.order-id-match-algorithm.type=COLUMN_REGEX_MATCH
+spring.shardingsphere.rules.shadow.shadow-algorithms.order-id-match-algorithm.type=REGEX_MATCH
spring.shardingsphere.rules.shadow.shadow-algorithms.order-id-match-algorithm.props.operation=update
spring.shardingsphere.rules.shadow.shadow-algorithms.order-id-match-algorithm.props.column=user_id
spring.shardingsphere.rules.shadow.shadow-algorithms.order-id-match-algorithm.props.regex=[1]
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.type=SIMPLE_NOTE
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.shadow=true
-spring.shardingsphere.rules.shadow.shadow-algorithms.simple-note-algorithm.props.foo=bar
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.type=SIMPLE_HINT
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.shadow=true
+spring.shardingsphere.rules.shadow.shadow-algorithms.simple-hint-algorithm.props.foo=bar
spring.shardingsphere.props.sql-show=true
spring.shardingsphere.props.kernel-executor-size=10
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/config-shadow.yaml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/config-shadow.yaml
index 6831ab5..324391e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/config-shadow.yaml
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/config-shadow.yaml
@@ -74,25 +74,25 @@
# - simple-note-algorithm
# shadowAlgorithms:
# user-id-insert-match-algorithm:
-# type: COLUMN_REGEX_MATCH
+# type: REGEX_MATCH
# props:
# operation: insert
# column: user_id
# regex: "[1]"
# user-id-update-match-algorithm:
-# type: COLUMN_REGEX_MATCH
+# type: REGEX_MATCH
# props:
# operation: update
# column: user_id
# regex: "[1]"
# user-id-select-match-algorithm:
-# type: COLUMN_REGEX_MATCH
+# type: REGEX_MATCH
# props:
# operation: select
# column: user_id
# regex: "[1]"
-# simple-note-algorithm:
-# type: SIMPLE_NOTE
+# simple-hint-algorithm:
+# type: SIMPLE_HINT
# props:
# shadow: true
# foo: bar
@@ -155,25 +155,25 @@
# - simple-note-algorithm
# shadowAlgorithms:
# user-id-insert-match-algorithm:
-# type: COLUMN_REGEX_MATCH
+# type: REGEX_MATCH
# props:
# operation: insert
# column: user_id
# regex: "[1]"
# user-id-update-match-algorithm:
-# type: COLUMN_REGEX_MATCH
+# type: REGEX_MATCH
# props:
# operation: update
# column: user_id
# regex: "[1]"
# user-id-select-match-algorithm:
-# type: COLUMN_REGEX_MATCH
+# type: REGEX_MATCH
# props:
# operation: select
# column: user_id
# regex: "[1]"
-# simple-note-algorithm:
-# type: SIMPLE_NOTE
+# simple-hint-algorithm:
+# type: SIMPLE_HINT
# props:
# shadow: true
# foo: bar
