From c5b1c84a69bf59c12d2ed56975750f231c1e370b Mon Sep 17 00:00:00 2001
From: eldenmoon <15605149486@163.com>
Date: Sat, 11 Feb 2023 14:25:50 +0800
Subject: [PATCH] [improve](dynamic-table) change `addColumns` RPC interface
 fields from `required` to `optional` and and config doc

---
 docs/en/docs/admin-manual/config/be-config.md        |  5 +++++
 docs/zh-CN/docs/admin-manual/config/be-config.md     |  5 +++++
 .../apache/doris/service/FrontendServiceImpl.java    | 10 +++++++---
 gensrc/thrift/FrontendService.thrift                 | 12 ++++++------
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/docs/en/docs/admin-manual/config/be-config.md b/docs/en/docs/admin-manual/config/be-config.md
index 14e76bacd71a07..180e36f5b7b8ae 100644
--- a/docs/en/docs/admin-manual/config/be-config.md
+++ b/docs/en/docs/admin-manual/config/be-config.md
@@ -1410,4 +1410,9 @@ Indicates how many tablets failed to load in the data directory. At the same tim
 * Description: Default dirs to put jdbc drivers.
 * Default value: `${DORIS_HOME}/jdbc_drivers`
 
+#### `enable_parse_multi_dimession_array`
+
+* Description: Whether parse multidimensional array, if false encountering will return ERROR
+* Default value: true
+
 </version>
diff --git a/docs/zh-CN/docs/admin-manual/config/be-config.md b/docs/zh-CN/docs/admin-manual/config/be-config.md
index 4e93cff62bdd4b..734e264b405d64 100644
--- a/docs/zh-CN/docs/admin-manual/config/be-config.md
+++ b/docs/zh-CN/docs/admin-manual/config/be-config.md
@@ -1428,4 +1428,9 @@ load tablets from header failed, failed tablets size: xxx, path=xxx
 * 描述: 存放 jdbc driver 的默认目录。
 * 默认值: `${DORIS_HOME}/jdbc_drivers`
 
+#### `enable_parse_multi_dimession_array`
+
+* 描述: 在动态表中是否解析多维数组，如果是false遇到多维数组则会报错。
+* 默认值: true
+
 </version>
diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index 0789a2b72c7c65..1e35ca0ecfc521 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -255,8 +255,8 @@ public TAddColumnsResult addColumns(TAddColumnsRequest request) throws TExceptio
             if (!env.isMaster()) {
                 status.setStatusCode(TStatusCode.ILLEGAL_STATE);
                 status.addToErrorMsgs("retry rpc request to master.");
-                TAddColumnsResult result = new TAddColumnsResult(status, request.getTableId(), allColumns, 0);
-                LOG.debug("result: {}", result);
+                TAddColumnsResult result = new TAddColumnsResult();
+                result.setStatus(status);
                 return result;
             }
             TableName tableName = new TableName("", request.getDbName(), request.getTableName());
@@ -378,7 +378,11 @@ public int getAsInt() {
             status.addToErrorMsgs(e.getMessage());
         }
 
-        TAddColumnsResult result = new TAddColumnsResult(status, request.getTableId(), allColumns, schemaVersion);
+        TAddColumnsResult result = new TAddColumnsResult();
+        result.setStatus(status);
+        result.setTableId(request.getTableId());
+        result.setAllColumns(allColumns);
+        result.setSchemaVersion(schemaVersion);
         LOG.debug("result: {}", result);
         return result;
     }
diff --git a/gensrc/thrift/FrontendService.thrift b/gensrc/thrift/FrontendService.thrift
index be331f52038d35..f6cdf61a3a809a 100644
--- a/gensrc/thrift/FrontendService.thrift
+++ b/gensrc/thrift/FrontendService.thrift
@@ -719,8 +719,8 @@ struct TFetchSchemaTableDataResult {
 
 // Only support base table add columns
 struct TAddColumnsRequest {
-    1: required i64 table_id
-    2: required list<TColumnDef> addColumns
+    1: optional i64 table_id
+    2: optional list<TColumnDef> addColumns
     3: optional string table_name
     4: optional string db_name
     5: optional bool allow_type_conflict 
@@ -728,10 +728,10 @@ struct TAddColumnsRequest {
 
 // Only support base table add columns
 struct TAddColumnsResult {
-    1: required Status.TStatus status
-    2: required i64 table_id
-    3: required list<Descriptors.TColumn> allColumns
-    4: required i32 schema_version
+    1: optional Status.TStatus status
+    2: optional i64 table_id
+    3: optional list<Descriptors.TColumn> allColumns
+    4: optional i32 schema_version
 }
 
 service FrontendService {