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 2021/06/25 12:10:17 UTC
[shardingsphere] branch master updated: Refactor ExpectedAlgorithm
(#11019)
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 be8c221 Refactor ExpectedAlgorithm (#11019)
be8c221 is described below
commit be8c22124ba1db66dd18fef963c84682fa855b34
Author: Liang Zhang <te...@163.com>
AuthorDate: Fri Jun 25 20:09:42 2021 +0800
Refactor ExpectedAlgorithm (#11019)
* Rename ExpectedAlgorithm's algorithm-name
* Refactor ExpectedAlgorithm
* Refactor ExpectedProperty
---
.../asserts/segment/distsql/AlgorithmAssert.java | 4 +-
.../segment/impl/distsql/ExpectedAlgorithm.java | 6 +--
.../segment/impl/distsql/ExpectedProperty.java | 6 +--
.../src/main/resources/case/rdl/alter.xml | 48 ++++++----------------
.../src/main/resources/case/rdl/create.xml | 48 ++++++----------------
5 files changed, 32 insertions(+), 80 deletions(-)
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/AlgorithmAssert.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/AlgorithmAssert.java
index ad2fd30..e3b71c5 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/AlgorithmAssert.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/distsql/AlgorithmAssert.java
@@ -47,8 +47,8 @@ public final class AlgorithmAssert {
} else {
assertNotNull(assertContext.getText("Actual dataSource should exist."), actual);
assertThat(assertContext.getText(String.format("`%s`'s function segment assertion error: ", actual.getClass().getSimpleName())),
- actual.getName(), CoreMatchers.is(expected.getAlgorithmName()));
- PropertiesAssert.assertIs(assertContext, actual.getProps(), expected.getAlgorithmProps());
+ actual.getName(), CoreMatchers.is(expected.getName()));
+ PropertiesAssert.assertIs(assertContext, actual.getProps(), expected.getProps());
}
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedAlgorithm.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedAlgorithm.java
index e9b6412..73554e8 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedAlgorithm.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedAlgorithm.java
@@ -30,9 +30,9 @@ import javax.xml.bind.annotation.XmlElement;
@Setter
public final class ExpectedAlgorithm extends AbstractExpectedIdentifierSQLSegment {
- @XmlElement
- private String algorithmName;
+ @XmlElement(name = "algorithm-name")
+ private String name;
@XmlElement(name = "properties")
- private ExpectedProperties algorithmProps;
+ private ExpectedProperties props;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedProperty.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedProperty.java
index 94cca5a..f0b5314 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedProperty.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/distsql/ExpectedProperty.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.AbstractExpectedIdentifierSQLSegment;
-import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlAttribute;
/**
* Expected property.
@@ -30,9 +30,9 @@ import javax.xml.bind.annotation.XmlElement;
@Setter
public final class ExpectedProperty extends AbstractExpectedIdentifierSQLSegment {
- @XmlElement
+ @XmlAttribute
private String key;
- @XmlElement
+ @XmlAttribute
private String value;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/resources/case/rdl/alter.xml b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/resources/case/rdl/alter.xml
index 96837ef..03a6411 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/resources/case/rdl/alter.xml
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/resources/case/rdl/alter.xml
@@ -25,21 +25,15 @@
<table-strategy-column>order_id</table-strategy-column>
<key-generate-strategy-column>another_id</key-generate-strategy-column>
<table-strategy>
- <algorithmName>hash_mod</algorithmName>
+ <algorithm-name>hash_mod</algorithm-name>
<properties>
- <property>
- <key>sharding-count</key>
- <value>4</value>
- </property>
+ <property key="sharding-count" value="4" />
</properties>
</table-strategy>
<key-generate-strategy>
- <algorithmName>snowflake</algorithmName>
+ <algorithm-name>snowflake</algorithm-name>
<properties>
- <property>
- <key>worker-id</key>
- <value>123</value>
- </property>
+ <property key="worker-id" value="123" />
</properties>
</key-generate-strategy>
</tables>
@@ -65,10 +59,7 @@
<auto-aware-resource>group_0</auto-aware-resource>
<load-balancer>random</load-balancer>
<properties>
- <property>
- <key>read_weight</key>
- <value>'2:1'</value>
- </property>
+ <property key="read_weight" value="'2:1'" />
</properties>
</read-write-splitting>
<read-write-splitting>
@@ -88,14 +79,8 @@
<data-source>resource1</data-source>
<discovery-type>mgr</discovery-type>
<properties>
- <property>
- <key>keepAliveCron</key>
- <value />
- </property>
- <property>
- <key>groupName</key>
- <value>92504d5b-6dec</value>
- </property>
+ <property key="keepAliveCron" value="" />
+ <property key="groupName" value="92504d5b-6dec" />
</properties>
</database-discovery>
<database-discovery>
@@ -104,14 +89,8 @@
<data-source>resource3</data-source>
<discovery-type>mgr2</discovery-type>
<properties>
- <property>
- <key>keepAliveCron</key>
- <value />
- </property>
- <property>
- <key>groupName</key>
- <value>92504d5b-6dec-2</value>
- </property>
+ <property key="keepAliveCron" value="" />
+ <property key="groupName" value="92504d5b-6dec-2" />
</properties>
</database-discovery>
</alter-database-discovery-rule>
@@ -124,12 +103,9 @@
<plain-column>user_plain</plain-column>
<cipher-column>user_cipher</cipher-column>
<encryptor>
- <algorithmName>AES</algorithmName>
+ <algorithm-name>AES</algorithm-name>
<properties>
- <property>
- <key>aes-key-value</key>
- <value>123456abc</value>
- </property>
+ <property key="aes-key-value" value="123456abc" />
</properties>
</encryptor>
</column>
@@ -137,7 +113,7 @@
<name>order_id</name>
<cipher-column>order_cipher</cipher-column>
<encryptor>
- <algorithmName>MD5</algorithmName>
+ <algorithm-name>MD5</algorithm-name>
</encryptor>
</column>
</encrypt-rule>
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/resources/case/rdl/create.xml b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/resources/case/rdl/create.xml
index c1c5ae3..c9bd05e 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/resources/case/rdl/create.xml
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/resources/case/rdl/create.xml
@@ -66,21 +66,15 @@
<table-strategy-column>order_id</table-strategy-column>
<key-generate-strategy-column>another_id</key-generate-strategy-column>
<table-strategy>
- <algorithmName>hash_mod</algorithmName>
+ <algorithm-name>hash_mod</algorithm-name>
<properties>
- <property>
- <key>sharding-count</key>
- <value>4</value>
- </property>
+ <property key="sharding-count" value="4" />
</properties>
</table-strategy>
<key-generate-strategy>
- <algorithmName>snowflake</algorithmName>
+ <algorithm-name>snowflake</algorithm-name>
<properties>
- <property>
- <key>worker-id</key>
- <value>123</value>
- </property>
+ <property key="worker-id" value="123" />
</properties>
</key-generate-strategy>
</tables>
@@ -117,10 +111,7 @@
<auto-aware-resource>group_0</auto-aware-resource>
<load-balancer>random</load-balancer>
<properties>
- <property>
- <key>read_weight</key>
- <value>'2:1'</value>
- </property>
+ <property key="read_weight" value="'2:1'" />
</properties>
</read-write-splitting>
</create-readwrite-splitting-rule>
@@ -132,14 +123,8 @@
<data-source>resource1</data-source>
<discovery-type>mgr</discovery-type>
<properties>
- <property>
- <key>keepAliveCron</key>
- <value />
- </property>
- <property>
- <key>groupName</key>
- <value>92504d5b-6dec</value>
- </property>
+ <property key="keepAliveCron" value="" />
+ <property key="groupName" value="92504d5b-6dec" />
</properties>
</database-discovery>
<database-discovery>
@@ -148,14 +133,8 @@
<data-source>resource3</data-source>
<discovery-type>mgr2</discovery-type>
<properties>
- <property>
- <key>keepAliveCron</key>
- <value />
- </property>
- <property>
- <key>groupName</key>
- <value>92504d5b-6dec-2</value>
- </property>
+ <property key="keepAliveCron" value="" />
+ <property key="groupName" value="92504d5b-6dec-2" />
</properties>
</database-discovery>
</create-database-discovery-rule>
@@ -168,12 +147,9 @@
<plain-column>user_plain</plain-column>
<cipher-column>user_cipher</cipher-column>
<encryptor>
- <algorithmName>AES</algorithmName>
+ <algorithm-name>AES</algorithm-name>
<properties>
- <property>
- <key>aes-key-value</key>
- <value>123456abc</value>
- </property>
+ <property key="aes-key-value" value="123456abc" />
</properties>
</encryptor>
</column>
@@ -181,7 +157,7 @@
<name>order_id</name>
<cipher-column>order_cipher</cipher-column>
<encryptor>
- <algorithmName>MD5</algorithmName>
+ <algorithm-name>MD5</algorithm-name>
</encryptor>
</column>
</encrypt-rule>