From 71598e5daaccfc23450b933fed526459b76448e6 Mon Sep 17 00:00:00 2001
From: stalary <stalary@163.com>
Date: Wed, 19 Aug 2020 10:48:40 +0800
Subject: [PATCH] MOD: replace toString with getProperties

---
 .../main/java/org/apache/doris/catalog/Catalog.java  |  2 +-
 .../doris/catalog/DynamicPartitionProperty.java      | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
index be45a50e12ebe9..466c84a0d026c1 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
@@ -4006,7 +4006,7 @@ public static void getDdlStmt(Table table, List<String> createTableStmt, List<St
 
             // dynamic partition
             if (olapTable.dynamicPartitionExists()) {
-                sb.append(olapTable.getTableProperty().getDynamicPartitionProperty().toString());
+                sb.append(olapTable.getTableProperty().getDynamicPartitionProperty().getProperties(replicationNum));
             }
 
             // in memory
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/DynamicPartitionProperty.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/DynamicPartitionProperty.java
index 8783acc7510ba4..f82db494d18615 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DynamicPartitionProperty.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DynamicPartitionProperty.java
@@ -141,15 +141,21 @@ public int getReplicationNum() {
         return replicationNum;
     }
 
-    @Override
-    public String toString() {
+    /**
+     * use table replication_num as dynamic_partition.replication_num default value
+     */
+    public String getProperties(int tableReplicationNum) {
+        int useReplicationNum = replicationNum;
+        if (useReplicationNum == NOT_SET_REPLICATION_NUM) {
+            useReplicationNum = tableReplicationNum;
+        }
         String res = ",\n\"" + ENABLE + "\" = \"" + enable + "\"" +
                 ",\n\"" + TIME_UNIT + "\" = \"" + timeUnit + "\"" +
                 ",\n\"" + TIME_ZONE + "\" = \"" + tz + "\"" +
                 ",\n\"" + START + "\" = \"" + start + "\"" +
                 ",\n\"" + END + "\" = \"" + end + "\"" +
                 ",\n\"" + PREFIX + "\" = \"" + prefix + "\"" +
-                ",\n\"" + REPLICATION_NUM + "\" = \"" + replicationNum + "\"" +
+                ",\n\"" + REPLICATION_NUM + "\" = \"" + useReplicationNum + "\"" +
                 ",\n\"" + BUCKETS + "\" = \"" + buckets + "\"";
         if (getTimeUnit().equalsIgnoreCase(TimeUnit.WEEK.toString())) {
             res += ",\n\"" + START_DAY_OF_WEEK + "\" = \"" + startOfWeek.dayOfWeek + "\"";