[doris] branch master updated: [fix] fix api of table schema in http v2 (#10476)

[morningman]

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

morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 4e00584e40 [fix] fix api of table schema in http v2 (#10476)
4e00584e40 is described below

commit 4e00584e4006b9df89aafd1fd4db856f2bbc54ba
Author: Jing Shen <shenjing.j...@bytedance.com>
AuthorDate: Sun Jul 3 23:20:03 2022 +0800

    [fix] fix api of table schema in http v2 (#10476)
    
    schema in this api should be a list, just like in v1
---
 .../doris/httpv2/restv2/MetaInfoActionV2.java      | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java 
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java
index a122ca335d..4b3b6cae5d 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java
@@ -48,6 +48,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -174,7 +175,7 @@ public class MetaInfoActionV2 extends RestBaseController {
      *         "schemaInfo": {
      *             "schemaMap": {
      *                 "tbl1": {
-     *                     "schema": {
+     *                     "schema": [{
      *                         "field": "k2",
      *                         "type": "INT",
      *                         "isNull": "true",
@@ -182,7 +183,7 @@ public class MetaInfoActionV2 extends RestBaseController {
      *                         "key": "true",
      *                         "aggrType": "None",
      *                         "comment": ""
-     *                     },
+     *                     }],
      *                     "keyType": "DUP_KEYS",
      *                     "baseIndex": true
      *                 }
@@ -238,7 +239,7 @@ public class MetaInfoActionV2 extends RestBaseController {
             TableSchema baseTableSchema = new TableSchema();
             baseTableSchema.setBaseIndex(true);
             
baseTableSchema.setKeyType(olapTable.getKeysTypeByIndexId(baseIndexId).name());
-            Schema baseSchema = 
generateSchame(olapTable.getSchemaByIndexId(baseIndexId));
+            List<Schema> baseSchema = 
generateSchame(olapTable.getSchemaByIndexId(baseIndexId));
             baseTableSchema.setSchema(baseSchema);
             schemaMap.put(olapTable.getIndexNameById(baseIndexId), 
baseTableSchema);
 
@@ -247,7 +248,7 @@ public class MetaInfoActionV2 extends RestBaseController {
                     TableSchema tableSchema = new TableSchema();
                     tableSchema.setBaseIndex(false);
                     
tableSchema.setKeyType(olapTable.getKeysTypeByIndexId(indexId).name());
-                    Schema schema = 
generateSchame(olapTable.getSchemaByIndexId(indexId));
+                    List<Schema> schema = 
generateSchame(olapTable.getSchemaByIndexId(indexId));
                     tableSchema.setSchema(schema);
                     schemaMap.put(olapTable.getIndexNameById(indexId), 
tableSchema);
                 }
@@ -256,7 +257,7 @@ public class MetaInfoActionV2 extends RestBaseController {
         } else {
             TableSchema tableSchema = new TableSchema();
             tableSchema.setBaseIndex(false);
-            Schema schema = generateSchame(tbl.getBaseSchema());
+            List<Schema> schema = generateSchame(tbl.getBaseSchema());
             tableSchema.setSchema(schema);
             schemaMap.put(tbl.getName(), tableSchema);
             schemaInfo.setSchemaMap(schemaMap);
@@ -265,9 +266,9 @@ public class MetaInfoActionV2 extends RestBaseController {
         return schemaInfo;
     }
 
-    private Schema generateSchame(List<Column> columns) {
-        Schema schema = new Schema();
-        for (Column column : columns) {
+    private List<Schema> generateSchame(List<Column> columns) {
+        return columns.stream().map(column -> {
+            Schema schema = new Schema();
             schema.setField(column.getName());
             schema.setType(column.getType().toString());
             schema.setIsNull(String.valueOf(column.isAllowNull()));
@@ -276,8 +277,8 @@ public class MetaInfoActionV2 extends RestBaseController {
             schema.setAggrType(column.getAggregationType() == null
                     ? "None" : column.getAggregationType().toString());
             schema.setComment(column.getComment());
-        }
-        return schema;
+            return schema;
+        }).collect(Collectors.toList());
     }
 
     private void generateResult(Table tbl, boolean isBaseIndex,
@@ -368,7 +369,7 @@ public class MetaInfoActionV2 extends RestBaseController {
     @Getter
     @Setter
     public static class TableSchema {
-        private Schema schema;
+        private List<Schema> schema;
         private boolean isBaseIndex;
         private String keyType;
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org