This is an automated email from the ASF dual-hosted git repository.

wuweijie 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 406339a12f8 Add DistSQLConstants (#30983)
406339a12f8 is described below

commit 406339a12f851a2e2827871de702735aa6d59c72
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Apr 21 21:26:21 2024 +0800

    Add DistSQLConstants (#30983)
---
 .../handler/constant/EncryptDistSQLConstants.java  |  4 ----
 ...EncryptRuleConfigurationToDistSQLConverter.java | 15 +++++++------
 .../ReadwriteSplittingDistSQLConstants.java        |  4 ----
 ...littingRuleConfigurationToDistSQLConverter.java |  9 ++++----
 .../handler/constant/ShadowDistSQLConstants.java   |  4 ----
 .../ShadowRuleConfigurationToDistSQLConverter.java |  9 ++++----
 .../handler/constant/ShardingDistSQLConstants.java |  4 ----
 ...hardingRuleConfigurationToDistSQLConverter.java | 25 +++++++++++-----------
 .../distsql/handler/constant/DistSQLConstants.java | 20 +++--------------
 9 files changed, 34 insertions(+), 60 deletions(-)

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/constant/EncryptDistSQLConstants.java
index 0f638c7e2b4..fdf7f15c0ed 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/constant/EncryptDistSQLConstants.java
@@ -26,10 +26,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class EncryptDistSQLConstants {
     
-    public static final String COMMA = ",";
-    
-    public static final String SEMI = ";";
-    
     public static final String CREATE_ENCRYPT = "CREATE ENCRYPT RULE";
     
     public static final String ENCRYPT = " %s ("
diff --git 
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptRuleConfigurationToDistSQLConverter.java
 
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptRuleConfigurationToDistSQLConverter.java
index b14d2aab2f6..6b925e814b6 100644
--- 
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptRuleConfigurationToDistSQLConverter.java
+++ 
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptRuleConfigurationToDistSQLConverter.java
@@ -18,6 +18,7 @@
 package org.apache.shardingsphere.encrypt.distsql.handler.provider;
 
 import com.google.common.base.Strings;
+import org.apache.shardingsphere.distsql.handler.constant.DistSQLConstants;
 import 
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.AlgorithmDistSQLConverter;
 import 
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.RuleConfigurationToDistSQLConverter;
 import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
@@ -47,10 +48,10 @@ public final class 
EncryptRuleConfigurationToDistSQLConverter implements RuleCon
             EncryptTableRuleConfiguration tableRuleConfig = iterator.next();
             result.append(String.format(EncryptDistSQLConstants.ENCRYPT, 
tableRuleConfig.getName(), getEncryptColumns(tableRuleConfig.getColumns(), 
ruleConfig.getEncryptors())));
             if (iterator.hasNext()) {
-                
result.append(EncryptDistSQLConstants.COMMA).append(System.lineSeparator());
+                
result.append(DistSQLConstants.COMMA).append(System.lineSeparator());
             }
         }
-        result.append(EncryptDistSQLConstants.SEMI);
+        result.append(DistSQLConstants.SEMI);
         return result.toString();
     }
     
@@ -61,7 +62,7 @@ public final class EncryptRuleConfigurationToDistSQLConverter 
implements RuleCon
             EncryptColumnRuleConfiguration columnRuleConfig = iterator.next();
             
result.append(String.format(EncryptDistSQLConstants.ENCRYPT_COLUMN, 
columnRuleConfig.getName(), getColumns(columnRuleConfig), 
getEncryptAlgorithms(columnRuleConfig, encryptors)));
             if (iterator.hasNext()) {
-                
result.append(EncryptDistSQLConstants.COMMA).append(System.lineSeparator());
+                
result.append(DistSQLConstants.COMMA).append(System.lineSeparator());
             }
         }
         return result.toString();
@@ -74,10 +75,10 @@ public final class 
EncryptRuleConfigurationToDistSQLConverter implements RuleCon
             result.append(String.format(EncryptDistSQLConstants.CIPHER, 
cipherColumnName));
         }
         if (ruleConfig.getAssistedQuery().isPresent()) {
-            result.append(EncryptDistSQLConstants.COMMA).append(' 
').append(String.format(EncryptDistSQLConstants.ASSISTED_QUERY_COLUMN, 
ruleConfig.getAssistedQuery().get().getName()));
+            result.append(DistSQLConstants.COMMA).append(' 
').append(String.format(EncryptDistSQLConstants.ASSISTED_QUERY_COLUMN, 
ruleConfig.getAssistedQuery().get().getName()));
         }
         if (ruleConfig.getLikeQuery().isPresent()) {
-            result.append(EncryptDistSQLConstants.COMMA).append(' 
').append(String.format(EncryptDistSQLConstants.LIKE_QUERY_COLUMN, 
ruleConfig.getLikeQuery().get().getName()));
+            result.append(DistSQLConstants.COMMA).append(' 
').append(String.format(EncryptDistSQLConstants.LIKE_QUERY_COLUMN, 
ruleConfig.getLikeQuery().get().getName()));
         }
         return result.toString();
     }
@@ -91,11 +92,11 @@ public final class 
EncryptRuleConfigurationToDistSQLConverter implements RuleCon
             
result.append(String.format(EncryptDistSQLConstants.ENCRYPT_ALGORITHM, 
AlgorithmDistSQLConverter.getAlgorithmType(encryptors.get(cipherEncryptorName))));
         }
         if (!Strings.isNullOrEmpty(assistedQueryEncryptorName)) {
-            result.append(EncryptDistSQLConstants.COMMA).append(' ')
+            result.append(DistSQLConstants.COMMA).append(' ')
                     
.append(String.format(EncryptDistSQLConstants.ASSISTED_QUERY_ALGORITHM, 
AlgorithmDistSQLConverter.getAlgorithmType(encryptors.get(assistedQueryEncryptorName))));
         }
         if (!Strings.isNullOrEmpty(likeQueryEncryptorName)) {
-            result.append(EncryptDistSQLConstants.COMMA).append(' ')
+            result.append(DistSQLConstants.COMMA).append(' ')
                     
.append(String.format(EncryptDistSQLConstants.LIKE_QUERY_ALGORITHM, 
AlgorithmDistSQLConverter.getAlgorithmType(encryptors.get(likeQueryEncryptorName))));
         }
         return result.toString();
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/constant/ReadwriteSplittingDistSQLConstants.java
index 4a022b9e7cb..26330f7494b 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/constant/ReadwriteSplittingDistSQLConstants.java
@@ -26,10 +26,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ReadwriteSplittingDistSQLConstants {
     
-    public static final String COMMA = ",";
-    
-    public static final String SEMI = ";";
-    
     public static final String CREATE_READWRITE_SPLITTING_RULE = "CREATE 
READWRITE_SPLITTING RULE";
     
     public static final String READWRITE_SPLITTING_FOR_STATIC = " %s ("
diff --git 
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
 
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
index 0b6780e50f1..00f75fea061 100644
--- 
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
+++ 
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
@@ -18,6 +18,7 @@
 package org.apache.shardingsphere.readwritesplitting.distsql.handler.provider;
 
 import com.google.common.base.Strings;
+import org.apache.shardingsphere.distsql.handler.constant.DistSQLConstants;
 import 
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.AlgorithmDistSQLConverter;
 import 
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.RuleConfigurationToDistSQLConverter;
 import 
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
@@ -44,10 +45,10 @@ public final class 
ReadwriteSplittingRuleConfigurationToDistSQLConverter impleme
         while (iterator.hasNext()) {
             appendStaticReadWriteSplittingRule(ruleConfig.getLoadBalancers(), 
iterator.next(), result);
             if (iterator.hasNext()) {
-                result.append(ReadwriteSplittingDistSQLConstants.COMMA);
+                result.append(DistSQLConstants.COMMA);
             }
         }
-        result.append(ReadwriteSplittingDistSQLConstants.SEMI);
+        result.append(DistSQLConstants.SEMI);
         return result.toString();
     }
     
@@ -66,7 +67,7 @@ public final class 
ReadwriteSplittingRuleConfigurationToDistSQLConverter impleme
         while (iterator.hasNext()) {
             
result.append(String.format(ReadwriteSplittingDistSQLConstants.READ_RESOURCE, 
iterator.next()));
             if (iterator.hasNext()) {
-                result.append(ReadwriteSplittingDistSQLConstants.COMMA);
+                result.append(DistSQLConstants.COMMA);
             }
         }
         return result.toString();
@@ -76,7 +77,7 @@ public final class 
ReadwriteSplittingRuleConfigurationToDistSQLConverter impleme
         StringBuilder result = new StringBuilder();
         String loadBalancerType = 
AlgorithmDistSQLConverter.getAlgorithmType(algorithmConfig);
         if (!Strings.isNullOrEmpty(loadBalancerType)) {
-            
result.append(ReadwriteSplittingDistSQLConstants.COMMA).append(System.lineSeparator()).append(loadBalancerType);
+            
result.append(DistSQLConstants.COMMA).append(System.lineSeparator()).append(loadBalancerType);
         }
         return result.toString();
     }
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/constant/ShadowDistSQLConstants.java
index dec7d424cf1..5fa04ea9f6a 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/constant/ShadowDistSQLConstants.java
@@ -26,10 +26,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ShadowDistSQLConstants {
     
-    public static final String COMMA = ",";
-    
-    public static final String SEMI = ";";
-    
     public static final String CREATE_SHADOW = "CREATE SHADOW RULE";
     
     public static final String SHADOW = " %s("
diff --git 
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowRuleConfigurationToDistSQLConverter.java
 
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowRuleConfigurationToDistSQLConverter.java
index f436647ebb4..45975d5a6dd 100644
--- 
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowRuleConfigurationToDistSQLConverter.java
+++ 
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowRuleConfigurationToDistSQLConverter.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.shadow.distsql.handler.provider;
 
+import org.apache.shardingsphere.distsql.handler.constant.DistSQLConstants;
 import 
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.AlgorithmDistSQLConverter;
 import 
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.RuleConfigurationToDistSQLConverter;
 import 
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
@@ -47,10 +48,10 @@ public final class 
ShadowRuleConfigurationToDistSQLConverter implements RuleConf
             String shadowTables = getShadowTables(shadowRuleName, 
ruleConfig.getTables(), ruleConfig.getShadowAlgorithms());
             result.append(String.format(ShadowDistSQLConstants.SHADOW, 
shadowRuleName, dataSourceConfig.getProductionDataSourceName(), 
dataSourceConfig.getShadowDataSourceName(), shadowTables));
             if (iterator.hasNext()) {
-                result.append(ShadowDistSQLConstants.COMMA);
+                result.append(DistSQLConstants.COMMA);
             }
         }
-        result.append(ShadowDistSQLConstants.SEMI);
+        result.append(DistSQLConstants.SEMI);
         return result.toString();
     }
     
@@ -64,7 +65,7 @@ public final class ShadowRuleConfigurationToDistSQLConverter 
implements RuleConf
                 
result.append(String.format(ShadowDistSQLConstants.SHADOW_TABLE, 
shadowTableConfig.getKey(), shadowTableTypes));
             }
             if (iterator.hasNext()) {
-                
result.append(ShadowDistSQLConstants.COMMA).append(System.lineSeparator());
+                
result.append(DistSQLConstants.COMMA).append(System.lineSeparator());
             }
         }
         return result.toString();
@@ -76,7 +77,7 @@ public final class ShadowRuleConfigurationToDistSQLConverter 
implements RuleConf
         while (iterator.hasNext()) {
             
result.append(AlgorithmDistSQLConverter.getAlgorithmType(algorithmConfigs.get(iterator.next())));
             if (iterator.hasNext()) {
-                result.append(ShadowDistSQLConstants.COMMA).append(' ');
+                result.append(DistSQLConstants.COMMA).append(' ');
             }
         }
         return result.toString();
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/constant/ShardingDistSQLConstants.java
index d0a3f03ecca..14e581a6c3b 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/constant/ShardingDistSQLConstants.java
@@ -34,10 +34,6 @@ public final class ShardingDistSQLConstants {
     
     public static final String NONE = "";
     
-    public static final String COMMA = ",";
-    
-    public static final String SEMI = ";";
-    
     public static final String CREATE_SHARDING_TABLE = "CREATE SHARDING TABLE 
RULE";
     
     public static final String SHARDING_TABLE = " %s ("
diff --git 
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingRuleConfigurationToDistSQLConverter.java
 
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingRuleConfigurationToDistSQLConverter.java
index b538e50793d..e73acb9d7f5 100644
--- 
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingRuleConfigurationToDistSQLConverter.java
+++ 
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingRuleConfigurationToDistSQLConverter.java
@@ -18,6 +18,7 @@
 package org.apache.shardingsphere.sharding.distsql.handler.provider;
 
 import com.google.common.base.Strings;
+import org.apache.shardingsphere.distsql.handler.constant.DistSQLConstants;
 import 
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.AlgorithmDistSQLConverter;
 import 
org.apache.shardingsphere.distsql.handler.engine.query.ral.convert.RuleConfigurationToDistSQLConverter;
 import 
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
@@ -65,9 +66,9 @@ public final class 
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
         String autoTableRules = getAutoTableRules(ruleConfig);
         
stringBuilder.append(ShardingDistSQLConstants.CREATE_SHARDING_TABLE).append(tableRules);
         if (!Strings.isNullOrEmpty(tableRules) && 
!Strings.isNullOrEmpty(autoTableRules)) {
-            stringBuilder.append(ShardingDistSQLConstants.COMMA);
+            stringBuilder.append(DistSQLConstants.COMMA);
         }
-        
stringBuilder.append(autoTableRules).append(ShardingDistSQLConstants.SEMI);
+        stringBuilder.append(autoTableRules).append(DistSQLConstants.SEMI);
     }
     
     private void appendShardingBindingTableRules(final 
ShardingRuleConfiguration ruleConfig, final StringBuilder stringBuilder) {
@@ -77,23 +78,23 @@ public final class 
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
             ShardingTableReferenceRuleConfiguration referenceRuleConfig = 
iterator.next();
             
stringBuilder.append(String.format(ShardingDistSQLConstants.BINDING_TABLES, 
referenceRuleConfig.getName(), referenceRuleConfig.getReference()));
             if (iterator.hasNext()) {
-                stringBuilder.append(ShardingDistSQLConstants.COMMA);
+                stringBuilder.append(DistSQLConstants.COMMA);
             }
         }
-        stringBuilder.append(ShardingDistSQLConstants.SEMI);
+        stringBuilder.append(DistSQLConstants.SEMI);
     }
     
     private void appendDefaultShardingStrategy(final ShardingRuleConfiguration 
ruleConfig, final StringBuilder result) {
         if (null != ruleConfig.getDefaultDatabaseShardingStrategy()) {
             appendStrategy(ruleConfig.getDefaultDatabaseShardingStrategy(), 
ShardingDistSQLConstants.DEFAULT_DATABASE_STRATEGY, result, 
ruleConfig.getShardingAlgorithms());
-            result.append(ShardingDistSQLConstants.SEMI);
+            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());
-            result.append(ShardingDistSQLConstants.SEMI);
+            result.append(DistSQLConstants.SEMI);
         }
     }
     
@@ -106,7 +107,7 @@ public final class 
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
                 
result.append(String.format(ShardingDistSQLConstants.SHARDING_TABLE, 
tableRuleConfig.getLogicTable(), tableRuleConfig.getActualDataNodes(),
                         appendTableStrategy(tableRuleConfig, ruleConfig)));
                 if (iterator.hasNext()) {
-                    result.append(ShardingDistSQLConstants.COMMA);
+                    result.append(DistSQLConstants.COMMA);
                 }
             }
         }
@@ -122,7 +123,7 @@ public final class 
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
                 
result.append(String.format(ShardingDistSQLConstants.SHARDING_AUTO_TABLE, 
autoTableRuleConfig.getLogicTable(), autoTableRuleConfig.getActualDataSources(),
                         appendAutoTableStrategy(autoTableRuleConfig, 
ruleConfig)));
                 if (iterator.hasNext()) {
-                    result.append(ShardingDistSQLConstants.COMMA);
+                    result.append(DistSQLConstants.COMMA);
                 }
             }
         }
@@ -155,7 +156,7 @@ public final class 
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
             return;
         }
         if (Objects.equals(strategyType, 
ShardingDistSQLConstants.DATABASE_STRATEGY) || Objects.equals(strategyType, 
ShardingDistSQLConstants.TABLE_STRATEGY)) {
-            
stringBuilder.append(ShardingDistSQLConstants.COMMA).append(System.lineSeparator());
+            
stringBuilder.append(DistSQLConstants.COMMA).append(System.lineSeparator());
         }
         String type = strategyConfig.getType().toLowerCase();
         String algorithmDefinition = 
AlgorithmDistSQLConverter.getAlgorithmType(shardingAlgorithms.get(strategyConfig.getShardingAlgorithmName()));
@@ -184,14 +185,14 @@ public final class 
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
         if (null == keyGenerateStrategyConfig) {
             return;
         }
-        
stringBuilder.append(ShardingDistSQLConstants.COMMA).append(System.lineSeparator());
+        
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));
     }
     
     private void appendAuditStrategy(final Map<String, AlgorithmConfiguration> 
auditors, final ShardingAuditStrategyConfiguration auditStrategy, final 
StringBuilder stringBuilder) {
         if (null != auditStrategy) {
-            
stringBuilder.append(ShardingDistSQLConstants.COMMA).append(System.lineSeparator());
+            
stringBuilder.append(DistSQLConstants.COMMA).append(System.lineSeparator());
             
stringBuilder.append(String.format(ShardingDistSQLConstants.AUDIT_STRATEGY, 
getAlgorithmTypes(auditors, auditStrategy.getAuditorNames()), 
auditStrategy.isAllowHintDisable()));
         }
     }
@@ -203,7 +204,7 @@ public final class 
ShardingRuleConfigurationToDistSQLConverter implements RuleCo
             while (iterator.hasNext()) {
                 
result.append(AlgorithmDistSQLConverter.getAlgorithmType(auditors.get(iterator.next())));
                 if (iterator.hasNext()) {
-                    result.append(ShardingDistSQLConstants.COMMA);
+                    result.append(DistSQLConstants.COMMA);
                 }
             }
         }
diff --git 
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/constant/ShadowDistSQLConstants.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/constant/DistSQLConstants.java
similarity index 64%
copy from 
features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/constant/ShadowDistSQLConstants.java
copy to 
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/constant/DistSQLConstants.java
index dec7d424cf1..9116ff178af 100644
--- 
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/constant/ShadowDistSQLConstants.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/constant/DistSQLConstants.java
@@ -15,32 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.shadow.distsql.handler.constant;
+package org.apache.shardingsphere.distsql.handler.constant;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
 /**
- * Shadow DistSQL constants.
+ * DistSQL constants.
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ShadowDistSQLConstants {
+public final class DistSQLConstants {
     
     public static final String COMMA = ",";
     
     public static final String SEMI = ";";
-    
-    public static final String CREATE_SHADOW = "CREATE SHADOW RULE";
-    
-    public static final String SHADOW = " %s("
-            + System.lineSeparator()
-            + "SOURCE=%s,"
-            + System.lineSeparator()
-            + "SHADOW=%s,"
-            + System.lineSeparator()
-            + "%s"
-            + System.lineSeparator()
-            + ")";
-    
-    public static final String SHADOW_TABLE = "%s(%s)";
 }

Reply via email to