Skip to content

[IOTDB-5599] Bug: One query is divided too much tasks to be allowed by system #9176

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 3 commits into from
Mar 1, 2023
Merged

[IOTDB-5599] Bug: One query is divided too much tasks to be allowed by system #9176

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4b072e
Fix identitySink and shuffleSink problem
Alima777 Feb 28, 2023
6c36939
Fix onebyOne with oneByOne child
Alima777 Feb 28, 2023
d183302
set dop 1 for shuffle sink
Alima777 Mar 1, 2023
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
17 changes: 8 additions & 9 deletions server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1887,10 +1887,7 @@ public Operator visitIdentitySink(IdentitySinkNode node, LocalExecutionPlanConte
IdentitySinkOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);

List<Operator> children =
node.getChildren().stream()
.map(child -> child.accept(this, context))
.collect(Collectors.toList());
List<Operator> children = dealWithConsumeChildrenOneByOneNode(node, context);

checkArgument(
MPP_DATA_EXCHANGE_MANAGER != null, "MPP_DATA_EXCHANGE_MANAGER should not be null");
Expand Down Expand Up @@ -1922,10 +1919,9 @@ public Operator visitShuffleSink(ShuffleSinkNode node, LocalExecutionPlanContext
ShuffleHelperOperator.class.getSimpleName());
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);

List<Operator> children =
node.getChildren().stream()
.map(child -> child.accept(this, context))
.collect(Collectors.toList());
// TODO implement pipeline division for shuffle sink
context.setDegreeOfParallelism(1);
List<Operator> children = dealWithConsumeAllChildrenPipelineBreaker(node, context);

checkArgument(
MPP_DATA_EXCHANGE_MANAGER != null, "MPP_DATA_EXCHANGE_MANAGER should not be null");
Expand Down Expand Up @@ -2552,7 +2548,10 @@ public List<Operator> dealWithConsumeChildrenOneByOneNode(
subContext.setISink(localSinkChannel);
subContext.addPipelineDriverFactory(childOperation, subContext.getDriverContext());

int curChildPipelineNum = subContext.getPipelineNumber() - originPipeNum;
// OneByOneChild may be divided into more than dop pipelines, but the number of running
// actually is dop
int curChildPipelineNum =
Math.min(dopForChild, subContext.getPipelineNumber() - originPipeNum);
childPipelineNums.add(curChildPipelineNum);
sumOfChildPipelines += curChildPipelineNum;
// If sumOfChildPipelines > dopForChild, we have to wait until some pipelines finish
Expand Down