This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 7c23af5b007 branch-2.1: [fix](opt)fix create expr tree to avoid the
dangling reference #49082 (#49834)
7c23af5b007 is described below
commit 7c23af5b0074dfbcbf8c9073da5c66eff80a279b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Apr 8 12:01:50 2025 +0800
branch-2.1: [fix](opt)fix create expr tree to avoid the dangling reference
#49082 (#49834)
Cherry-picked from #49082
Co-authored-by: zhangm365 <mzhang2...@gmail.com>
---
be/src/vec/exprs/vexpr.cpp | 21 ++-
.../test_expression_tree_reconstruction.out | Bin 0 -> 824 bytes
.../test_expression_tree_reconstruction.groovy | 202 +++++++++++++++++++++
3 files changed, 216 insertions(+), 7 deletions(-)
diff --git a/be/src/vec/exprs/vexpr.cpp b/be/src/vec/exprs/vexpr.cpp
index 17985c57cf7..897294b4810 100644
--- a/be/src/vec/exprs/vexpr.cpp
+++ b/be/src/vec/exprs/vexpr.cpp
@@ -27,6 +27,7 @@
#include <boost/iterator/iterator_facade.hpp>
#include <memory>
#include <stack>
+#include <utility>
#include "common/config.h"
#include "common/exception.h"
@@ -364,26 +365,32 @@ Status VExpr::create_tree_from_thrift(const
std::vector<TExprNode>& nodes, int*
}
// non-recursive traversal
- std::stack<std::pair<VExprSPtr, int>> s;
- s.emplace(root, root_children);
+ using VExprSPtrCountPair = std::pair<VExprSPtr, int>;
+ std::stack<std::shared_ptr<VExprSPtrCountPair>> s;
+ s.emplace(std::make_shared<VExprSPtrCountPair>(root, root_children));
while (!s.empty()) {
- auto& parent = s.top();
- if (parent.second > 1) {
- parent.second -= 1;
+ // copy the shared ptr resource to avoid dangling reference
+ auto parent = s.top();
+ // Decrement or pop
+ if (parent->second > 1) {
+ parent->second -= 1;
} else {
s.pop();
}
+ DCHECK(parent->first != nullptr);
if (++*node_idx >= nodes.size()) {
return Status::InternalError("Failed to reconstruct expression
tree from thrift.");
}
+
VExprSPtr expr;
RETURN_IF_ERROR(create_expr(nodes[*node_idx], expr));
DCHECK(expr != nullptr);
- parent.first->add_child(expr);
+ parent->first->add_child(expr);
+ // push to stack if has children
int num_children = nodes[*node_idx].num_children;
if (num_children > 0) {
- s.emplace(expr, num_children);
+ s.emplace(std::make_shared<VExprSPtrCountPair>(expr,
num_children));
}
}
return Status::OK();
diff --git
a/regression-test/data/correctness/test_expression_tree_reconstruction.out
b/regression-test/data/correctness/test_expression_tree_reconstruction.out
new file mode 100644
index 00000000000..18cbb02c39b
Binary files /dev/null and
b/regression-test/data/correctness/test_expression_tree_reconstruction.out
differ
diff --git
a/regression-test/suites/correctness/test_expression_tree_reconstruction.groovy
b/regression-test/suites/correctness/test_expression_tree_reconstruction.groovy
new file mode 100644
index 00000000000..470e977ecfa
--- /dev/null
+++
b/regression-test/suites/correctness/test_expression_tree_reconstruction.groovy
@@ -0,0 +1,202 @@
+// 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_expression_tree_reconstruction") {
+
+ def testTable = "test_expression_tree_reconstruction"
+ // Clean up any existing table with the same name
+ sql "DROP TABLE IF EXISTS ${testTable}"
+
+ // Create a test table
+ sql """
+ CREATE TABLE ${testTable}
+ (
+ id int,
+ name string,
+ price decimal(10, 2),
+ created_date datetime,
+ reference_date datetime
+ )
+ COMMENT "test table for expression tree reconstruction"
+ DISTRIBUTED BY HASH(id) BUCKETS 1
+ PROPERTIES (
+ "replication_num" = "1"
+ )
+ """
+
+ // Insert data into the table
+ sql """
+ INSERT INTO ${testTable} VALUES
+ (1, 'item1', 10.50, '2025-01-01 12:00:00', '2025-03-01 00:00:00'),
+ (2, 'item2', 20.75, '2025-01-02 13:30:00', '2025-03-01 00:00:00'),
+ (3, 'item3', 15.25, '2025-01-03 09:45:00', '2025-03-01 00:00:00'),
+ (4, 'item4', 30.00, '2025-01-04 16:15:00', '2025-03-01 00:00:00'),
+ (5, 'item5', 25.50, '2025-01-05 11:20:00', '2025-03-01 00:00:00')
+ """
+
+ // Synchronize to ensure data is visible
+ sql "SYNC"
+
+ // Test complex expressions that would trigger the tree reconstruction
logic
+ // These queries will create expression trees that need to be
reconstructed from Thrift
+
+ // Test 1: Simple expression with multiple operands
+ qt_test1 """
+ SELECT id, name, price * 1.1 + 5 AS adjusted_price
+ FROM ${testTable}
+ ORDER BY id
+ """
+
+ // Test 2: Nested expressions with multiple levels of nesting to test
stack handling
+ qt_test2 """
+ SELECT id,
+ CASE
+ WHEN price > 20.0 THEN
+ CASE
+ WHEN price > 25.0 THEN 'premium'
+ ELSE 'expensive'
+ END
+ WHEN price > 15.0 THEN 'moderate'
+ ELSE 'cheap'
+ END AS price_category
+ FROM ${testTable}
+ ORDER BY id
+ """
+
+ // Test 3: Complex expression with multiple functions and nested conditions
+ // Using reference_date instead of NOW() to ensure consistent results
+ qt_test3 """
+ SELECT
+ id,
+ name,
+ IF(price > 20.0,
+ CONCAT(name, ' - premium'),
+ CONCAT(name, ' - standard')) AS product_tier,
+ DATEDIFF(reference_date, created_date) AS days_since_created
+ FROM ${testTable}
+ ORDER BY id
+ """
+
+ // Test 4: Aggregation with multiple nested expressions to stress test
parent-child relationships
+ qt_test4 """
+ SELECT
+ SUBSTR(name, 1, 4) AS name_prefix,
+ AVG(price) AS avg_price,
+ SUM(IF(price > 20.0, price, 0)) AS premium_price_sum,
+ COUNT(DISTINCT IF(price > 15.0, FLOOR(price), NULL)) AS distinct_prices
+ FROM ${testTable}
+ GROUP BY SUBSTR(name, 1, 4)
+ """
+
+ // Test 5: Complex join with deeply nested expressions to thoroughly test
stack operations
+ // First create a companion table
+ def joinTable = "test_expression_tree_join"
+ sql "DROP TABLE IF EXISTS ${joinTable}"
+ sql """
+ CREATE TABLE ${joinTable}
+ (
+ id int,
+ category string,
+ discount decimal(5, 2),
+ priority int
+ )
+ DISTRIBUTED BY HASH(id) BUCKETS 1
+ PROPERTIES (
+ "replication_num" = "1"
+ )
+ """
+
+ sql """
+ INSERT INTO ${joinTable} VALUES
+ (1, 'electronics', 0.10, 1),
+ (2, 'books', 0.05, 2),
+ (3, 'clothing', 0.15, 3),
+ (4, 'food', 0.02, 1),
+ (5, 'toys', 0.12, 2)
+ """
+
+ sql "SYNC"
+
+ qt_test5 """
+ SELECT
+ t1.id,
+ t1.name,
+ t2.category,
+ t1.price * (1 - t2.discount) AS discounted_price,
+ CASE
+ WHEN t2.discount > 0.10 THEN
+ CASE
+ WHEN t2.priority = 3 THEN 'Exceptional Deal'
+ ELSE 'High Discount'
+ END
+ WHEN t2.discount > 0.05 THEN
+ CASE
+ WHEN t2.priority < 2 THEN 'Medium Priority Discount'
+ ELSE 'Medium Discount'
+ END
+ ELSE
+ CASE
+ WHEN t2.priority = 1 THEN 'Priority Low Discount'
+ ELSE 'Standard Low Discount'
+ END
+ END AS discount_tier
+ FROM ${testTable} t1
+ JOIN ${joinTable} t2 ON t1.id = t2.id
+ ORDER BY t1.id
+ """
+
+ // Test 6: Specific test for deeply nested expression trees to ensure
stack operations work correctly
+ qt_test6 """
+ WITH calculated AS (
+ SELECT
+ id,
+ name,
+ price,
+ CASE
+ WHEN price > 25.0 THEN
+ CASE
+ WHEN LENGTH(name) > 5 THEN
+ CONCAT(UPPER(name), '-', CAST(price * 2 AS STRING))
+ ELSE
+ CONCAT(LOWER(name), '-', CAST(price * 1.5 AS
STRING))
+ END
+ WHEN price > 15.0 THEN
+ CASE
+ WHEN LENGTH(name) > 5 THEN
+ CONCAT(SUBSTR(name, 1, 3), '-', CAST(ROUND(price)
AS STRING))
+ ELSE
+ CONCAT(name, '-', CAST(CEIL(price) AS STRING))
+ END
+ ELSE
+ CONCAT(name, '-standard-', CAST(FLOOR(price) AS STRING))
+ END AS complex_label
+ FROM ${testTable}
+ )
+ SELECT
+ id,
+ name,
+ price,
+ complex_label,
+ LENGTH(complex_label) AS label_length
+ FROM calculated
+ ORDER BY id
+ """
+
+ // Clean up
+ sql "DROP TABLE IF EXISTS ${testTable}"
+ sql "DROP TABLE IF EXISTS ${joinTable}"
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
