Skip to content

[fix](profile) Fix merge profile failed due to NonZeroCounter #47465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 2 commits into from
Feb 5, 2025
Merged

[fix](profile) Fix merge profile failed due to NonZeroCounter #47465

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6ac918
FX
zhiqiang-hhhh Jan 26, 2025
bb6b44f
FMT
zhiqiang-hhhh Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions fe/fe-core/src/main/java/org/apache/doris/common/profile/RuntimeProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,18 +529,20 @@ private static void mergeCounters(String parentCounterName, List<RuntimeProfile>
for (String childCounterName : childCounterSet) {
Counter counter = templateProfile.counterMap.get(childCounterName);
if (counter == null) {
throw new RuntimeException("Child counter " + childCounterName + " of " + parentCounterName
+ " not found in profile");
if (LOG.isDebugEnabled()) {
LOG.debug("Child counter {} of {} not found in profile {}", childCounterName, parentCounterName,
templateProfile.toString());
}
continue;
}
if (counter.getLevel() == 1) {
Counter oldCounter = templateCounterMap.get(childCounterName);
AggCounter aggCounter = new AggCounter(oldCounter.getType());
for (RuntimeProfile profile : profiles) {
// orgCounter could be null if counter structure is changed
// change of counter structure happens when NonZeroCounter is involved.
// So here we have to ignore the counter if it is not found in the profile.
Counter orgCounter = profile.counterMap.get(childCounterName);
if (orgCounter == null) {
throw new RuntimeException("Child counter " + childCounterName
+ " of " + parentCounterName + " not found in profile");
}
aggCounter.addCounter(orgCounter);
}
if (nereidsId != null && childCounterName.equals("RowsProduced")) {
Expand Down