From 40ab4ce3053bdbcd355bb17537cdc4c3cc5207e2 Mon Sep 17 00:00:00 2001 From: yongjinhou <109586248+yongjinhou@users.noreply.github.com> Date: Thu, 18 May 2023 21:54:31 +0800 Subject: [PATCH] fix select resource groups bug (#19808) --- .../table-functions/resource-group.md | 18 +++++++++--------- .../table-functions/resource-group.md | 18 +++++++++--------- .../doris/tablefunction/MetadataGenerator.java | 3 +-- .../ResourceGroupsTableValuedFunction.java | 6 +++--- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/docs/en/docs/sql-manual/sql-functions/table-functions/resource-group.md b/docs/en/docs/sql-manual/sql-functions/table-functions/resource-group.md index 4ce022b31e..e0b1f75147 100644 --- a/docs/en/docs/sql-manual/sql-functions/table-functions/resource-group.md +++ b/docs/en/docs/sql-manual/sql-functions/table-functions/resource-group.md @@ -51,21 +51,21 @@ mysql> desc function resource_groups(); | Field | Type | Null | Key | Default | Extra | +-------+-------------+------+-------+---------+-------+ | Id | BIGINT | No | false | NULL | NONE | -| Name | VARCHAR(64) | No | false | NULL | NONE | -| Item | VARCHAR(64) | No | false | NULL | NONE | -| Value | INT | No | false | NULL | NONE | +| Name | STRING | No | false | NULL | NONE | +| Item | STRING | No | false | NULL | NONE | +| Value | STRING | No | false | NULL | NONE | +-------+-------------+------+-------+---------+-------+ ``` ### example ``` mysql> select * from resource_groups()\G -+-------+------------+-----------+-------+ -| Id | Name | Item | Value | -+-------+------------+-----------+-------+ -| 10076 | group_name | cpu_share | 1 | -| 10077 | group_test | cpu_share | 10 | -+-------+------------+-----------+-------+ ++-------+--------+--------------+-------+ +| Id | Name | Item | Value | ++-------+--------+--------------+-------+ +| 11001 | normal | memory_limit | 100% | +| 11001 | normal | cpu_share | 10 | ++-------+--------+--------------+-------+ ``` ### keywords diff --git a/docs/zh-CN/docs/sql-manual/sql-functions/table-functions/resource-group.md b/docs/zh-CN/docs/sql-manual/sql-functions/table-functions/resource-group.md index 737f00e6ab..5bc895f7a7 100644 --- a/docs/zh-CN/docs/sql-manual/sql-functions/table-functions/resource-group.md +++ b/docs/zh-CN/docs/sql-manual/sql-functions/table-functions/resource-group.md @@ -50,21 +50,21 @@ mysql> desc function resource_groups(); | Field | Type | Null | Key | Default | Extra | +-------+-------------+------+-------+---------+-------+ | Id | BIGINT | No | false | NULL | NONE | -| Name | VARCHAR(64) | No | false | NULL | NONE | -| Item | VARCHAR(64) | No | false | NULL | NONE | -| Value | INT | No | false | NULL | NONE | +| Name | STRING | No | false | NULL | NONE | +| Item | STRING | No | false | NULL | NONE | +| Value | STRING | No | false | NULL | NONE | +-------+-------------+------+-------+---------+-------+ ``` ### example ``` mysql> select * from resource_groups()\G -+-------+------------+-----------+-------+ -| Id | Name | Item | Value | -+-------+------------+-----------+-------+ -| 10076 | group_name | cpu_share | 1 | -| 10077 | group_test | cpu_share | 10 | -+-------+------------+-----------+-------+ ++-------+--------+--------------+-------+ +| Id | Name | Item | Value | ++-------+--------+--------------+-------+ +| 11001 | normal | memory_limit | 100% | +| 11001 | normal | cpu_share | 10 | ++-------+--------+--------------+-------+ ``` ### keywords diff --git a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java index b53b35cde6..79e0274868 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java @@ -250,11 +250,10 @@ public class MetadataGenerator { for (List rGroupsInfo : resourceGroupsInfo) { TRow trow = new TRow(); Long id = Long.valueOf(rGroupsInfo.get(0)); - int value = Integer.valueOf(rGroupsInfo.get(3)); trow.addToColumnValue(new TCell().setLongVal(id)); trow.addToColumnValue(new TCell().setStringVal(rGroupsInfo.get(1))); trow.addToColumnValue(new TCell().setStringVal(rGroupsInfo.get(2))); - trow.addToColumnValue(new TCell().setIntVal(value)); + trow.addToColumnValue(new TCell().setStringVal(rGroupsInfo.get(3))); dataBatch.add(trow); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/ResourceGroupsTableValuedFunction.java b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/ResourceGroupsTableValuedFunction.java index 11a1baee49..fbe844a99e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/ResourceGroupsTableValuedFunction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/ResourceGroupsTableValuedFunction.java @@ -74,9 +74,9 @@ public class ResourceGroupsTableValuedFunction extends MetadataTableValuedFuncti public List getTableColumns() throws AnalysisException { List resColumns = Lists.newArrayList(); resColumns.add(new Column("Id", ScalarType.createType(PrimitiveType.BIGINT))); - resColumns.add(new Column("Name", ScalarType.createVarchar(64))); - resColumns.add(new Column("Item", ScalarType.createVarchar(64))); - resColumns.add(new Column("Value", ScalarType.createType(PrimitiveType.INT))); + resColumns.add(new Column("Name", ScalarType.createStringType())); + resColumns.add(new Column("Item", ScalarType.createStringType())); + resColumns.add(new Column("Value", ScalarType.createStringType())); return resColumns; } }