This is an automated email from the ASF dual-hosted git repository.
panxiaolei 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 e77da1519a [Enchancement](materialized-view) adjust desc table all
display fields (#18357)
e77da1519a is described below
commit e77da1519ad0d3b765a664d691b1b76f3b0e1790
Author: Pxl <[email protected]>
AuthorDate: Fri Apr 7 11:14:17 2023 +0800
[Enchancement](materialized-view) adjust desc table all display fields
(#18357)
adjust desc table all display fields
---
.../org/apache/doris/analysis/DescribeStmt.java | 6 ++-
.../org/apache/doris/planner/OlapScanNode.java | 6 ++-
.../data/rollup/test_materialized_view_hll.out | 16 +++---
.../test_materialized_view_hll_with_light_sc.out | 16 +++---
.../data/rollup_p0/test_materialized_view.out | 60 +++++++++++-----------
regression-test/data/rollup_p0/test_rollup_agg.out | 20 ++++----
.../data/rollup_p0/test_rollup_agg_date.out | 36 ++++++-------
7 files changed, 82 insertions(+), 78 deletions(-)
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 c03e58e966..c9e6c9791c 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
@@ -72,6 +72,7 @@ public class DescribeStmt extends ShowStmt {
.addColumn(new Column("Default",
ScalarType.createVarchar(30)))
.addColumn(new Column("Extra",
ScalarType.createVarchar(30)))
.addColumn(new Column("Visible",
ScalarType.createVarchar(10)))
+ .addColumn(new Column("DefineExpr",
ScalarType.createVarchar(30)))
.addColumn(new Column("WhereClause",
ScalarType.createVarchar(30)))
.build();
@@ -121,7 +122,7 @@ public class DescribeStmt extends ShowStmt {
List<Column> columns =
tableValuedFunctionRef.getTable().getBaseSchema();
for (Column column : columns) {
List<String> row = Arrays.asList(
- column.getDisplayName(),
+ column.getName(),
column.getOriginType().toString(),
column.isAllowNull() ? "Yes" : "No",
((Boolean) column.isKey()).toString(),
@@ -202,7 +203,7 @@ public class DescribeStmt extends ShowStmt {
List<String> row = Arrays.asList(
"",
"",
- column.getDisplayName(),
+ column.getName(),
column.getOriginType().toString(),
column.isAllowNull() ? "Yes" : "No",
((Boolean) column.isKey()).toString(),
@@ -211,6 +212,7 @@ public class DescribeStmt extends ShowStmt {
: column.getDefaultValue(),
extraStr,
((Boolean) column.isVisible()).toString(),
+ column.getDefineExpr() == null ? "" :
column.getDefineExpr().toSql(),
"");
if (j == 0) {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
index 6688d5c1ef..59a8e3283d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
@@ -445,7 +445,8 @@ public class OlapScanNode extends ScanNode {
mvColumn =
meta.getColumnByName(CreateMaterializedViewStmt.mvColumnBuilder(baseColumn.getName()));
}
if (mvColumn == null) {
- throw new UserException("updateColumnType: Do not found
mvColumn " + baseColumn.getName());
+ throw new UserException("updateColumnType: Do not found
mvColumn=" + baseColumn.getName()
+ + " from index=" +
olapTable.getIndexNameById(selectedIndexId));
}
if (mvColumn.getType() != baseColumn.getType()) {
@@ -484,7 +485,8 @@ public class OlapScanNode extends ScanNode {
if (isBound) {
slotDescriptor.setIsMaterialized(false);
} else {
- throw new UserException("updateSlotUniqueId: Do not found
mvColumn " + baseColumn.getName());
+ throw new UserException("updateSlotUniqueId: Do not found
mvColumn=" + baseColumn.getName()
+ + " from index=" +
olapTable.getIndexNameById(selectedIndexId));
}
} else {
slotDescriptor.setColumn(mvColumn);
diff --git a/regression-test/data/rollup/test_materialized_view_hll.out
b/regression-test/data/rollup/test_materialized_view_hll.out
index 0d6beb5adb..26dbbea0ec 100644
--- a/regression-test/data/rollup/test_materialized_view_hll.out
+++ b/regression-test/data/rollup/test_materialized_view_hll.out
@@ -1,13 +1,13 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !sql --
-test_materialized_view_hll DUP_KEYS record_id INT Yes
true \N true
- seller_id INT Yes true \N true
- store_id INT Yes true \N true
- sale_date DATE Yes false \N NONE true
- sale_amt BIGINT Yes false \N NONE true
-
-amt_count AGG_KEYS store_id INT Yes true \N
true
- hll_hash(sale_amt) HLL No false \N
HLL_UNION true
+test_materialized_view_hll DUP_KEYS record_id INT Yes
true \N true
+ seller_id INT Yes true \N true
+ store_id INT Yes true \N true
+ sale_date DATE Yes false \N NONE true
+ sale_amt BIGINT Yes false \N NONE true
+
+amt_count AGG_KEYS mv_store_id INT Yes true \N
true `store_id`
+ mva_HLL_UNION__hll_hash(`sale_amt`) HLL No false
\N HLL_UNION true hll_hash(`sale_amt`)
-- !sql --
1 1
diff --git
a/regression-test/data/rollup/test_materialized_view_hll_with_light_sc.out
b/regression-test/data/rollup/test_materialized_view_hll_with_light_sc.out
index a5997d8396..84e4aaa630 100644
--- a/regression-test/data/rollup/test_materialized_view_hll_with_light_sc.out
+++ b/regression-test/data/rollup/test_materialized_view_hll_with_light_sc.out
@@ -1,13 +1,13 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !sql --
-test_materialized_view_hll_with_light_sc DUP_KEYS record_id
INT Yes true \N true
- seller_id INT Yes true \N true
- store_id INT Yes true \N true
- sale_date DATE Yes false \N NONE true
- sale_amt BIGINT Yes false \N NONE true
-
-amt_count1 AGG_KEYS store_id INT Yes true \N
true
- hll_hash(sale_amt) HLL No false \N
HLL_UNION true
+test_materialized_view_hll_with_light_sc DUP_KEYS record_id
INT Yes true \N true
+ seller_id INT Yes true \N true
+ store_id INT Yes true \N true
+ sale_date DATE Yes false \N NONE true
+ sale_amt BIGINT Yes false \N NONE true
+
+amt_count1 AGG_KEYS mv_store_id INT Yes true \N
true `store_id`
+ mva_HLL_UNION__hll_hash(`sale_amt`) HLL No false
\N HLL_UNION true hll_hash(`sale_amt`)
-- !sql --
1 1
diff --git a/regression-test/data/rollup_p0/test_materialized_view.out
b/regression-test/data/rollup_p0/test_materialized_view.out
index 643d919438..7a5174bb6f 100644
--- a/regression-test/data/rollup_p0/test_materialized_view.out
+++ b/regression-test/data/rollup_p0/test_materialized_view.out
@@ -1,24 +1,24 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !sql --
-test_materialized_view1 DUP_KEYS record_id INT Yes
true \N true
- seller_id INT Yes true \N true
- store_id INT Yes true \N true
- sale_date DATE Yes false \N NONE true
- sale_amt BIGINT Yes false \N NONE true
-
-amt_sum AGG_KEYS store_id INT Yes true \N
true
- sale_amt BIGINT Yes false \N SUM true
-
--- !sql --
-test_materialized_view2 DUP_KEYS record_id INT Yes
true \N true
- seller_id INT Yes true \N true
- store_id INT Yes true \N true
- sale_date DATE Yes false \N NONE true
- sale_amt BIGINT Yes false \N NONE true
-
-seller_id_order DUP_KEYS store_id INT Yes true
\N true
- seller_id INT Yes true \N true
- sale_amt BIGINT Yes false \N NONE true
+test_materialized_view1 DUP_KEYS record_id INT Yes
true \N true
+ seller_id INT Yes true \N true
+ store_id INT Yes true \N true
+ sale_date DATE Yes false \N NONE true
+ sale_amt BIGINT Yes false \N NONE true
+
+amt_sum AGG_KEYS mv_store_id INT Yes true \N
true `store_id`
+ mva_SUM__`sale_amt` BIGINT Yes false \N SUM
true `sale_amt`
+
+-- !sql --
+test_materialized_view2 DUP_KEYS record_id INT Yes
true \N true
+ seller_id INT Yes true \N true
+ store_id INT Yes true \N true
+ sale_date DATE Yes false \N NONE true
+ sale_amt BIGINT Yes false \N NONE true
+
+seller_id_order DUP_KEYS mv_store_id INT Yes true
\N true `store_id`
+ mv_seller_id INT Yes true \N true
`seller_id`
+ mv_sale_amt BIGINT Yes false \N NONE true
`sale_amt`
-- !sql --
1 1 1 2020-05-30 100
@@ -35,17 +35,17 @@ seller_id_order DUP_KEYS store_id INT
Yes true \N true
1 200
-- !sql --
-
-
- CASE WHEN sale_amt IS NULL THEN 0 ELSE 1 END BIGINT No
false \N SUM true
- sale_amt BIGINT Yes false \N NONE true
- sale_amt BIGINT Yes false \N SUM true
- sale_date DATE Yes false \N NONE true
- seller_id INT Yes true \N true
- store_id INT Yes true \N true
-amt_count AGG_KEYS store_id INT Yes true \N
true
-amt_sum AGG_KEYS store_id INT Yes true \N
true
-test_materialized_view1 DUP_KEYS record_id INT Yes
true \N true
+
+
+ mva_SUM__CASE WHEN `sale_amt` IS NULL THEN 0 ELSE 1 END BIGINT
No false \N SUM true CASE WHEN `sale_amt` IS NULL THEN 0
ELSE 1 END
+ mva_SUM__`sale_amt` BIGINT Yes false \N SUM
true `sale_amt`
+ sale_amt BIGINT Yes false \N NONE true
+ sale_date DATE Yes false \N NONE true
+ seller_id INT Yes true \N true
+ store_id INT Yes true \N true
+amt_count AGG_KEYS mv_store_id INT Yes true \N
true `store_id`
+amt_sum AGG_KEYS mv_store_id INT Yes true \N
true `store_id`
+test_materialized_view1 DUP_KEYS record_id INT Yes
true \N true
-- !sql --
1 2
diff --git a/regression-test/data/rollup_p0/test_rollup_agg.out
b/regression-test/data/rollup_p0/test_rollup_agg.out
index 558d147a3c..d416e8990b 100644
--- a/regression-test/data/rollup_p0/test_rollup_agg.out
+++ b/regression-test/data/rollup_p0/test_rollup_agg.out
@@ -1,15 +1,15 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !sql --
-test_rollup_agg AGG_KEYS siteid INT No true \N
true
- citycode SMALLINT No true \N
true
- username VARCHAR(32) No true \N
true
- pv BIGINT No false 0 SUM true
- uv BIGINT No false 0 SUM true
- vv BIGINT Yes false 0 SUM true
-
-rollup_city AGG_KEYS citycode SMALLINT No true
\N true
- pv BIGINT No false 0 SUM true
- vv BIGINT Yes false 0 SUM true
+test_rollup_agg AGG_KEYS siteid INT No true \N
true
+ citycode SMALLINT No true \N
true
+ username VARCHAR(32) No true \N
true
+ pv BIGINT No false 0 SUM true
+ uv BIGINT No false 0 SUM true
+ vv BIGINT Yes false 0 SUM true
+
+rollup_city AGG_KEYS citycode SMALLINT No true
\N true
+ pv BIGINT No false 0 SUM true
+ vv BIGINT Yes false 0 SUM true
-- !sql --
1 200
diff --git a/regression-test/data/rollup_p0/test_rollup_agg_date.out
b/regression-test/data/rollup_p0/test_rollup_agg_date.out
index ad91787dde..58b2568e5e 100644
--- a/regression-test/data/rollup_p0/test_rollup_agg_date.out
+++ b/regression-test/data/rollup_p0/test_rollup_agg_date.out
@@ -1,23 +1,23 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !sql --
-test_rollup_agg_date AGG_KEYS datek1 DATEV2 Yes true \N
true
- datetimek1 DATETIMEV2(0) Yes true \N
true
- datetimek2 DATETIMEV2(3) Yes true \N
true
- datetimek3 DATETIMEV2(6) Yes true \N
true
- datev1 DATEV2 No false \N MAX true
- datetimev1 DATETIMEV2(0) No false \N MAX
true
- datetimev2 DATETIMEV2(3) No false \N MAX
true
- datetimev3 DATETIMEV2(6) No false \N MAX
true
- datetimev4 DATETIMEV2(3) Yes false \N MAX
true
-
-rollup_date AGG_KEYS datek1 DATEV2 Yes true \N
true
- datetimek2 DATETIMEV2(3) Yes true \N
true
- datetimek1 DATETIMEV2(0) Yes true \N
true
- datetimek3 DATETIMEV2(6) Yes true \N
true
- datev1 DATEV2 No false \N MAX true
- datetimev1 DATETIMEV2(0) No false \N MAX
true
- datetimev2 DATETIMEV2(3) No false \N MAX
true
- datetimev3 DATETIMEV2(6) No false \N MAX
true
+test_rollup_agg_date AGG_KEYS datek1 DATEV2 Yes true \N
true
+ datetimek1 DATETIMEV2(0) Yes true \N
true
+ datetimek2 DATETIMEV2(3) Yes true \N
true
+ datetimek3 DATETIMEV2(6) Yes true \N
true
+ datev1 DATEV2 No false \N MAX true
+ datetimev1 DATETIMEV2(0) No false \N MAX
true
+ datetimev2 DATETIMEV2(3) No false \N MAX
true
+ datetimev3 DATETIMEV2(6) No false \N MAX
true
+ datetimev4 DATETIMEV2(3) Yes false \N MAX
true
+
+rollup_date AGG_KEYS datek1 DATEV2 Yes true \N
true
+ datetimek2 DATETIMEV2(3) Yes true \N
true
+ datetimek1 DATETIMEV2(0) Yes true \N
true
+ datetimek3 DATETIMEV2(6) Yes true \N
true
+ datev1 DATEV2 No false \N MAX true
+ datetimev1 DATETIMEV2(0) No false \N MAX
true
+ datetimev2 DATETIMEV2(3) No false \N MAX
true
+ datetimev3 DATETIMEV2(6) No false \N MAX
true
-- !sql --
2022-08-23 2022-08-23T11:11:11 2022-08-23T11:11:11.111
2022-08-23T11:11:11.111111 2022-08-23 2022-08-23T11:11:11
2022-08-23T11:11:11.111 2022-08-23T11:11:11.111111
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
