From 8840f6fa46159f83cb5b8aee83890935bb3ef28b Mon Sep 17 00:00:00 2001 From: ylinzhu <46126022+ylinzhu@users.noreply.github.com> Date: Thu, 21 Jul 2022 15:12:36 +0800 Subject: [PATCH] the groupConcatMaxLen parameter is omitted inner 1738 (#3318) fix # Conflicts: # src/main/java/com/actiontech/dble/singleton/SystemParams.java --- src/main/java/com/actiontech/dble/config/model/SystemConfig.java | 1 + src/main/java/com/actiontech/dble/singleton/SystemParams.java | 1 + src/main/resources/bootstrap_template.cnf | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/com/actiontech/dble/config/model/SystemConfig.java b/src/main/java/com/actiontech/dble/config/model/SystemConfig.java index f5c03accc..8e57126ea 100644 --- a/src/main/java/com/actiontech/dble/config/model/SystemConfig.java +++ b/src/main/java/com/actiontech/dble/config/model/SystemConfig.java @@ -1758,6 +1758,7 @@ public final class SystemConfig { ", routePenetrationRules='" + routePenetrationRules + '\'' + ", district='" + district + ", dataCenter='" + dataCenter + + ", groupConcatMaxLen='" + groupConcatMaxLen + "]"; } diff --git a/src/main/java/com/actiontech/dble/singleton/SystemParams.java b/src/main/java/com/actiontech/dble/singleton/SystemParams.java index fc3450565..2f683d054 100644 --- a/src/main/java/com/actiontech/dble/singleton/SystemParams.java +++ b/src/main/java/com/actiontech/dble/singleton/SystemParams.java @@ -152,6 +152,7 @@ public final class SystemParams { readOnlyParams.add(new ParamInfo("gmsslBothPfx", SystemConfig.getInstance().getGmsslBothPfx() + "", "National secret dual certificate/private key file in PFX format")); readOnlyParams.add(new ParamInfo("gmsslRcaPem", SystemConfig.getInstance().getGmsslRcaPem() + "", "Root certificate of GMSSL")); readOnlyParams.add(new ParamInfo("gmsslOcaPem", SystemConfig.getInstance().getGmsslOcaPem() + "", "Secondary certificate of GMSSL")); + readOnlyParams.add(new ParamInfo("groupConcatMaxLen", sysConfig.getGroupConcatMaxLen() + "", "The maximum permitted result length in bytes for the GROUP_CONCAT() function. The default is 1024.")); } diff --git a/src/main/resources/bootstrap_template.cnf b/src/main/resources/bootstrap_template.cnf index 383120aa2..37fde57b7 100644 --- a/src/main/resources/bootstrap_template.cnf +++ b/src/main/resources/bootstrap_template.cnf @@ -203,6 +203,7 @@ #For rwSplitUser, Implement stickiness for read and write instances, the default value is 1000ms #-DrwStickyTime=1000 #-DjoinStrategyType=-1 +#-DgroupConcatMaxLen = 1024 #-DserverCertificateKeyStoreUrl= #-DserverCertificateKeyStorePwd=