This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 8645c433dec Move packages of ConvertDistSQLConstants (#33458)
8645c433dec is described below
commit 8645c433dec3f1f0eff38df46b5b9eae3f939a63
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Oct 29 23:02:07 2024 +0800
Move packages of ConvertDistSQLConstants (#33458)
* Move packages of ConvertDistSQLConstants
* Move packages of ConvertDistSQLConstants
---
.../BroadcastConvertDistSQLConstants.java} | 6 +--
...oadcastRuleConfigurationToDistSQLConverter.java | 3 +-
.../EncryptConvertDistSQLConstants.java} | 6 +--
...EncryptRuleConfigurationToDistSQLConverter.java | 19 +++++----
.../MaskConvertDistSQLConstants.java} | 6 +--
.../MaskRuleConfigurationToDistSQLConverter.java | 7 ++--
...ReadwriteSplittingConvertDistSQLConstants.java} | 6 +--
...littingRuleConfigurationToDistSQLConverter.java | 7 ++--
.../ShadowConvertDistSQLConstants.java} | 6 +--
.../ShadowRuleConfigurationToDistSQLConverter.java | 8 ++--
.../ShardingConvertDistSQLConstants.java} | 6 +--
...hardingRuleConfigurationToDistSQLConverter.java | 45 +++++++++++-----------
.../SingleConvertDistSQLConstants.java} | 6 +--
.../SingleRuleConfigurationToDistSQLConverter.java | 5 +--
14 files changed, 66 insertions(+), 70 deletions(-)
diff --git
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/constant/BroadcastDistSQLConstants.java
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastConvertDistSQLConstants.java
similarity index 86%
rename from
features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/constant/BroadcastDistSQLConstants.java
rename to
features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastConvertDistSQLConstants.java
index 3d8ef78c726..97236a7ff1f 100644
---
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/constant/BroadcastDistSQLConstants.java
+++
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastConvertDistSQLConstants.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.broadcast.distsql.handler.constant;
+package org.apache.shardingsphere.broadcast.distsql.handler.converter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Broadcast DistSQL constants.
+ * Broadcast convert DistSQL constants.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class BroadcastDistSQLConstants {
+public final class BroadcastConvertDistSQLConstants {
public static final String CREATE_BROADCAST_TABLE_RULE = "CREATE BROADCAST
TABLE RULE %s;";
}
diff --git
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverter.java
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverter.java
index 6306eac6062..bf4310581e8 100644
---
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverter.java
+++
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverter.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.broadcast.distsql.handler.converter;
import com.google.common.base.Joiner;
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
-import
org.apache.shardingsphere.broadcast.distsql.handler.constant.BroadcastDistSQLConstants;
import
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.RuleConfigurationToDistSQLConverter;
/**
@@ -32,7 +31,7 @@ public final class
BroadcastRuleConfigurationToDistSQLConverter implements RuleC
if (ruleConfig.getTables().isEmpty()) {
return "";
}
- return
String.format(BroadcastDistSQLConstants.CREATE_BROADCAST_TABLE_RULE,
Joiner.on(",").join(ruleConfig.getTables()));
+ return
String.format(BroadcastConvertDistSQLConstants.CREATE_BROADCAST_TABLE_RULE,
Joiner.on(",").join(ruleConfig.getTables()));
}
@Override
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/constant/EncryptDistSQLConstants.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptConvertDistSQLConstants.java
similarity index 91%
rename from
features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/constant/EncryptDistSQLConstants.java
rename to
features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptConvertDistSQLConstants.java
index 58233bf6e0a..2df8b99bc60 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/constant/EncryptDistSQLConstants.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptConvertDistSQLConstants.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.distsql.handler.constant;
+package org.apache.shardingsphere.encrypt.distsql.handler.converter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Encrypt DistSQL constants.
+ * Encrypt convert DistSQL constants.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class EncryptDistSQLConstants {
+public final class EncryptConvertDistSQLConstants {
public static final String CREATE_ENCRYPT_RULE = "CREATE ENCRYPT RULE";
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
index 52e534e13c9..609fe4cff81 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
import
org.apache.shardingsphere.encrypt.config.rule.EncryptColumnItemRuleConfiguration;
import
org.apache.shardingsphere.encrypt.config.rule.EncryptColumnRuleConfiguration;
import
org.apache.shardingsphere.encrypt.config.rule.EncryptTableRuleConfiguration;
-import
org.apache.shardingsphere.encrypt.distsql.handler.constant.EncryptDistSQLConstants;
import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import java.util.Collection;
@@ -42,11 +41,11 @@ public final class
EncryptRuleConfigurationToDistSQLConverter implements RuleCon
if (ruleConfig.getTables().isEmpty()) {
return "";
}
- StringBuilder result = new
StringBuilder(EncryptDistSQLConstants.CREATE_ENCRYPT_RULE);
+ StringBuilder result = new
StringBuilder(EncryptConvertDistSQLConstants.CREATE_ENCRYPT_RULE);
Iterator<EncryptTableRuleConfiguration> iterator =
ruleConfig.getTables().iterator();
while (iterator.hasNext()) {
EncryptTableRuleConfiguration tableRuleConfig = iterator.next();
- result.append(String.format(EncryptDistSQLConstants.ENCRYPT_RULE,
tableRuleConfig.getName(), getEncryptColumns(tableRuleConfig.getColumns(),
ruleConfig.getEncryptors())));
+
result.append(String.format(EncryptConvertDistSQLConstants.ENCRYPT_RULE,
tableRuleConfig.getName(), getEncryptColumns(tableRuleConfig.getColumns(),
ruleConfig.getEncryptors())));
if (iterator.hasNext()) {
result.append(DistSQLConstants.COMMA).append(System.lineSeparator());
}
@@ -60,7 +59,7 @@ public final class EncryptRuleConfigurationToDistSQLConverter
implements RuleCon
Iterator<EncryptColumnRuleConfiguration> iterator =
ruleConfigs.iterator();
while (iterator.hasNext()) {
EncryptColumnRuleConfiguration columnRuleConfig = iterator.next();
-
result.append(String.format(EncryptDistSQLConstants.ENCRYPT_COLUMN,
columnRuleConfig.getName(), getColumns(columnRuleConfig),
getEncryptAlgorithms(columnRuleConfig, encryptors)));
+
result.append(String.format(EncryptConvertDistSQLConstants.ENCRYPT_COLUMN,
columnRuleConfig.getName(), getColumns(columnRuleConfig),
getEncryptAlgorithms(columnRuleConfig, encryptors)));
if (iterator.hasNext()) {
result.append(DistSQLConstants.COMMA).append(System.lineSeparator());
}
@@ -72,13 +71,13 @@ public final class
EncryptRuleConfigurationToDistSQLConverter implements RuleCon
StringBuilder result = new StringBuilder();
String cipherColumnName = ruleConfig.getCipher().getName();
if (!Strings.isNullOrEmpty(cipherColumnName)) {
- result.append(String.format(EncryptDistSQLConstants.CIPHER,
cipherColumnName));
+ result.append(String.format(EncryptConvertDistSQLConstants.CIPHER,
cipherColumnName));
}
if (ruleConfig.getAssistedQuery().isPresent()) {
- result.append(DistSQLConstants.COMMA).append('
').append(String.format(EncryptDistSQLConstants.ASSISTED_QUERY_COLUMN,
ruleConfig.getAssistedQuery().get().getName()));
+ result.append(DistSQLConstants.COMMA).append('
').append(String.format(EncryptConvertDistSQLConstants.ASSISTED_QUERY_COLUMN,
ruleConfig.getAssistedQuery().get().getName()));
}
if (ruleConfig.getLikeQuery().isPresent()) {
- result.append(DistSQLConstants.COMMA).append('
').append(String.format(EncryptDistSQLConstants.LIKE_QUERY_COLUMN,
ruleConfig.getLikeQuery().get().getName()));
+ result.append(DistSQLConstants.COMMA).append('
').append(String.format(EncryptConvertDistSQLConstants.LIKE_QUERY_COLUMN,
ruleConfig.getLikeQuery().get().getName()));
}
return result.toString();
}
@@ -89,15 +88,15 @@ public final class
EncryptRuleConfigurationToDistSQLConverter implements RuleCon
String assistedQueryEncryptorName =
ruleConfig.getAssistedQuery().map(EncryptColumnItemRuleConfiguration::getEncryptorName).orElse("");
String likeQueryEncryptorName =
ruleConfig.getLikeQuery().map(EncryptColumnItemRuleConfiguration::getEncryptorName).orElse("");
if (!Strings.isNullOrEmpty(cipherEncryptorName)) {
-
result.append(String.format(EncryptDistSQLConstants.ENCRYPT_ALGORITHM,
AlgorithmDistSQLConverter.getAlgorithmType(encryptors.get(cipherEncryptorName))));
+
result.append(String.format(EncryptConvertDistSQLConstants.ENCRYPT_ALGORITHM,
AlgorithmDistSQLConverter.getAlgorithmType(encryptors.get(cipherEncryptorName))));
}
if (!Strings.isNullOrEmpty(assistedQueryEncryptorName)) {
result.append(DistSQLConstants.COMMA).append(' ')
-
.append(String.format(EncryptDistSQLConstants.ASSISTED_QUERY_ALGORITHM,
AlgorithmDistSQLConverter.getAlgorithmType(encryptors.get(assistedQueryEncryptorName))));
+
.append(String.format(EncryptConvertDistSQLConstants.ASSISTED_QUERY_ALGORITHM,
AlgorithmDistSQLConverter.getAlgorithmType(encryptors.get(assistedQueryEncryptorName))));
}
if (!Strings.isNullOrEmpty(likeQueryEncryptorName)) {
result.append(DistSQLConstants.COMMA).append(' ')
-
.append(String.format(EncryptDistSQLConstants.LIKE_QUERY_ALGORITHM,
AlgorithmDistSQLConverter.getAlgorithmType(encryptors.get(likeQueryEncryptorName))));
+
.append(String.format(EncryptConvertDistSQLConstants.LIKE_QUERY_ALGORITHM,
AlgorithmDistSQLConverter.getAlgorithmType(encryptors.get(likeQueryEncryptorName))));
}
return result.toString();
}
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/constant/MaskDistSQLConstants.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskConvertDistSQLConstants.java
similarity index 89%
rename from
features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/constant/MaskDistSQLConstants.java
rename to
features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskConvertDistSQLConstants.java
index 542932e225a..3d6a9ec0c78 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/constant/MaskDistSQLConstants.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskConvertDistSQLConstants.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mask.distsql.handler.constant;
+package org.apache.shardingsphere.mask.distsql.handler.converter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Mask DistSQL constants.
+ * Mask convert DistSQL constants.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class MaskDistSQLConstants {
+public final class MaskConvertDistSQLConstants {
public static final String CREATE_MASK_RULE = "CREATE MASK RULE";
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverter.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverter.java
index 65e7ec83861..fec4de69af4 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverter.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverter.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfigurat
import org.apache.shardingsphere.mask.config.MaskRuleConfiguration;
import org.apache.shardingsphere.mask.config.rule.MaskColumnRuleConfiguration;
import org.apache.shardingsphere.mask.config.rule.MaskTableRuleConfiguration;
-import
org.apache.shardingsphere.mask.distsql.handler.constant.MaskDistSQLConstants;
import java.util.Collection;
import java.util.Iterator;
@@ -40,11 +39,11 @@ public final class MaskRuleConfigurationToDistSQLConverter
implements RuleConfig
if (ruleConfig.getTables().isEmpty()) {
return "";
}
- StringBuilder result = new
StringBuilder(MaskDistSQLConstants.CREATE_MASK_RULE);
+ StringBuilder result = new
StringBuilder(MaskConvertDistSQLConstants.CREATE_MASK_RULE);
Iterator<MaskTableRuleConfiguration> iterator =
ruleConfig.getTables().iterator();
while (iterator.hasNext()) {
MaskTableRuleConfiguration tableRuleConfig = iterator.next();
- result.append(String.format(MaskDistSQLConstants.MASK_RULE,
tableRuleConfig.getName(), getMaskColumns(tableRuleConfig.getColumns(),
ruleConfig.getMaskAlgorithms())));
+ result.append(String.format(MaskConvertDistSQLConstants.MASK_RULE,
tableRuleConfig.getName(), getMaskColumns(tableRuleConfig.getColumns(),
ruleConfig.getMaskAlgorithms())));
if (iterator.hasNext()) {
result.append(DistSQLConstants.COMMA).append(System.lineSeparator());
}
@@ -58,7 +57,7 @@ public final class MaskRuleConfigurationToDistSQLConverter
implements RuleConfig
Iterator<MaskColumnRuleConfiguration> iterator =
columnRuleConfig.iterator();
while (iterator.hasNext()) {
MaskColumnRuleConfiguration column = iterator.next();
- result.append(String.format(MaskDistSQLConstants.MASK_COLUMN,
column.getLogicColumn(), getMaskAlgorithms(column, maskAlgorithms)));
+
result.append(String.format(MaskConvertDistSQLConstants.MASK_COLUMN,
column.getLogicColumn(), getMaskAlgorithms(column, maskAlgorithms)));
if (iterator.hasNext()) {
result.append(DistSQLConstants.COMMA).append(System.lineSeparator());
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/constant/ReadwriteSplittingDistSQLConstants.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingConvertDistSQLConstants.java
similarity index 92%
rename from
features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/constant/ReadwriteSplittingDistSQLConstants.java
rename to
features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingConvertDistSQLConstants.java
index 8e0a747ef47..3e5aa18cb99 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/constant/ReadwriteSplittingDistSQLConstants.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingConvertDistSQLConstants.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.readwritesplitting.distsql.handler.constant;
+package org.apache.shardingsphere.readwritesplitting.distsql.handler.converter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Readwrite-splitting DistSQL constants.
+ * Readwrite-splitting convert DistSQL constants.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ReadwriteSplittingDistSQLConstants {
+public final class ReadwriteSplittingConvertDistSQLConstants {
public static final String CREATE_READWRITE_SPLITTING_RULE = "CREATE
READWRITE_SPLITTING RULE";
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
index fe0fa228604..87ee2203122 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.RuleCo
import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import
org.apache.shardingsphere.readwritesplitting.config.ReadwriteSplittingRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.config.rule.ReadwriteSplittingDataSourceGroupRuleConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.distsql.handler.constant.ReadwriteSplittingDistSQLConstants;
import java.util.Collection;
import java.util.Iterator;
@@ -40,7 +39,7 @@ public final class
ReadwriteSplittingRuleConfigurationToDistSQLConverter impleme
if (ruleConfig.getDataSourceGroups().isEmpty()) {
return "";
}
- StringBuilder result = new
StringBuilder(ReadwriteSplittingDistSQLConstants.CREATE_READWRITE_SPLITTING_RULE);
+ StringBuilder result = new
StringBuilder(ReadwriteSplittingConvertDistSQLConstants.CREATE_READWRITE_SPLITTING_RULE);
Iterator<ReadwriteSplittingDataSourceGroupRuleConfiguration> iterator
= ruleConfig.getDataSourceGroups().iterator();
while (iterator.hasNext()) {
appendReadWriteSplittingRule(ruleConfig.getLoadBalancers(),
iterator.next(), result);
@@ -57,7 +56,7 @@ public final class
ReadwriteSplittingRuleConfigurationToDistSQLConverter impleme
String readDataSourceNames =
getReadDataSourceNames(dataSourceGroupRuleConfig.getReadDataSourceNames());
String transactionalReadQueryStrategy =
dataSourceGroupRuleConfig.getTransactionalReadQueryStrategy().name();
String loadBalancerType =
getLoadBalancerType(loadBalancers.get(dataSourceGroupRuleConfig.getLoadBalancerName()));
-
stringBuilder.append(String.format(ReadwriteSplittingDistSQLConstants.READWRITE_SPLITTING_RULE,
+
stringBuilder.append(String.format(ReadwriteSplittingConvertDistSQLConstants.READWRITE_SPLITTING_RULE,
dataSourceGroupRuleConfig.getName(),
dataSourceGroupRuleConfig.getWriteDataSourceName(), readDataSourceNames,
transactionalReadQueryStrategy, loadBalancerType));
}
@@ -65,7 +64,7 @@ public final class
ReadwriteSplittingRuleConfigurationToDistSQLConverter impleme
StringBuilder result = new StringBuilder();
Iterator<String> iterator = readDataSourceNames.iterator();
while (iterator.hasNext()) {
-
result.append(String.format(ReadwriteSplittingDistSQLConstants.READ_DATA_SOURCE,
iterator.next()));
+
result.append(String.format(ReadwriteSplittingConvertDistSQLConstants.READ_DATA_SOURCE,
iterator.next()));
if (iterator.hasNext()) {
result.append(DistSQLConstants.COMMA);
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/constant/ShadowDistSQLConstants.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowConvertDistSQLConstants.java
similarity index 89%
rename from
features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/constant/ShadowDistSQLConstants.java
rename to
features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowConvertDistSQLConstants.java
index ed9721d1f9f..77802362ed7 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/constant/ShadowDistSQLConstants.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowConvertDistSQLConstants.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.shadow.distsql.handler.constant;
+package org.apache.shardingsphere.shadow.distsql.handler.converter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Shadow DistSQL constants.
+ * Shadow convert DistSQL constants.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ShadowDistSQLConstants {
+public final class ShadowConvertDistSQLConstants {
public static final String CREATE_SHADOW_RULE = "CREATE SHADOW RULE";
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverter.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverter.java
index ddcd6406e81..018fa5e809c 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverter.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverter.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfigurat
import org.apache.shardingsphere.shadow.config.ShadowRuleConfiguration;
import
org.apache.shardingsphere.shadow.config.datasource.ShadowDataSourceConfiguration;
import org.apache.shardingsphere.shadow.config.table.ShadowTableConfiguration;
-import
org.apache.shardingsphere.shadow.distsql.handler.constant.ShadowDistSQLConstants;
import java.util.Collection;
import java.util.Iterator;
@@ -41,13 +40,14 @@ public final class
ShadowRuleConfigurationToDistSQLConverter implements RuleConf
if (ruleConfig.getDataSources().isEmpty()) {
return "";
}
- StringBuilder result = new
StringBuilder(ShadowDistSQLConstants.CREATE_SHADOW_RULE);
+ StringBuilder result = new
StringBuilder(ShadowConvertDistSQLConstants.CREATE_SHADOW_RULE);
Iterator<ShadowDataSourceConfiguration> iterator =
ruleConfig.getDataSources().iterator();
while (iterator.hasNext()) {
ShadowDataSourceConfiguration dataSourceConfig = iterator.next();
String shadowRuleName = dataSourceConfig.getName();
String shadowTables = getShadowTables(shadowRuleName,
ruleConfig.getTables(), ruleConfig.getShadowAlgorithms());
- result.append(String.format(ShadowDistSQLConstants.SHADOW_RULE,
shadowRuleName, dataSourceConfig.getProductionDataSourceName(),
dataSourceConfig.getShadowDataSourceName(), shadowTables));
+ result.append(
+ String.format(ShadowConvertDistSQLConstants.SHADOW_RULE,
shadowRuleName, dataSourceConfig.getProductionDataSourceName(),
dataSourceConfig.getShadowDataSourceName(), shadowTables));
if (iterator.hasNext()) {
result.append(DistSQLConstants.COMMA);
}
@@ -63,7 +63,7 @@ public final class ShadowRuleConfigurationToDistSQLConverter
implements RuleConf
Entry<String, ShadowTableConfiguration> shadowTableConfig =
iterator.next();
if
(shadowTableConfig.getValue().getDataSourceNames().contains(shadowRuleName)) {
String shadowTableTypes =
getShadowTableTypes(shadowTableConfig.getValue().getShadowAlgorithmNames(),
algorithmConfigs);
-
result.append(String.format(ShadowDistSQLConstants.SHADOW_TABLE,
shadowTableConfig.getKey(), shadowTableTypes));
+
result.append(String.format(ShadowConvertDistSQLConstants.SHADOW_TABLE,
shadowTableConfig.getKey(), shadowTableTypes));
}
if (iterator.hasNext()) {
result.append(DistSQLConstants.COMMA).append(System.lineSeparator());
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/constant/ShardingDistSQLConstants.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingConvertDistSQLConstants.java
similarity index 95%
rename from
features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/constant/ShardingDistSQLConstants.java
rename to
features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingConvertDistSQLConstants.java
index 4cac2ec62c2..bd53fd98f0b 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/constant/ShardingDistSQLConstants.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingConvertDistSQLConstants.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.distsql.handler.constant;
+package org.apache.shardingsphere.sharding.distsql.handler.converter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Sharding DistSQL constants.
+ * Sharding convert DistSQL constants.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ShardingDistSQLConstants {
+public final class ShardingConvertDistSQLConstants {
public static final String STANDARD = "standard";
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverter.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverter.java
index ed6c331a917..dd4eb08bb5d 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverter.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverter.java
@@ -31,7 +31,6 @@ import
org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerate
import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.ComplexShardingStrategyConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.distsql.handler.constant.ShardingDistSQLConstants;
import java.util.Collection;
import java.util.Iterator;
@@ -64,7 +63,7 @@ public final class
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
private void appendShardingTableRules(final ShardingRuleConfiguration
ruleConfig, final StringBuilder stringBuilder) {
String tableRules = getTableRules(ruleConfig);
String autoTableRules = getAutoTableRules(ruleConfig);
-
stringBuilder.append(ShardingDistSQLConstants.CREATE_SHARDING_TABLE_RULE).append(tableRules);
+
stringBuilder.append(ShardingConvertDistSQLConstants.CREATE_SHARDING_TABLE_RULE).append(tableRules);
if (!Strings.isNullOrEmpty(tableRules) &&
!Strings.isNullOrEmpty(autoTableRules)) {
stringBuilder.append(DistSQLConstants.COMMA);
}
@@ -72,11 +71,11 @@ public final class
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
}
private void appendShardingBindingTableRules(final
ShardingRuleConfiguration ruleConfig, final StringBuilder stringBuilder) {
-
stringBuilder.append(ShardingDistSQLConstants.SHARDING_BINDING_TABLE_RULES);
+
stringBuilder.append(ShardingConvertDistSQLConstants.SHARDING_BINDING_TABLE_RULES);
Iterator<ShardingTableReferenceRuleConfiguration> iterator =
ruleConfig.getBindingTableGroups().iterator();
while (iterator.hasNext()) {
ShardingTableReferenceRuleConfiguration referenceRuleConfig =
iterator.next();
-
stringBuilder.append(String.format(ShardingDistSQLConstants.BINDING_TABLES,
referenceRuleConfig.getName(), referenceRuleConfig.getReference()));
+
stringBuilder.append(String.format(ShardingConvertDistSQLConstants.BINDING_TABLES,
referenceRuleConfig.getName(), referenceRuleConfig.getReference()));
if (iterator.hasNext()) {
stringBuilder.append(DistSQLConstants.COMMA);
}
@@ -86,14 +85,14 @@ public final class
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
private void appendDefaultShardingStrategy(final ShardingRuleConfiguration
ruleConfig, final StringBuilder result) {
if (null != ruleConfig.getDefaultDatabaseShardingStrategy()) {
- appendStrategy(ruleConfig.getDefaultDatabaseShardingStrategy(),
ShardingDistSQLConstants.DEFAULT_DATABASE_STRATEGY, result,
ruleConfig.getShardingAlgorithms());
+ appendStrategy(ruleConfig.getDefaultDatabaseShardingStrategy(),
ShardingConvertDistSQLConstants.DEFAULT_DATABASE_STRATEGY, result,
ruleConfig.getShardingAlgorithms());
result.append(DistSQLConstants.SEMI);
}
if (null != ruleConfig.getDefaultTableShardingStrategy()) {
if (null != ruleConfig.getDefaultDatabaseShardingStrategy()) {
result.append(System.lineSeparator()).append(System.lineSeparator());
}
- appendStrategy(ruleConfig.getDefaultTableShardingStrategy(),
ShardingDistSQLConstants.DEFAULT_TABLE_STRATEGY, result,
ruleConfig.getShardingAlgorithms());
+ appendStrategy(ruleConfig.getDefaultTableShardingStrategy(),
ShardingConvertDistSQLConstants.DEFAULT_TABLE_STRATEGY, result,
ruleConfig.getShardingAlgorithms());
result.append(DistSQLConstants.SEMI);
}
}
@@ -104,7 +103,7 @@ public final class
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
Iterator<ShardingTableRuleConfiguration> iterator =
ruleConfig.getTables().iterator();
while (iterator.hasNext()) {
ShardingTableRuleConfiguration tableRuleConfig =
iterator.next();
-
result.append(String.format(ShardingDistSQLConstants.SHARDING_TABLE_RULE,
tableRuleConfig.getLogicTable(), tableRuleConfig.getActualDataNodes(),
+
result.append(String.format(ShardingConvertDistSQLConstants.SHARDING_TABLE_RULE,
tableRuleConfig.getLogicTable(), tableRuleConfig.getActualDataNodes(),
appendTableStrategy(tableRuleConfig, ruleConfig)));
if (iterator.hasNext()) {
result.append(DistSQLConstants.COMMA);
@@ -120,7 +119,7 @@ public final class
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
Iterator<ShardingAutoTableRuleConfiguration> iterator =
ruleConfig.getAutoTables().iterator();
while (iterator.hasNext()) {
ShardingAutoTableRuleConfiguration autoTableRuleConfig =
iterator.next();
-
result.append(String.format(ShardingDistSQLConstants.SHARDING_AUTO_TABLE_RULE,
autoTableRuleConfig.getLogicTable(), autoTableRuleConfig.getActualDataSources(),
+
result.append(String.format(ShardingConvertDistSQLConstants.SHARDING_AUTO_TABLE_RULE,
autoTableRuleConfig.getLogicTable(),
autoTableRuleConfig.getActualDataSources(),
appendAutoTableStrategy(autoTableRuleConfig,
ruleConfig)));
if (iterator.hasNext()) {
result.append(DistSQLConstants.COMMA);
@@ -132,8 +131,8 @@ public final class
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
private String appendTableStrategy(final ShardingTableRuleConfiguration
tableRuleConfig, final ShardingRuleConfiguration ruleConfig) {
StringBuilder result = new StringBuilder();
- appendStrategy(tableRuleConfig.getDatabaseShardingStrategy(),
ShardingDistSQLConstants.DATABASE_STRATEGY, result,
ruleConfig.getShardingAlgorithms());
- appendStrategy(tableRuleConfig.getTableShardingStrategy(),
ShardingDistSQLConstants.TABLE_STRATEGY, result,
ruleConfig.getShardingAlgorithms());
+ appendStrategy(tableRuleConfig.getDatabaseShardingStrategy(),
ShardingConvertDistSQLConstants.DATABASE_STRATEGY, result,
ruleConfig.getShardingAlgorithms());
+ appendStrategy(tableRuleConfig.getTableShardingStrategy(),
ShardingConvertDistSQLConstants.TABLE_STRATEGY, result,
ruleConfig.getShardingAlgorithms());
appendKeyGenerateStrategy(ruleConfig.getKeyGenerators(),
tableRuleConfig.getKeyGenerateStrategy(), result);
appendAuditStrategy(ruleConfig.getAuditors(), null !=
tableRuleConfig.getAuditStrategy() ? tableRuleConfig.getAuditStrategy() :
ruleConfig.getDefaultAuditStrategy(), result);
return result.toString();
@@ -143,7 +142,7 @@ public final class
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
StringBuilder result = new StringBuilder();
StandardShardingStrategyConfiguration strategyConfig =
(StandardShardingStrategyConfiguration)
autoTableRuleConfig.getShardingStrategy();
String shardingColumn =
Strings.isNullOrEmpty(strategyConfig.getShardingColumn()) ?
ruleConfig.getDefaultShardingColumn() : strategyConfig.getShardingColumn();
-
result.append(String.format(ShardingDistSQLConstants.AUTO_TABLE_STRATEGY,
+
result.append(String.format(ShardingConvertDistSQLConstants.AUTO_TABLE_STRATEGY,
shardingColumn,
AlgorithmDistSQLConverter.getAlgorithmType(ruleConfig.getShardingAlgorithms().get(strategyConfig.getShardingAlgorithmName()))));
appendKeyGenerateStrategy(ruleConfig.getKeyGenerators(),
autoTableRuleConfig.getKeyGenerateStrategy(), result);
appendAuditStrategy(ruleConfig.getAuditors(), null !=
autoTableRuleConfig.getAuditStrategy() ? autoTableRuleConfig.getAuditStrategy()
: ruleConfig.getDefaultAuditStrategy(), result);
@@ -155,25 +154,27 @@ public final class
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
if (null == strategyConfig) {
return;
}
- if (Objects.equals(strategyType,
ShardingDistSQLConstants.DATABASE_STRATEGY) || Objects.equals(strategyType,
ShardingDistSQLConstants.TABLE_STRATEGY)) {
+ if (Objects.equals(strategyType,
ShardingConvertDistSQLConstants.DATABASE_STRATEGY) ||
Objects.equals(strategyType, ShardingConvertDistSQLConstants.TABLE_STRATEGY)) {
stringBuilder.append(DistSQLConstants.COMMA).append(System.lineSeparator());
}
String type = strategyConfig.getType().toLowerCase();
String algorithmDefinition =
AlgorithmDistSQLConverter.getAlgorithmType(shardingAlgorithms.get(strategyConfig.getShardingAlgorithmName()));
switch (type) {
- case ShardingDistSQLConstants.STANDARD:
+ case ShardingConvertDistSQLConstants.STANDARD:
StandardShardingStrategyConfiguration
standardShardingStrategyConfig = (StandardShardingStrategyConfiguration)
strategyConfig;
-
stringBuilder.append(String.format(ShardingDistSQLConstants.SHARDING_STRATEGY_STANDARD,
strategyType, type, standardShardingStrategyConfig.getShardingColumn(),
algorithmDefinition));
+ stringBuilder
+
.append(String.format(ShardingConvertDistSQLConstants.SHARDING_STRATEGY_STANDARD,
strategyType, type, standardShardingStrategyConfig.getShardingColumn(),
algorithmDefinition));
break;
- case ShardingDistSQLConstants.COMPLEX:
+ case ShardingConvertDistSQLConstants.COMPLEX:
ComplexShardingStrategyConfiguration
complexShardingStrategyConfig = (ComplexShardingStrategyConfiguration)
strategyConfig;
-
stringBuilder.append(String.format(ShardingDistSQLConstants.SHARDING_STRATEGY_COMPLEX,
strategyType, type, complexShardingStrategyConfig.getShardingColumns(),
algorithmDefinition));
+ stringBuilder
+
.append(String.format(ShardingConvertDistSQLConstants.SHARDING_STRATEGY_COMPLEX,
strategyType, type, complexShardingStrategyConfig.getShardingColumns(),
algorithmDefinition));
break;
- case ShardingDistSQLConstants.HINT:
-
stringBuilder.append(String.format(ShardingDistSQLConstants.SHARDING_STRATEGY_HINT,
strategyType, type, algorithmDefinition));
+ case ShardingConvertDistSQLConstants.HINT:
+
stringBuilder.append(String.format(ShardingConvertDistSQLConstants.SHARDING_STRATEGY_HINT,
strategyType, type, algorithmDefinition));
break;
- case ShardingDistSQLConstants.NONE:
-
stringBuilder.append(String.format(ShardingDistSQLConstants.SHARDING_STRATEGY_NONE,
strategyType, "none"));
+ case ShardingConvertDistSQLConstants.NONE:
+
stringBuilder.append(String.format(ShardingConvertDistSQLConstants.SHARDING_STRATEGY_NONE,
strategyType, "none"));
break;
default:
break;
@@ -187,13 +188,13 @@ public final class
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
}
stringBuilder.append(DistSQLConstants.COMMA).append(System.lineSeparator());
String algorithmDefinition =
AlgorithmDistSQLConverter.getAlgorithmType(keyGenerators.get(keyGenerateStrategyConfig.getKeyGeneratorName()));
-
stringBuilder.append(String.format(ShardingDistSQLConstants.KEY_GENERATOR_STRATEGY,
keyGenerateStrategyConfig.getColumn(), algorithmDefinition));
+
stringBuilder.append(String.format(ShardingConvertDistSQLConstants.KEY_GENERATOR_STRATEGY,
keyGenerateStrategyConfig.getColumn(), algorithmDefinition));
}
private void appendAuditStrategy(final Map<String, AlgorithmConfiguration>
auditors, final ShardingAuditStrategyConfiguration auditStrategy, final
StringBuilder stringBuilder) {
if (null != auditStrategy) {
stringBuilder.append(DistSQLConstants.COMMA).append(System.lineSeparator());
-
stringBuilder.append(String.format(ShardingDistSQLConstants.AUDIT_STRATEGY,
getAlgorithmTypes(auditors, auditStrategy.getAuditorNames()),
auditStrategy.isAllowHintDisable()));
+
stringBuilder.append(String.format(ShardingConvertDistSQLConstants.AUDIT_STRATEGY,
getAlgorithmTypes(auditors, auditStrategy.getAuditorNames()),
auditStrategy.isAllowHintDisable()));
}
}
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/constant/SingleDistSQLConstants.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleConvertDistSQLConstants.java
similarity index 87%
rename from
kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/constant/SingleDistSQLConstants.java
rename to
kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleConvertDistSQLConstants.java
index 55a13e175bd..13cd6ffec1e 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/constant/SingleDistSQLConstants.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleConvertDistSQLConstants.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.single.distsql.handler.constant;
+package org.apache.shardingsphere.single.distsql.handler.converter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Single DistSQL constants.
+ * Single convert DistSQL constants.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SingleDistSQLConstants {
+public final class SingleConvertDistSQLConstants {
public static final String LOAD_SINGLE_TABLE = "LOAD SINGLE TABLE %s;";
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverter.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverter.java
index d882992490d..c37dae66122 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverter.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverter.java
@@ -20,7 +20,6 @@ package
org.apache.shardingsphere.single.distsql.handler.converter;
import com.google.common.base.Joiner;
import
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
-import
org.apache.shardingsphere.single.distsql.handler.constant.SingleDistSQLConstants;
/**
* Single rule configuration to DistSQL converter.
@@ -46,11 +45,11 @@ public final class
SingleRuleConfigurationToDistSQLConverter implements RuleConf
}
private String convertLoadTable(final SingleRuleConfiguration ruleConfig) {
- return String.format(SingleDistSQLConstants.LOAD_SINGLE_TABLE,
Joiner.on(",").join(ruleConfig.getTables()));
+ return String.format(SingleConvertDistSQLConstants.LOAD_SINGLE_TABLE,
Joiner.on(",").join(ruleConfig.getTables()));
}
private String convertSetDefaultSingleTableStorageUnit(final String
defaultStorageUnitName) {
- return
String.format(SingleDistSQLConstants.SET_DEFAULT_SINGLE_TABLE_STORAGE_UNIT,
defaultStorageUnitName);
+ return
String.format(SingleConvertDistSQLConstants.SET_DEFAULT_SINGLE_TABLE_STORAGE_UNIT,
defaultStorageUnitName);
}
@Override
