Skip to content

Fix error judgement for MainFragmentLocatedRegion and MostlyUsedDataRegion in distributed plan #11636

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
JackieTien97 merged 1 commit into from
Nov 29, 2023
Merged

Fix error judgement for MainFragmentLocatedRegion and MostlyUsedDataRegion in distributed plan #11636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 23 additions & 18 deletions ...ain/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,24 +462,29 @@ private TRegionReplicaSet calculateDataRegionByChildren(
// Step 2: return the RegionReplicaSet with max node count
long maxCount = -1;
TRegionReplicaSet result = DataPartition.NOT_ASSIGNED;
for (Map.Entry<TRegionReplicaSet, Long> entry : groupByRegion.entrySet()) {
TRegionReplicaSet region = entry.getKey();
if (DataPartition.NOT_ASSIGNED.equals(region)) {
continue;
}
if (region.equals(context.queryContext.getMainFragmentLocatedRegion())) {
return context.queryContext.getMainFragmentLocatedRegion();
}
if (region.equals(context.getMostlyUsedDataRegion())) {
return region;
}
long planNodeCount = entry.getValue();
if (planNodeCount > maxCount) {
maxCount = planNodeCount;
result = region;
} else if (planNodeCount == maxCount
&& region.getRegionId().getId() < result.getRegionId().getId()) {
result = region;
// use MainFragmentLocatedRegion firstly,
// if MainFragmentLocatedRegion is not exist, use MostlyUsedDataRegion,
// otherwise use region which has most plan nodes.
if (context.queryContext.getMainFragmentLocatedRegion() != null
&& groupByRegion.containsKey(context.queryContext.getMainFragmentLocatedRegion())) {
return context.queryContext.getMainFragmentLocatedRegion();
} else if (context.getMostlyUsedDataRegion() != null
&& groupByRegion.containsKey(context.getMostlyUsedDataRegion())) {
return context.getMostlyUsedDataRegion();
} else {
for (Map.Entry<TRegionReplicaSet, Long> entry : groupByRegion.entrySet()) {
TRegionReplicaSet region = entry.getKey();
if (DataPartition.NOT_ASSIGNED.equals(region)) {
continue;
}
long planNodeCount = entry.getValue();
if (planNodeCount > maxCount) {
maxCount = planNodeCount;
result = region;
} else if (planNodeCount == maxCount
&& region.getRegionId().getId() < result.getRegionId().getId()) {
result = region;
}
}
}
return result;
Expand Down