This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 f8eb480bec [fix](emptynode)fix empty node bug in vec engine (#12258)
f8eb480bec is described below
commit f8eb480becd737fa220d99c097bc194616ccd27e
Author: starocean999 <[email protected]>
AuthorDate: Thu Sep 1 18:52:10 2022 +0800
[fix](emptynode)fix empty node bug in vec engine (#12258)
* [fix](emptynode)fix empty node bug in vec engine
* update fe ut
---
.../apache/doris/planner/SingleNodePlanner.java | 2 +-
.../org/apache/doris/planner/QueryPlanTest.java | 2 +-
.../test_outer_join_with_empty_node.out | 6 ++
.../test_outer_join_with_empty_node.groovy | 80 ++++++++++++++++++++++
4 files changed, 88 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
index 58e4a02435..90793bcddb 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
@@ -182,7 +182,7 @@ public class SingleNodePlanner {
private PlanNode createEmptyNode(PlanNode inputPlan, QueryStmt stmt,
Analyzer analyzer) throws UserException {
ArrayList<TupleId> tupleIds = Lists.newArrayList();
if (inputPlan != null) {
- tupleIds = inputPlan.tupleIds;
+ tupleIds.addAll(inputPlan.getOutputTupleIds());
}
if (tupleIds.isEmpty()) {
// Constant selects do not have materialized tuples at this stage.
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
index fe628869e3..1ec4641793 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
@@ -1923,7 +1923,7 @@ public class QueryPlanTest extends TestWithFeService {
+ " on t1.k1 = a.x where 1 = 0;";
String explainStr = getSQLPlanOrErrorMsg(sql, true);
Assert.assertTrue(UtFrameUtils.checkPlanResultContainsNode(explainStr,
4, "EMPTYSET"));
- Assert.assertTrue(explainStr.contains("tuple ids: 0 1 4"));
+ Assert.assertTrue(explainStr.contains("tuple ids: 5"));
}
@Ignore
diff --git
a/regression-test/data/correctness_p0/test_outer_join_with_empty_node.out
b/regression-test/data/correctness_p0/test_outer_join_with_empty_node.out
new file mode 100644
index 0000000000..5f75044ff2
--- /dev/null
+++ b/regression-test/data/correctness_p0/test_outer_join_with_empty_node.out
@@ -0,0 +1,6 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !select --
+
+-- !select --
+1 1 1
+
diff --git
a/regression-test/suites/correctness_p0/test_outer_join_with_empty_node.groovy
b/regression-test/suites/correctness_p0/test_outer_join_with_empty_node.groovy
new file mode 100644
index 0000000000..4b69958bde
--- /dev/null
+++
b/regression-test/suites/correctness_p0/test_outer_join_with_empty_node.groovy
@@ -0,0 +1,80 @@
+// 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_outer_join_with_empty_node") {
+ sql """
+ drop table if exists t1;
+ """
+
+ sql """
+ drop table if exists t2;
+ """
+
+ sql """
+ CREATE TABLE `t1` (
+ `k1` int(11) NULL COMMENT "",
+ `k2` int(11) NULL COMMENT ""
+ ) ENGINE=OLAP
+ DUPLICATE KEY(`k1`, `k2`)
+ COMMENT "OLAP"
+ DISTRIBUTED BY HASH(`k1`) BUCKETS 1
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1",
+ "in_memory" = "false",
+ "storage_format" = "V2"
+ );
+ """
+
+ sql """
+ CREATE TABLE `t2` (
+ `j1` int(11) NULL COMMENT "",
+ `j2` int(11) NULL COMMENT ""
+ ) ENGINE=OLAP
+ DUPLICATE KEY(`j1`, `j2`)
+ COMMENT "OLAP"
+ DISTRIBUTED BY HASH(`j1`) BUCKETS 1
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1",
+ "in_memory" = "false",
+ "storage_format" = "V2"
+ );
+ """
+
+ sql """
+ insert into t1 values(1, 1);
+ """
+
+ sql """
+ insert into t2 values(1, 1);
+ """
+
+ qt_select """
+ select * from t1 left join (select max(j1) over() as x from t2)a on
t1.k1=a.x where 1=0;
+ """
+
+ qt_select """
+ select * from t1 left join (select max(j1) over() as x from t2)a on
t1.k1=a.x where 1=1;
+ """
+
+ sql """
+ drop table if exists t1;
+ """
+
+ sql """
+ drop table if exists t2;
+ """
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
