Skip to content

Commit 847bb6c

Browse files
starocean999BiteTheDDDDt
authored andcommitted
rebase code
1 parent 43c67ab commit 847bb6c

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2240,12 +2240,10 @@ public PlanFragment visitPhysicalRecursiveCte(PhysicalRecursiveCte recursiveCte,
22402240
List<Expr> exprList = Lists.newArrayList();
22412241
Preconditions.checkState(resultExpressionList.size() == outputSlotDescs.size());
22422242
for (int j = 0; j < resultExpressionList.size(); ++j) {
2243-
if (outputSlotDescs.get(j).isMaterialized()) {
2244-
exprList.add(ExpressionTranslator.translate(resultExpressionList.get(j), context));
2245-
// TODO: reconsider this, we may change nullable info in previous nereids rules not here.
2246-
outputSlotDescs.get(j)
2247-
.setIsNullable(outputSlotDescs.get(j).getIsNullable() || exprList.get(j).isNullable());
2248-
}
2243+
exprList.add(ExpressionTranslator.translate(resultExpressionList.get(j), context));
2244+
// TODO: reconsider this, we may change nullable info in previous nereids rules not here.
2245+
outputSlotDescs.get(j)
2246+
.setIsNullable(outputSlotDescs.get(j).getIsNullable() || exprList.get(j).isNullable());
22492247
}
22502248
materializedResultExprLists.add(exprList);
22512249
}

fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/ColumnPruning.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public Plan visitLogicalProject(LogicalProject<? extends Plan> project, PruneCon
217217
@Override
218218
public Plan visitLogicalRecursiveCte(LogicalRecursiveCte recursiveCte, PruneContext context) {
219219
// keep LogicalRecursiveCte's output unchanged
220-
return skipPruneThisAndFirstLevelChildren(recursiveCte);
220+
return skipPruneThis(recursiveCte);
221221
}
222222

223223
// union can not prune children by the common logic, we must override visit method to write special code.

fe/fe-core/src/main/java/org/apache/doris/planner/RecursiveCteNode.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.apache.doris.analysis.Expr;
2121
import org.apache.doris.analysis.TupleId;
22-
import org.apache.doris.statistics.StatisticalType;
2322
import org.apache.doris.thrift.TExplainLevel;
2423
import org.apache.doris.thrift.TPlanNode;
2524
import org.apache.doris.thrift.TPlanNodeType;
@@ -37,7 +36,7 @@ public class RecursiveCteNode extends PlanNode {
3736
private TRecCTENode tRecCTENode;
3837

3938
public RecursiveCteNode(PlanNodeId id, TupleId tupleId, String cteName, boolean isUnionAll) {
40-
super(id, tupleId.asList(), "RECURSIVE_CTE", StatisticalType.RECURSIVE_CTE_NODE);
39+
super(id, tupleId.asList(), "RECURSIVE_CTE");
4140
this.cteName = cteName;
4241
this.isUnionAll = isUnionAll;
4342
}

fe/fe-core/src/main/java/org/apache/doris/planner/RecursiveCteScanNode.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.apache.doris.analysis.TupleDescriptor;
2222
import org.apache.doris.catalog.Env;
2323
import org.apache.doris.common.UserException;
24-
import org.apache.doris.statistics.StatisticalType;
2524
import org.apache.doris.system.Backend;
2625
import org.apache.doris.thrift.TExplainLevel;
2726
import org.apache.doris.thrift.TNetworkAddress;
@@ -42,7 +41,7 @@ public class RecursiveCteScanNode extends ScanNode {
4241
private final String recursiveCteName;
4342

4443
public RecursiveCteScanNode(String recursiveCteName, PlanNodeId id, TupleDescriptor desc) {
45-
super(id, desc, "RECURSIVE_CTE_SCAN", StatisticalType.CTE_SCAN_NODE);
44+
super(id, desc, "RECURSIVE_CTE_SCAN");
4645
this.recursiveCteName = recursiveCteName;
4746
}
4847

gensrc/thrift/PaloInternalService.thrift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ struct TQueryOptions {
410410

411411
175: optional bool enable_fuzzy_blockable_task = false;
412412
176: optional list<i32> shuffled_agg_ids;
413-
177: optional i32 cte_max_recursion_depth;
414413

415414
177: optional bool enable_extended_regex = false;
416415
// Target file size in bytes for Iceberg write operations

0 commit comments

Comments
 (0)