(shardingsphere) branch master updated: Fix unexpected line separators in ConvertYamlConfiguration (#30137)

[jianglongtao]

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

jianglongtao 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 878559a2a6b Fix unexpected line separators in ConvertYamlConfiguration 
(#30137)
878559a2a6b is described below

commit 878559a2a6bd1da8e4a19ed3b5cbac35f6c382af
Author: yx9o <yangx_s...@163.com>
AuthorDate: Sun Feb 18 10:17:42 2024 +0800

    Fix unexpected line separators in ConvertYamlConfiguration (#30137)
---
 .../provider/ShardingConvertRuleConfigurationProvider.java |  2 +-
 .../src/test/resources/conf/convert/config-sharding.yaml   | 14 ++++++++++++++
 .../core/src/test/resources/expected/convert-sharding.yaml |  6 ++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git 
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
 
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
index 9f903115065..29586b561aa 100644
--- 
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
+++ 
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
@@ -60,7 +60,7 @@ public final class ShardingConvertRuleConfigurationProvider 
implements ConvertRu
         String autoTableRules = getAutoTableRules(ruleConfig);
         
stringBuilder.append(ShardingDistSQLConstants.CREATE_SHARDING_TABLE).append(tableRules);
         if (!Strings.isNullOrEmpty(tableRules) && 
!Strings.isNullOrEmpty(autoTableRules)) {
-            
stringBuilder.append(ShardingDistSQLConstants.COMMA).append(System.lineSeparator());
+            stringBuilder.append(ShardingDistSQLConstants.COMMA);
         }
         
stringBuilder.append(autoTableRules).append(ShardingDistSQLConstants.SEMI).append(System.lineSeparator()).append(System.lineSeparator());
     }
diff --git 
a/proxy/backend/core/src/test/resources/conf/convert/config-sharding.yaml 
b/proxy/backend/core/src/test/resources/conf/convert/config-sharding.yaml
index 47293f1d007..e373a5995e1 100644
--- a/proxy/backend/core/src/test/resources/conf/convert/config-sharding.yaml
+++ b/proxy/backend/core/src/test/resources/conf/convert/config-sharding.yaml
@@ -67,6 +67,16 @@ rules:
      keyGenerateStrategy:
        column: order_item_id
        keyGeneratorName: snowflake
+ autoTables:
+   t_account:
+     actualDataSources: ds_0,ds_1
+     shardingStrategy:
+       standard:
+         shardingAlgorithmName: auto_mod
+     keyGenerateStrategy:
+       column: account_id
+       keyGeneratorName: snowflake
+
  defaultDatabaseStrategy:
    standard:
      shardingColumn: user_id
@@ -98,6 +108,10 @@ rules:
      type: HINT_INLINE
      props:
        algorithm-expression: ds_${Integer.valueOf(value) % 2}
+   auto_mod:
+     type: MOD
+     props:
+       sharding-count: 4
 
  keyGenerators:
    snowflake:
diff --git 
a/proxy/backend/core/src/test/resources/expected/convert-sharding.yaml 
b/proxy/backend/core/src/test/resources/expected/convert-sharding.yaml
index 5d5a5bc77f9..9acaf3d4eb3 100644
--- a/proxy/backend/core/src/test/resources/expected/convert-sharding.yaml
+++ b/proxy/backend/core/src/test/resources/expected/convert-sharding.yaml
@@ -41,6 +41,12 @@ DATABASE_STRATEGY(TYPE='hint', 
SHARDING_ALGORITHM(TYPE(NAME='hint_inline', PROPE
 TABLE_STRATEGY(TYPE='complex', SHARDING_COLUMNS=order_id, user_id, 
SHARDING_ALGORITHM(TYPE(NAME='inline', 
PROPERTIES('algorithm-expression'='t_order_item_${order_id % 2}', 
'datetime-lower'='2022-01-01 00:00:00')))),
 KEY_GENERATE_STRATEGY(COLUMN=order_item_id, TYPE(NAME='snowflake')),
 AUDIT_STRATEGY(TYPE(NAME='dml_sharding_conditions'), ALLOW_HINT_DISABLE=true)
+), t_account (
+STORAGE_UNITS(ds_0,ds_1),
+SHARDING_COLUMN=null,
+TYPE(NAME='mod', PROPERTIES('sharding-count'='4')),
+KEY_GENERATE_STRATEGY(COLUMN=account_id, TYPE(NAME='snowflake')),
+AUDIT_STRATEGY(TYPE(NAME='dml_sharding_conditions'), ALLOW_HINT_DISABLE=true)
 );
 
 CREATE DEFAULT SHARDING DATABASE STRATEGY(TYPE='standard', 
SHARDING_COLUMN=user_id, SHARDING_ALGORITHM(TYPE(NAME='inline', 
PROPERTIES('algorithm-expression'='ds_${user_id % 2}', 
'datetime-lower'='2022-01-01 00:00:00'))));