This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 2a656d90c7a pick 25068 :align node id in explain with nereids node id
(#25068) (#25407)
2a656d90c7a is described below
commit 2a656d90c7a9a0e58e9066ed62ba16881cfb610d
Author: minghong <[email protected]>
AuthorDate: Sat Oct 14 00:41:54 2023 +0800
pick 25068 :align node id in explain with nereids node id (#25068) (#25407)
it is painful to align node in `explain` and node in `explain physical
plan`, since they use two different sets of node IDs.
This pr makes 'explain' command use node IDs of their correspond node in
'explain physical plan'
(cherry picked from commit ffaa145728d39c8b97ef9b6d95a1cad7cbde4815)
---
.../glue/translator/PhysicalPlanTranslator.java | 56 +++++++++++-----------
.../doris/nereids/trees/AbstractTreeNode.java | 9 ++++
.../apache/doris/nereids/trees/plans/ObjectId.java | 5 ++
.../trees/plans/physical/PhysicalOlapScan.java | 2 +-
.../suites/nereids_syntax_p0/agg_4_phase.groovy | 10 ++--
5 files changed, 47 insertions(+), 35 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
index fe52493f64f..549a6c8c1c7 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
@@ -273,7 +273,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
}
}
- ExchangeNode exchangeNode = new ExchangeNode(context.nextPlanNodeId(),
inputFragment.getPlanRoot());
+ ExchangeNode exchangeNode = new
ExchangeNode(distribute.translatePlanNodeId(), inputFragment.getPlanRoot());
updateLegacyPlanIdToPhysicalPlan(exchangeNode, distribute);
List<ExprId> validOutputIds = distribute.getOutputExprIds();
if (distribute.child() instanceof PhysicalHashAggregate) {
@@ -462,24 +462,24 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
if (table instanceof HMSExternalTable) {
switch (((HMSExternalTable) table).getDlaType()) {
case HUDI:
- scanNode = new HudiScanNode(context.nextPlanNodeId(),
tupleDescriptor, false);
+ scanNode = new
HudiScanNode(fileScan.translatePlanNodeId(), tupleDescriptor, false);
break;
case ICEBERG:
- scanNode = new IcebergScanNode(context.nextPlanNodeId(),
tupleDescriptor, false);
+ scanNode = new
IcebergScanNode(fileScan.translatePlanNodeId(), tupleDescriptor, false);
break;
case HIVE:
- scanNode = new HiveScanNode(context.nextPlanNodeId(),
tupleDescriptor, false);
+ scanNode = new
HiveScanNode(fileScan.translatePlanNodeId(), tupleDescriptor, false);
((HiveScanNode)
scanNode).setSelectedPartitions(fileScan.getSelectedPartitions());
break;
default:
throw new RuntimeException("do not support DLA type " +
((HMSExternalTable) table).getDlaType());
}
} else if (table instanceof IcebergExternalTable) {
- scanNode = new IcebergScanNode(context.nextPlanNodeId(),
tupleDescriptor, false);
+ scanNode = new IcebergScanNode(fileScan.translatePlanNodeId(),
tupleDescriptor, false);
} else if (table instanceof PaimonExternalTable) {
- scanNode = new PaimonScanNode(context.nextPlanNodeId(),
tupleDescriptor, false);
+ scanNode = new PaimonScanNode(fileScan.translatePlanNodeId(),
tupleDescriptor, false);
} else if (table instanceof MaxComputeExternalTable) {
- scanNode = new MaxComputeScanNode(context.nextPlanNodeId(),
tupleDescriptor, false);
+ scanNode = new MaxComputeScanNode(fileScan.translatePlanNodeId(),
tupleDescriptor, false);
} else {
throw new RuntimeException("do not support table type " +
table.getType());
}
@@ -520,7 +520,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
ArrayList<TupleId> tupleIds = new ArrayList<>();
tupleIds.add(tupleDescriptor.getId());
- EmptySetNode emptySetNode = new EmptySetNode(context.nextPlanNodeId(),
tupleIds);
+ EmptySetNode emptySetNode = new
EmptySetNode(emptyRelation.translatePlanNodeId(), tupleIds);
PlanFragment planFragment = createPlanFragment(emptySetNode,
DataPartition.UNPARTITIONED, emptyRelation);
@@ -534,7 +534,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
List<Slot> slots = esScan.getOutput();
ExternalTable table = esScan.getTable();
TupleDescriptor tupleDescriptor = generateTupleDesc(slots, table,
context);
- EsScanNode esScanNode = new EsScanNode(context.nextPlanNodeId(),
tupleDescriptor, true);
+ EsScanNode esScanNode = new EsScanNode(esScan.translatePlanNodeId(),
tupleDescriptor, true);
esScanNode.addConjuncts(translateToLegacyConjuncts(esScan.getConjuncts()));
Utils.execWithUncheckedException(esScanNode::init);
context.addScanNode(esScanNode);
@@ -556,7 +556,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
List<Slot> slots = jdbcScan.getOutput();
TableIf table = jdbcScan.getTable();
TupleDescriptor tupleDescriptor = generateTupleDesc(slots, table,
context);
- JdbcScanNode jdbcScanNode = new JdbcScanNode(context.nextPlanNodeId(),
tupleDescriptor,
+ JdbcScanNode jdbcScanNode = new
JdbcScanNode(jdbcScan.translatePlanNodeId(), tupleDescriptor,
table instanceof JdbcExternalTable);
jdbcScanNode.addConjuncts(translateToLegacyConjuncts(jdbcScan.getConjuncts()));
Utils.execWithUncheckedException(jdbcScanNode::init);
@@ -584,8 +584,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
if (olapScan.getSelectedIndexId() !=
olapScan.getTable().getBaseIndexId()) {
generateTupleDesc(olapScan.getBaseOutputs(), olapTable, context);
}
-
- OlapScanNode olapScanNode = new OlapScanNode(context.nextPlanNodeId(),
tupleDescriptor, "OlapScanNode");
+ OlapScanNode olapScanNode = new
OlapScanNode(olapScan.translatePlanNodeId(), tupleDescriptor, "OlapScanNode");
// TODO: move all node set cardinality into one place
if (olapScan.getStats() != null) {
olapScanNode.setCardinality((long)
olapScan.getStats().getRowCount());
@@ -689,7 +688,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
slotDescriptor.setIsNullable(slots.get(i).nullable());
}
- UnionNode unionNode = new UnionNode(context.nextPlanNodeId(),
oneRowTuple.getId());
+ UnionNode unionNode = new
UnionNode(oneRowRelation.translatePlanNodeId(), oneRowTuple.getId());
unionNode.setCardinality(1L);
unionNode.addConstExprList(legacyExprs);
unionNode.finalizeForNereids(oneRowTuple.getSlots(), new
ArrayList<>());
@@ -705,7 +704,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
Table table = schemaScan.getTable();
List<Slot> slots = ImmutableList.copyOf(schemaScan.getOutput());
TupleDescriptor tupleDescriptor = generateTupleDesc(slots, table,
context);
- SchemaScanNode scanNode = new SchemaScanNode(context.nextPlanNodeId(),
tupleDescriptor);
+ SchemaScanNode scanNode = new
SchemaScanNode(schemaScan.translatePlanNodeId(), tupleDescriptor);
context.getRuntimeTranslator().ifPresent(
runtimeFilterGenerator ->
runtimeFilterGenerator.getTargetOnScanNode(schemaScan.getRelationId())
.forEach(expr ->
runtimeFilterGenerator.translateRuntimeFilterTarget(expr, scanNode, context)
@@ -725,7 +724,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
TupleDescriptor tupleDescriptor = generateTupleDesc(slots,
tvfRelation.getFunction().getTable(), context);
TableValuedFunctionIf catalogFunction =
tvfRelation.getFunction().getCatalogFunction();
- ScanNode scanNode =
catalogFunction.getScanNode(context.nextPlanNodeId(), tupleDescriptor);
+ ScanNode scanNode =
catalogFunction.getScanNode(tvfRelation.translatePlanNodeId(), tupleDescriptor);
Utils.execWithUncheckedException(scanNode::init);
context.getRuntimeTranslator().ifPresent(
runtimeFilterGenerator ->
runtimeFilterGenerator.getTargetOnScanNode(tvfRelation.getRelationId())
@@ -803,7 +802,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
boolean isPartial =
aggregate.getAggregateParam().aggMode.productAggregateBuffer;
AggregateInfo aggInfo = AggregateInfo.create(execGroupingExpressions,
execAggregateFunctions,
aggFunOutputIds, isPartial, outputTupleDesc, outputTupleDesc,
aggregate.getAggPhase().toExec());
- AggregationNode aggregationNode = new
AggregationNode(context.nextPlanNodeId(),
+ AggregationNode aggregationNode = new
AggregationNode(aggregate.translatePlanNodeId(),
inputPlanFragment.getPlanRoot(), aggInfo);
if (!aggregate.getAggMode().isFinalPhase) {
aggregationNode.unsetNeedsFinalize();
@@ -895,7 +894,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
PlanTranslatorContext context) {
PlanFragment currentFragment = assertNumRows.child().accept(this,
context);
// create assertNode
- AssertNumRowsNode assertNumRowsNode = new
AssertNumRowsNode(context.nextPlanNodeId(),
+ AssertNumRowsNode assertNumRowsNode = new
AssertNumRowsNode(assertNumRows.translatePlanNodeId(),
currentFragment.getPlanRoot(),
ExpressionTranslator.translateAssert(assertNumRows.getAssertNumRowsElement()));
addPlanRoot(currentFragment, assertNumRowsNode, assertNumRows);
@@ -989,7 +988,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
PlanNode planNode = inputFragment.getPlanRoot();
if (planNode instanceof ExchangeNode || planNode instanceof SortNode
|| planNode instanceof UnionNode) {
// the three nodes don't support conjuncts, need create a
SelectNode to filter data
- SelectNode selectNode = new SelectNode(context.nextPlanNodeId(),
planNode);
+ SelectNode selectNode = new
SelectNode(filter.translatePlanNodeId(), planNode);
addConjunctsToPlanNode(filter, selectNode, context);
addPlanRoot(inputFragment, selectNode, filter);
} else {
@@ -1023,7 +1022,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
.flatMap(List::stream)
.map(SlotDescriptor::getId)
.collect(Collectors.toList());
- TableFunctionNode tableFunctionNode = new
TableFunctionNode(context.nextPlanNodeId(),
+ TableFunctionNode tableFunctionNode = new
TableFunctionNode(generate.translatePlanNodeId(),
currentFragment.getPlanRoot(), tupleDescriptor.getId(),
functionCalls, outputSlotIds);
addPlanRoot(currentFragment, tableFunctionNode, generate);
return currentFragment;
@@ -1101,7 +1100,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
.map(e -> ExpressionTranslator.translate(e, context))
.collect(Collectors.toList());
- HashJoinNode hashJoinNode = new HashJoinNode(context.nextPlanNodeId(),
leftPlanRoot,
+ HashJoinNode hashJoinNode = new
HashJoinNode(hashJoin.translatePlanNodeId(), leftPlanRoot,
rightPlanRoot, JoinType.toJoinOperator(joinType),
execEqConjuncts, Lists.newArrayList(),
null, null, null, hashJoin.isMarkJoin());
@@ -1343,8 +1342,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
.collect(Collectors.toList());
JoinType joinType = nestedLoopJoin.getJoinType();
-
- NestedLoopJoinNode nestedLoopJoinNode = new
NestedLoopJoinNode(context.nextPlanNodeId(),
+ NestedLoopJoinNode nestedLoopJoinNode = new
NestedLoopJoinNode(nestedLoopJoin.translatePlanNodeId(),
leftFragmentPlanRoot, rightFragmentPlanRoot, tupleIds,
JoinType.toJoinOperator(joinType),
null, null, null, nestedLoopJoin.isMarkJoin());
if (nestedLoopJoin.getStats() != null) {
@@ -1678,11 +1676,11 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
SetOperationNode setOperationNode;
// create setOperationNode
if (setOperation instanceof PhysicalUnion) {
- setOperationNode = new UnionNode(context.nextPlanNodeId(),
setTuple.getId());
+ setOperationNode = new
UnionNode(setOperation.translatePlanNodeId(), setTuple.getId());
} else if (setOperation instanceof PhysicalExcept) {
- setOperationNode = new ExceptNode(context.nextPlanNodeId(),
setTuple.getId());
+ setOperationNode = new
ExceptNode(setOperation.translatePlanNodeId(), setTuple.getId());
} else if (setOperation instanceof PhysicalIntersect) {
- setOperationNode = new IntersectNode(context.nextPlanNodeId(),
setTuple.getId());
+ setOperationNode = new
IntersectNode(setOperation.translatePlanNodeId(), setTuple.getId());
} else {
throw new RuntimeException("not support set operation type " +
setOperation);
}
@@ -1899,7 +1897,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
.flatMap(Set::stream)
.collect(ImmutableSet.toImmutableSet());
- RepeatNode repeatNode = new RepeatNode(context.nextPlanNodeId(),
+ RepeatNode repeatNode = new RepeatNode(repeat.translatePlanNodeId(),
inputPlanFragment.getPlanRoot(), groupingInfo,
repeatSlotIdList,
allSlotId,
repeat.computeVirtualSlotValues(sortedVirtualSlots));
addPlanRoot(inputPlanFragment, repeatNode, repeat);
@@ -1974,7 +1972,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
// 4. generate AnalyticEvalNode
AnalyticEvalNode analyticEvalNode = new AnalyticEvalNode(
- context.nextPlanNodeId(),
+ physicalWindow.translatePlanNodeId(),
inputPlanFragment.getPlanRoot(),
analyticFnCalls,
partitionExprs,
@@ -2018,7 +2016,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
nullsFirstParams.add(k.isNullFirst());
});
SortInfo sortInfo = new SortInfo(orderingExprs, ascOrders,
nullsFirstParams, sortTuple);
- PartitionSortNode partitionSortNode = new
PartitionSortNode(context.nextPlanNodeId(), childNode,
+ PartitionSortNode partitionSortNode = new
PartitionSortNode(partitionTopN.translatePlanNodeId(), childNode,
partitionTopN.getFunction(), partitionExprs, sortInfo,
partitionTopN.hasGlobalLimit(),
partitionTopN.getPartitionLimit());
if (partitionTopN.getStats() != null) {
@@ -2041,7 +2039,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
nullsFirstParams.add(k.isNullFirst());
});
SortInfo sortInfo = new SortInfo(orderingExprs, ascOrders,
nullsFirstParams, sortTuple);
- SortNode sortNode = new SortNode(context.nextPlanNodeId(), childNode,
sortInfo, sort instanceof PhysicalTopN);
+ SortNode sortNode = new SortNode(sort.translatePlanNodeId(),
childNode, sortInfo, sort instanceof PhysicalTopN);
if (sort.getStats() != null) {
sortNode.setCardinality((long) sort.getStats().getRowCount());
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/AbstractTreeNode.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/AbstractTreeNode.java
index 990c87bb8c4..9a0ccf37045 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/AbstractTreeNode.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/AbstractTreeNode.java
@@ -20,6 +20,7 @@ package org.apache.doris.nereids.trees;
import org.apache.doris.nereids.memo.GroupExpression;
import org.apache.doris.nereids.trees.expressions.StatementScopeIdGenerator;
import org.apache.doris.nereids.trees.plans.ObjectId;
+import org.apache.doris.planner.PlanNodeId;
import com.google.common.collect.ImmutableList;
@@ -70,4 +71,12 @@ public abstract class AbstractTreeNode<NODE_TYPE extends
TreeNode<NODE_TYPE>>
public int arity() {
return children.size();
}
+
+ /**
+ * used for PhysicalPlanTranslator only
+ * @return PlanNodeId
+ */
+ public PlanNodeId translatePlanNodeId() {
+ return id.toPlanNodeId();
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/ObjectId.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/ObjectId.java
index c1f58361b31..878c24e10fb 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/ObjectId.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/ObjectId.java
@@ -20,6 +20,7 @@ package org.apache.doris.nereids.trees.plans;
import org.apache.doris.common.Id;
import org.apache.doris.common.IdGenerator;
import org.apache.doris.nereids.trees.expressions.StatementScopeIdGenerator;
+import org.apache.doris.planner.PlanNodeId;
import java.util.Objects;
@@ -65,4 +66,8 @@ public class ObjectId extends Id<ObjectId> {
public String toString() {
return "ObjectId#" + id;
}
+
+ public PlanNodeId toPlanNodeId() {
+ return new PlanNodeId(id);
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapScan.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapScan.java
index 47433c3389a..ba104536fb0 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapScan.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapScan.java
@@ -120,7 +120,7 @@ public class PhysicalOlapScan extends
PhysicalCatalogRelation implements OlapSca
@Override
public String toString() {
- return Utils.toSqlString("PhysicalOlapScan[" + relationId.asInt() +
"]" + getGroupIdAsString(),
+ return Utils.toSqlString("PhysicalOlapScan[" + id.asInt() + "]" +
getGroupIdAsString(),
"qualified", Utils.qualifiedName(qualifier, table.getName()),
"stats", statistics, "fr",
getMutableState(AbstractPlan.FRAGMENT_ID)
);
diff --git a/regression-test/suites/nereids_syntax_p0/agg_4_phase.groovy
b/regression-test/suites/nereids_syntax_p0/agg_4_phase.groovy
index a672f8dee3e..4a3e60afb73 100644
--- a/regression-test/suites/nereids_syntax_p0/agg_4_phase.groovy
+++ b/regression-test/suites/nereids_syntax_p0/agg_4_phase.groovy
@@ -49,11 +49,11 @@ suite("agg_4_phase") {
"""
explain{
sql(test_sql)
- contains "5:VAGGREGATE (merge finalize)"
- contains "4:VEXCHANGE"
- contains "3:VAGGREGATE (update serialize)"
- contains "2:VAGGREGATE (merge serialize)"
- contains "1:VAGGREGATE (update serialize)"
+ contains ":VAGGREGATE (merge finalize)"
+ contains ":VEXCHANGE"
+ contains ":VAGGREGATE (update serialize)"
+ contains ":VAGGREGATE (merge serialize)"
+ contains ":VAGGREGATE (update serialize)"
}
qt_4phase (test_sql)
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
