This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 0d6a77fbb9e branch-4.0: [fix](topn-lazy-materialize) LazySlotPruning
does not pass nullable attribute of global_row_id when visiting project. #58722
(#59588)
0d6a77fbb9e is described below
commit 0d6a77fbb9ef277c4ec957330f531bd53fbbdcfc
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jan 7 17:51:23 2026 +0800
branch-4.0: [fix](topn-lazy-materialize) LazySlotPruning does not pass
nullable attribute of global_row_id when visiting project. #58722 (#59588)
Cherry-picked from #58722
Co-authored-by: minghong <[email protected]>
---
.../post/materialize/LazySlotPruning.java | 1 +
.../lazy_materialize/global_rowid_nullable.groovy | 105 +++++++++++++++++++++
2 files changed, 106 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/materialize/LazySlotPruning.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/materialize/LazySlotPruning.java
index 65b57111647..6c22917bb23 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/materialize/LazySlotPruning.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/materialize/LazySlotPruning.java
@@ -196,6 +196,7 @@ public class LazySlotPruning extends
DefaultPlanRewriter<LazySlotPruning.Context
}
Context childContext = context.withLazySlots(childLazySlots);
child = child.accept(this, childContext);
+ context.updateRowIdSlot(childContext.rowIdSlot);
}
if (child.getOutput().contains(context.rowIdSlot)) {
List<NamedExpression> newProjections = new ArrayList<>();
diff --git
a/regression-test/suites/topn_optimize/lazy_materialize/global_rowid_nullable.groovy
b/regression-test/suites/topn_optimize/lazy_materialize/global_rowid_nullable.groovy
new file mode 100644
index 00000000000..2fa35d87fc6
--- /dev/null
+++
b/regression-test/suites/topn_optimize/lazy_materialize/global_rowid_nullable.groovy
@@ -0,0 +1,105 @@
+// 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("global_rowid_nullable") {
+ sql """
+ CREATE TABLE IF NOT EXISTS t1 (
+ k1 INT NULL,
+ k2 INT NULL,
+ v1 INT NULL,
+ v2 INT NULL
+ )
+ DISTRIBUTED BY HASH(k1) BUCKETS 3
+ PROPERTIES (
+ 'replication_num' = '1'
+ );
+ insert into t1 values
+ (1, 1, 10, 100),
+ (2, 2, 20, 200),
+ (3, 3, 30, 300);
+
+ CREATE TABLE IF NOT EXISTS t2 (
+ k1 INT NULL,
+ k2 INT NULL,
+ v1 INT NULL,
+ v2 INT NULL
+ )
+ DISTRIBUTED BY HASH(k1) BUCKETS 3
+ PROPERTIES (
+ 'replication_num' = '1'
+ );
+ insert into t2 values
+ (1, 1, 10, 100),
+ (2, 2, 20, 200),
+ (3, 3, 30, 300);
+
+ CREATE TABLE IF NOT EXISTS t3 (
+ k1 INT NULL,
+ k2 INT NULL,
+ v1 INT NULL,
+ v2 INT NULL
+ )
+ DISTRIBUTED BY HASH(k1) BUCKETS 3
+ PROPERTIES (
+ 'replication_num' = '1'
+ );
+ insert into t3 values
+ (1, 1, 10, 100),
+ (2, 2, 20, 200),
+ (3, 3, 30, 300);
+
+ set disable_join_reorder = true;
+ """
+
+
+/**
+the plan of the following sql should be like:
+PhysicalResultSink[608] ( outputExprs=[k1#0, x#12] )
++--PhysicalProject[605]@ ( stats=null, projects=[k1#0, x#12] )
+ +--PhysicalLazyMaterialize [Output= ([k1#0, x#12]), lazySlots= ([x#12])]
+ +--PhysicalTopN[603]@12 ( stats=1, limit=1, offset=0, orderKeys=[k1#0
asc null first], phase=MERGE_SORT )
+ +--PhysicalDistribute[600]@ ( stats=1,
distributionSpec=DistributionSpecGather )
+ +--PhysicalTopN[597]@14 ( stats=1, limit=1, offset=0,
orderKeys=[k1#0 asc null first], phase=LOCAL_SORT )
+ +--PhysicalProject[594]@11 ( stats=3.01, projects=[k1#0,
__DORIS_GLOBAL_ROWID_COL__t3#13] )
+ +--PhysicalHashJoin[592]@ ( stats=3.01, type=INNER_JOIN,
hashCondition=[(k1#0 = k1#4)], otherCondition=[], markCondition=[],
RFs=[RF0[k1#4->[k1#0](ndv/size = 3/4) , RF1[k1#4->[k1#0](ndv/size = 3/4) ] )
+ |--PhysicalProject[518]@1 ( stats=3, projects=[k1#0] )
+ | +--PhysicalOlapScan[t1]@0 ( stats=3,
operativeSlots=[k1#0], virtualColumns=[], JRFs= RF0 RF1 )
+ +--PhysicalDistribute[589]@ ( stats=3.01,
distributionSpec=DistributionSpecReplicated )
+ +--PhysicalProject[586]@9 ( stats=3.01,
projects=[k1#4, __DORIS_GLOBAL_ROWID_COL__t3#13] )
+ +--PhysicalFilter[584]@7 ( stats=3.01,
predicates=OR[(k1#8 > 0),k1#8 IS NULL] )
+ +--PhysicalHashJoin[581]@ ( stats=6,
type=LEFT_OUTER_JOIN, hashCondition=[(k1#4 = k1#8)], otherCondition=[],
markCondition=[] )
+ |--PhysicalProject[523]@3 ( stats=3,
projects=[k1#4] )
+ | +--PhysicalOlapScan[t2]@2 ( stats=3,
operativeSlots=[k1#4], virtualColumns=[] )
+ +--PhysicalDistribute[578]@ ( stats=6,
distributionSpec=DistributionSpecReplicated )
+ +--PhysicalProject[575]@5 ( stats=6,
projects=[k1#8, __DORIS_GLOBAL_ROWID_COL__t3#13] )
+
+--PhysicalLazyMaterializeOlapScan[PhysicalOlapScan[t3]@4 ( stats=6,
operativeSlots=[k1#8], virtualColumns=[] )]
+ after join[581] global rowid column of t3 should be nullable.
+ we construct new context when visiting project[586]. this case verifies that
we handle nullable property of global rowid column correctly passed through
project[586] in such scenario.
+*/
+ sql """
+ select t1.k1, tmp2.x
+ from t1 join (
+ select tmp.k1, tmp.v1 as x from (
+ select t2.k1, t3.v1 from t2 left outer join t3 on t2.k1 = t3.k1
where t3.k1 > 0 or t3.k1 is null
+ ) as tmp
+
+ ) as tmp2 on t1.k1 = tmp2.k1
+ order by t1.k1
+ limit 1;
+ """
+
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
