This is an automated email from the ASF dual-hosted git repository.
gabriellee pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 315e4b965cc branch-3.0: [fix](correctness) Fix operator initialization
#45728 (#46148)
315e4b965cc is described below
commit 315e4b965cce38d405c9eb6c63e271a8312ca5e4
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 30 14:26:21 2024 +0800
branch-3.0: [fix](correctness) Fix operator initialization #45728 (#46148)
Cherry-picked from #45728
Co-authored-by: Gabriel <liwenqi...@selectdb.com>
---
be/src/pipeline/pipeline_fragment_context.cpp | 6 +-
.../test_hash_join_local_shuffle.out | 4 +
.../test_hash_join_local_shuffle.groovy | 89 ++++++++++++++++++++++
3 files changed, 96 insertions(+), 3 deletions(-)
diff --git a/be/src/pipeline/pipeline_fragment_context.cpp
b/be/src/pipeline/pipeline_fragment_context.cpp
index 0873adfebf4..e7495992ee9 100644
--- a/be/src/pipeline/pipeline_fragment_context.cpp
+++ b/be/src/pipeline/pipeline_fragment_context.cpp
@@ -649,7 +649,9 @@ Status
PipelineFragmentContext::_create_tree_helper(ObjectPool* pool,
RETURN_IF_ERROR(_create_operator(pool, tnodes[*node_idx], request, descs,
op, cur_pipe,
parent == nullptr ? -1 :
parent->node_id(), child_idx,
followed_by_shuffled_operator));
-
+ // Initialization must be done here. For example, group by expressions in
agg will be used to
+ // decide if a local shuffle should be planed, so it must be initialized
here.
+ RETURN_IF_ERROR(op->init(tnode, _runtime_state.get()));
// assert(parent != nullptr || (node_idx == 0 && root_expr != nullptr));
if (parent != nullptr) {
// add to parent's child(s)
@@ -693,8 +695,6 @@ Status
PipelineFragmentContext::_create_tree_helper(ObjectPool* pool,
}
}
- RETURN_IF_ERROR(op->init(tnode, _runtime_state.get()));
-
return Status::OK();
}
diff --git
a/regression-test/data/correctness_p0/test_hash_join_local_shuffle.out
b/regression-test/data/correctness_p0/test_hash_join_local_shuffle.out
new file mode 100644
index 00000000000..e7c17016890
--- /dev/null
+++ b/regression-test/data/correctness_p0/test_hash_join_local_shuffle.out
@@ -0,0 +1,4 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !select --
+1 3 4 1 1 2 3 4
+
diff --git
a/regression-test/suites/correctness_p0/test_hash_join_local_shuffle.groovy
b/regression-test/suites/correctness_p0/test_hash_join_local_shuffle.groovy
new file mode 100644
index 00000000000..5f155e32559
--- /dev/null
+++ b/regression-test/suites/correctness_p0/test_hash_join_local_shuffle.groovy
@@ -0,0 +1,89 @@
+// 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.
+
+// The cases is copied from https://github.com/trinodb/trino/tree/master
+//
/testing/trino-product-tests/src/main/resources/sql-tests/testcases/aggregate
+// and modified by Doris.
+
+suite("test_hash_join_local_shuffle") {
+
+ sql """drop table if exists test_hash_join_local_shuffle1;"""
+ sql """drop table if exists test_hash_join_local_shuffle2;"""
+ sql """drop table if exists test_hash_join_local_shuffle3;"""
+ sql """drop table if exists test_hash_join_local_shuffle4;"""
+ sql """
+ CREATE TABLE `test_hash_join_local_shuffle1` (
+ `id1` bigint,
+ `id2` bigint,
+ `id3` bigint,
+ `id4` bigint,
+ ) ENGINE=OLAP
+ DUPLICATE KEY(`id1`)
+ COMMENT 'OLAP'
+ DISTRIBUTED BY HASH(`id1`) BUCKETS 96
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1"
+ ); """
+ sql """
+ CREATE TABLE `test_hash_join_local_shuffle2` (
+ `id1` bigint,
+ `id2` bigint,
+ `id3` bigint,
+ `id4` bigint,
+ ) ENGINE=OLAP
+ DUPLICATE KEY(`id1`)
+ COMMENT 'OLAP'
+ DISTRIBUTED BY HASH(`id1`) BUCKETS 96
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1"
+ ); """
+ sql """
+ CREATE TABLE `test_hash_join_local_shuffle3` (
+ `id1` bigint,
+ `id2` bigint,
+ `id3` bigint,
+ `id4` bigint,
+ ) ENGINE=OLAP
+ DUPLICATE KEY(`id1`)
+ COMMENT 'OLAP'
+ DISTRIBUTED BY HASH(`id1`) BUCKETS 96
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1"
+ ); """
+ sql """
+ CREATE TABLE `test_hash_join_local_shuffle4` (
+ `id1` bigint,
+ `id2` bigint,
+ `id3` bigint,
+ `id4` bigint,
+ ) ENGINE=OLAP
+ DUPLICATE KEY(`id1`)
+ COMMENT 'OLAP'
+ DISTRIBUTED BY HASH(`id1`) BUCKETS 96
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1"
+ ); """
+ sql """ insert into test_hash_join_local_shuffle1 values(1,2,3,4); """
+ sql """ insert into test_hash_join_local_shuffle2 values(1,2,3,4); """
+ sql """ insert into test_hash_join_local_shuffle3 values(1,2,3,4); """
+ sql """ insert into test_hash_join_local_shuffle4 values(1,2,3,4); """
+
+ qt_select """
+ select /*+ SET_VAR(disable_join_reorder=true)*/ * from (select
tmp2.id1,tmp2.id3,tmp2.id4,count(distinct tmp2.id2) from (select tmp1.id1,
tmp1.id2, tmp1.id3, tmp1.id4 from (select
test_hash_join_local_shuffle3.id1,test_hash_join_local_shuffle3.id2,test_hash_join_local_shuffle3.id3,test_hash_join_local_shuffle3.id4
from test_hash_join_local_shuffle2 join[shuffle] test_hash_join_local_shuffle3
on test_hash_join_local_shuffle2.id3 = test_hash_join_local_shuffle3.id3) tmp1
join [broa [...]
+ """
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
