This is an automated email from the ASF dual-hosted git repository.
lihaopeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0fa917703e [Bug] Fix some node in vectorized not have `V` title (#9028)
0fa917703e is described below
commit 0fa917703e9217d0239c6d8c65a94a8abce9674a
Author: HappenLee <happen...@hotmail.com>
AuthorDate: Fri Apr 15 11:25:52 2022 +0800
[Bug] Fix some node in vectorized not have `V` title (#9028)
Co-authored-by: lihaopeng <lihaop...@baidu.com>
---
.../main/java/org/apache/doris/common/profile/PlanTreeBuilder.java | 4 +---
.../src/main/java/org/apache/doris/planner/AggregationNode.java | 3 ++-
fe/fe-core/src/main/java/org/apache/doris/planner/ExchangeNode.java | 5 +++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/profile/PlanTreeBuilder.java
b/fe/fe-core/src/main/java/org/apache/doris/common/profile/PlanTreeBuilder.java
index 8d8d088c3b..f388af4225 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/common/profile/PlanTreeBuilder.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/profile/PlanTreeBuilder.java
@@ -113,9 +113,7 @@ public class PlanTreeBuilder {
parent.addChild(node);
}
- if (planNode.getPlanNodeName().equals(ExchangeNode.EXCHANGE_NODE)
- ||
planNode.getPlanNodeName().equals(ExchangeNode.VEXCHANGE_NODE)
- ||
planNode.getPlanNodeName().equals(ExchangeNode.MERGING_EXCHANGE_NODE)) {
+ if (planNode.getPlanNodeName().contains(ExchangeNode.EXCHANGE_NODE)) {
exchangeNodes.add(node);
} else {
// Do not traverse children of exchange node,
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
index 556fc0ab15..8bc514d19c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
@@ -24,6 +24,7 @@ import org.apache.doris.analysis.FunctionCallExpr;
import org.apache.doris.analysis.SlotId;
import org.apache.doris.common.NotImplementedException;
import org.apache.doris.common.UserException;
+import org.apache.doris.common.util.VectorizedUtil;
import org.apache.doris.thrift.TAggregationNode;
import org.apache.doris.thrift.TExplainLevel;
import org.apache.doris.thrift.TExpr;
@@ -239,7 +240,7 @@ public class AggregationNode extends PlanNode {
private void updateplanNodeName() {
StringBuilder sb = new StringBuilder();
- sb.append("AGGREGATE");
+ sb.append(VectorizedUtil.isVectorized() ? "VAGGREGATE" : "AGGREGATE");
sb.append(" (");
if (aggInfo.isMerge()) {
sb.append("merge");
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/ExchangeNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/ExchangeNode.java
index 1c8669dadf..88e6ee202e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/ExchangeNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ExchangeNode.java
@@ -22,6 +22,7 @@ import org.apache.doris.analysis.Expr;
import org.apache.doris.analysis.SortInfo;
import org.apache.doris.analysis.TupleId;
import org.apache.doris.common.UserException;
+import org.apache.doris.common.util.VectorizedUtil;
import org.apache.doris.thrift.TExchangeNode;
import org.apache.doris.thrift.TPlanNode;
import org.apache.doris.thrift.TPlanNodeType;
@@ -51,7 +52,6 @@ public class ExchangeNode extends PlanNode {
private static final Logger LOG = LogManager.getLogger(ExchangeNode.class);
public static final String EXCHANGE_NODE = "EXCHANGE";
- public static final String VEXCHANGE_NODE = "VEXCHANGE";
public static final String MERGING_EXCHANGE_NODE = "MERGING-EXCHANGE";
// The parameters based on which sorted input streams are merged by this
@@ -121,7 +121,8 @@ public class ExchangeNode extends PlanNode {
public void setMergeInfo(SortInfo info, long offset) {
this.mergeInfo = info;
this.offset = offset;
- this.planNodeName = MERGING_EXCHANGE_NODE;
+ this.planNodeName = VectorizedUtil.isVectorized() ? "V" +
MERGING_EXCHANGE_NODE
+ : MERGING_EXCHANGE_NODE;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
