This is an automated email from the ASF dual-hosted git repository.
gabriellee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 1818526fba [fix](profile) Fix wrong instance number in query profile
(#21808)
1818526fba is described below
commit 1818526fba8937aeea9705445b2f182ce68d818a
Author: zclllyybb <[email protected]>
AuthorDate: Wed Jul 19 10:00:48 2023 +0800
[fix](profile) Fix wrong instance number in query profile (#21808)
---
.../src/main/java/org/apache/doris/qe/Coordinator.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
index 5ccbbcaa1e..7f0abff227 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
@@ -478,7 +478,8 @@ public class Coordinator {
Map<String, Integer> result = Maps.newTreeMap();
if (enablePipelineEngine) {
for (PipelineExecContexts ctxs : beToPipelineExecCtxs.values()) {
- result.put(ctxs.brpcAddr.hostname.concat(":").concat("" +
ctxs.brpcAddr.port), ctxs.ctxs.size());
+ result.put(ctxs.brpcAddr.hostname.concat(":").concat("" +
ctxs.brpcAddr.port),
+ ctxs.getInstanceNumber());
}
} else {
for (BackendExecStates states : beToExecStates.values()) {
@@ -842,7 +843,8 @@ public class Coordinator {
PipelineExecContexts ctxs =
beToPipelineExecCtxs.get(pipelineExecContext.backend.getId());
if (ctxs == null) {
ctxs = new
PipelineExecContexts(pipelineExecContext.backend.getId(),
- pipelineExecContext.brpcAddress,
twoPhaseExecution);
+ pipelineExecContext.brpcAddress,
twoPhaseExecution,
+ entry.getValue().getFragmentNumOnHost());
beToPipelineExecCtxs.putIfAbsent(pipelineExecContext.backend.getId(), ctxs);
}
ctxs.addContext(pipelineExecContext);
@@ -2996,17 +2998,24 @@ public class Coordinator {
List<PipelineExecContext> ctxs = Lists.newArrayList();
boolean twoPhaseExecution = false;
ScopedSpan scopedSpan = new ScopedSpan();
+ int instanceNumber;
- public PipelineExecContexts(long beId, TNetworkAddress brpcAddr,
boolean twoPhaseExecution) {
+ public PipelineExecContexts(long beId, TNetworkAddress brpcAddr,
boolean twoPhaseExecution,
+ int instanceNumber) {
this.beId = beId;
this.brpcAddr = brpcAddr;
this.twoPhaseExecution = twoPhaseExecution;
+ this.instanceNumber = instanceNumber;
}
public void addContext(PipelineExecContext ctx) {
this.ctxs.add(ctx);
}
+ public int getInstanceNumber() {
+ return instanceNumber;
+ }
+
/**
* The BackendExecState in states are all send to the same BE.
* So only the first BackendExecState need to carry some common
fields, such as DescriptorTbl,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
