You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/12/28 02:09:55 UTC
[doris] branch branch-1.2-lts updated (14553d0068 -> ef4f6de9ae)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a change to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
from 14553d0068 [cherry-pick](bitmap)Support return bitmap data in select statement in vectorization (#15388)
new 8e0a57407a [test](Nereids) Disable some regression test for materialized index. (#15387)
new ef4f6de9ae [Bug](decimalv3) select view of decimalv3 error (#15404)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/doris/catalog/ScalarType.java | 17 ++++++++++++++---
.../test_decimalv3.out} | 3 ++-
regression-test/data/nereids_syntax_p0/rollup.out | 9 ---------
.../suites/decimalv3/test_decimalv3.groovy | 22 ++++++++++------------
.../suites/nereids_syntax_p0/rollup.groovy | 6 ++++--
5 files changed, 30 insertions(+), 27 deletions(-)
copy regression-test/data/{correctness/test_constant_push_down_through_outer_join.out => decimalv3/test_decimalv3.out} (70%)
delete mode 100644 regression-test/data/nereids_syntax_p0/rollup.out
copy be/src/env/env.cpp => regression-test/suites/decimalv3/test_decimalv3.groovy (57%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[doris] 02/02: [Bug](decimalv3) select view of decimalv3 error (#15404)
Posted by mo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
commit ef4f6de9aec3fddc8c4772817311ef142a002dc8
Author: HappenLee <ha...@hotmail.com>
AuthorDate: Wed Dec 28 08:38:33 2022 +0800
[Bug](decimalv3) select view of decimalv3 error (#15404)
---
.../java/org/apache/doris/catalog/ScalarType.java | 17 ++++++++++---
regression-test/data/decimalv3/test_decimalv3.out | 4 +++
.../suites/decimalv3/test_decimalv3.groovy | 29 ++++++++++++++++++++++
3 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarType.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarType.java
index 3cd713b507..4564af5094 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarType.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarType.java
@@ -557,9 +557,6 @@ public class ScalarType extends Type {
}
break;
case DECIMALV2:
- case DECIMAL32:
- case DECIMAL64:
- case DECIMAL128:
if (Strings.isNullOrEmpty(precisionStr)) {
stringBuilder.append("decimal").append("(").append(precision)
.append(", ").append(scale).append(")");
@@ -570,6 +567,20 @@ public class ScalarType extends Type {
stringBuilder.append("decimal").append("(`").append(precisionStr).append("`)");
}
break;
+ case DECIMAL32:
+ case DECIMAL64:
+ case DECIMAL128:
+ String typeName = Config.enable_decimal_conversion ? "decimal" : "decimalv3";
+ if (Strings.isNullOrEmpty(precisionStr)) {
+ stringBuilder.append(typeName).append("(").append(precision)
+ .append(", ").append(scale).append(")");
+ } else if (!Strings.isNullOrEmpty(precisionStr) && !Strings.isNullOrEmpty(scaleStr)) {
+ stringBuilder.append(typeName).append("(`").append(precisionStr)
+ .append("`, `").append(scaleStr).append("`)");
+ } else {
+ stringBuilder.append(typeName).append("(`").append(precisionStr).append("`)");
+ }
+ break;
case DATETIMEV2:
stringBuilder.append("datetime").append("(").append(scale).append(")");
break;
diff --git a/regression-test/data/decimalv3/test_decimalv3.out b/regression-test/data/decimalv3/test_decimalv3.out
new file mode 100644
index 0000000000..1bb8b045c0
--- /dev/null
+++ b/regression-test/data/decimalv3/test_decimalv3.out
@@ -0,0 +1,4 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !decimalv3 --
+100.000000000000000000
+
diff --git a/regression-test/suites/decimalv3/test_decimalv3.groovy b/regression-test/suites/decimalv3/test_decimalv3.groovy
new file mode 100644
index 0000000000..374e554b93
--- /dev/null
+++ b/regression-test/suites/decimalv3/test_decimalv3.groovy
@@ -0,0 +1,29 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("test_decimalv3") {
+ def db = "test_decimalv3_db"
+ sql "CREATE DATABASE IF NOT EXISTS ${db}"
+ sql "use ${db}"
+ sql "drop table if exists test5"
+ sql '''CREATE TABLE test5 ( `a` decimalv3(38,18), `b` decimalv3(38,18) ) ENGINE=OLAP DUPLICATE KEY(`a`) COMMENT 'OLAP' DISTRIBUTED BY HASH(`a`) BUCKETS 1 PROPERTIES ( "replication_allocation" = "tag.location.default: 1" ) '''
+ sql "insert into test5 values(50,2)"
+ sql "drop view if exists test5_v"
+ sql "create view test5_v (amout) as select cast(a*b as decimalv3(38,18)) from test5"
+
+ qt_decimalv3 "select * from test5_v"
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[doris] 01/02: [test](Nereids) Disable some regression test for materialized index. (#15387)
Posted by mo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 8e0a57407a6e027b07ba957dae2179d702cf850f
Author: Shuo Wang <wa...@gmail.com>
AuthorDate: Tue Dec 27 19:24:03 2022 +0800
[test](Nereids) Disable some regression test for materialized index. (#15387)
When light schema change is enabled by default (#15344), regression tests that run SQL by selecting data from the materialized index will fail.
This PR disabled those failed queries in the regression test. Those tests would be added back when nereids planner could give the correct plan when light schema change is enabled.
---
regression-test/data/nereids_syntax_p0/rollup.out | 9 ---------
regression-test/suites/nereids_syntax_p0/rollup.groovy | 6 ++++--
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/regression-test/data/nereids_syntax_p0/rollup.out b/regression-test/data/nereids_syntax_p0/rollup.out
deleted file mode 100644
index 71d96f5919..0000000000
--- a/regression-test/data/nereids_syntax_p0/rollup.out
+++ /dev/null
@@ -1,9 +0,0 @@
--- This file is automatically generated. You should know what you did if you want to edit this
--- !rollup1 --
-2 6
-3 4
-
--- !rollup2 --
-1 6
-2 4
-
diff --git a/regression-test/suites/nereids_syntax_p0/rollup.groovy b/regression-test/suites/nereids_syntax_p0/rollup.groovy
index ac7126c5ce..2284b66b74 100644
--- a/regression-test/suites/nereids_syntax_p0/rollup.groovy
+++ b/regression-test/suites/nereids_syntax_p0/rollup.groovy
@@ -84,9 +84,11 @@ suite("rollup") {
contains("PREAGGREGATION: ON")
}
- order_qt_rollup1 "select k2, sum(v1) from rollup_t1 group by k2"
+ // TODO: add these qt tests back when nereids planner could get correct plan when
+ // light schema change is enabled.
+ // order_qt_rollup1 "select k2, sum(v1) from rollup_t1 group by k2"
- order_qt_rollup2 "select k1, sum(v1) from rollup_t1 group by k1"
+ // order_qt_rollup2 "select k1, sum(v1) from rollup_t1 group by k1"
explain {
sql("select k1, max(v1) from rollup_t1 group by k1")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org