diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/AggStateType.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/AggStateType.java index e28364103f..d2c5b625ca 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/catalog/AggStateType.java +++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/AggStateType.java @@ -90,6 +90,11 @@ public class AggStateType extends Type { return stringBuilder.toString(); } + @Override + public String toString() { + return toSql(); + } + @Override protected String prettyPrint(int lpad) { return Strings.repeat(" ", lpad) + toSql(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java index b0c4ecb252..45883fd6f4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java @@ -129,14 +129,13 @@ public class DescribeStmt extends ShowStmt { for (Column column : columns) { List row = Arrays.asList( column.getName(), - column.getOriginType().toString(), + column.getOriginType().hideVersionForVersionColumn(true), column.isAllowNull() ? "Yes" : "No", ((Boolean) column.isKey()).toString(), column.getDefaultValue() == null ? FeConstants.null_string : column.getDefaultValue(), "NONE" ); - row.set(1, column.getOriginType().hideVersionForVersionColumn(false)); totalRows.add(row); } return; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java index 60d1980d28..0f2fb911d4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java @@ -68,14 +68,12 @@ public class IndexSchemaProcNode implements ProcNodeInterface { String extraStr = StringUtils.join(extras, ","); List rowList = Arrays.asList(column.getDisplayName(), - column.getOriginType().toString(), + column.getOriginType().hideVersionForVersionColumn(true), column.isAllowNull() ? "Yes" : "No", ((Boolean) column.isKey()).toString(), column.getDefaultValue() == null ? FeConstants.null_string : column.getDefaultValue(), extraStr); - - rowList.set(1, column.getOriginType().hideVersionForVersionColumn(false)); result.addRow(rowList); } return result; diff --git a/regression-test/data/datatype_p0/agg_state/nereids/test_agg_state_nereids.out b/regression-test/data/datatype_p0/agg_state/nereids/test_agg_state_nereids.out index 03b46f74a4..8cdb1b8a59 100644 --- a/regression-test/data/datatype_p0/agg_state/nereids/test_agg_state_nereids.out +++ b/regression-test/data/datatype_p0/agg_state/nereids/test_agg_state_nereids.out @@ -14,6 +14,10 @@ -- !sum_null -- \N +-- !desc -- +k1 INT Yes true \N +k2 AGG_STATE No false \N GENERIC + -- !length1 -- 1 11 diff --git a/regression-test/data/datatype_p0/agg_state/test_agg_state.out b/regression-test/data/datatype_p0/agg_state/test_agg_state.out index 120a9844f6..0e1e5b6ed9 100644 --- a/regression-test/data/datatype_p0/agg_state/test_agg_state.out +++ b/regression-test/data/datatype_p0/agg_state/test_agg_state.out @@ -14,6 +14,10 @@ -- !sum_null -- \N +-- !desc -- +k1 INT Yes true \N +k2 AGG_STATE No false \N GENERIC + -- !length1 -- 1 11 diff --git a/regression-test/suites/datatype_p0/agg_state/nereids/test_agg_state_nereids.groovy b/regression-test/suites/datatype_p0/agg_state/nereids/test_agg_state_nereids.groovy index a302c27405..cc5f9d45ca 100644 --- a/regression-test/suites/datatype_p0/agg_state/nereids/test_agg_state_nereids.groovy +++ b/regression-test/suites/datatype_p0/agg_state/nereids/test_agg_state_nereids.groovy @@ -55,6 +55,8 @@ suite("test_agg_state_nereids") { properties("replication_num" = "1"); """ + qt_desc "desc a_table;" + sql "explain insert into a_table select 1,max_by_state(1,3);" sql "insert into a_table select 1,max_by_state(1,3);" diff --git a/regression-test/suites/datatype_p0/agg_state/test_agg_state.groovy b/regression-test/suites/datatype_p0/agg_state/test_agg_state.groovy index 78edeaaa34..515b74fdc1 100644 --- a/regression-test/suites/datatype_p0/agg_state/test_agg_state.groovy +++ b/regression-test/suites/datatype_p0/agg_state/test_agg_state.groovy @@ -52,6 +52,8 @@ suite("test_agg_state") { properties("replication_num" = "1"); """ + qt_desc "desc a_table;" + sql "insert into a_table select 1,max_by_state(1,3);" sql "insert into a_table select 1,max_by_state(2,2);" sql "insert into a_table values(1,max_by_state(3,1));"