Skip to content

Fix SplitAssignment filtering #15933

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
arhimondr merged 1 commit into from
Feb 8, 2023
Merged

Fix SplitAssignment filtering #15933

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
8 changes: 4 additions & 4 deletions core/trino-main/src/main/java/io/trino/server/remotetask/HttpRemoteTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ public HttpRemoteTask(
long numOfPartitionedSources = planFragment.getPartitionedSources().size();
// Currently it supports only when there is one partitioned source.
// TODO. https://github.com/trinodb/trino/issues/15820
this.adaptiveUpdateRequestSizeEnabled = numOfPartitionedSources == 1 ? isRemoteTaskAdaptiveUpdateRequestSizeEnabled(session) : false;
this.adaptiveUpdateRequestSizeEnabled = numOfPartitionedSources == 1 && isRemoteTaskAdaptiveUpdateRequestSizeEnabled(session);
if (numOfPartitionedSources > 1) {
log.debug("%s - There are more than one partitioned sources: numOfPartitionedSources=%s",
taskId, planFragment.getPartitionedSources().size());
Expand Down Expand Up @@ -650,16 +650,16 @@ boolean adjustSplitBatchSize(List<SplitAssignment> splitAssignments, long reques
}
}
if (numSplits != 0) {
newSplitBatchSize = (int) (numSplits * (maxRequestSizeInBytes - requestSizeHeadroomInBytes) / requestSize);
newSplitBatchSize = (int) ((numSplits * (maxRequestSizeInBytes - requestSizeHeadroomInBytes)) / requestSize);
newSplitBatchSize = Math.max(guaranteedSplitsPerRequest, Math.min(maxUnacknowledgedSplits, newSplitBatchSize));
}
if (newSplitBatchSize != currentSplitBatchSize) {
log.debug("%s - Split batch size changed: prevSize=%s, newSize=%s", taskId, currentSplitBatchSize, newSplitBatchSize);
splitBatchSize.set(newSplitBatchSize);
}
// abandon current request and reschedule update if size of request body exceeds requestSizeLimit and splitBatchSize is updated
if (newSplitBatchSize < currentSplitBatchSize) {
log.debug("%s - current taskUpdateRequestJson exceeded limit: %d, currentSplitBatchSize: %d, newSplitBatchSize: %d, reschedule.",
if (numSplits > newSplitBatchSize && requestSize > maxRequestSizeInBytes) {
log.debug("%s - current taskUpdateRequestJson exceeded limit: %d, currentSplitBatchSize: %d, newSplitBatchSize: %d",
taskId, requestSize, currentSplitBatchSize, newSplitBatchSize);
return true; // reschedule needed
}
Expand Down