Skip to content
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.

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

Treat flushing state as terminal state if buffer is empty #22711

Merged
merged 1 commit into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
import com.facebook.airlift.stats.CounterStat;
import com.facebook.presto.Session;
import com.facebook.presto.execution.StateMachine.StateChangeListener;
import com.facebook.presto.execution.buffer.BufferInfo;
import com.facebook.presto.execution.buffer.BufferResult;
import com.facebook.presto.execution.buffer.LazyOutputBuffer;
import com.facebook.presto.execution.buffer.OutputBuffer;
import com.facebook.presto.execution.buffer.OutputBufferInfo;
import com.facebook.presto.execution.buffer.OutputBuffers;
import com.facebook.presto.execution.buffer.OutputBuffers.OutputBufferId;
import com.facebook.presto.execution.buffer.SpoolingOutputBufferFactory;
Expand Down Expand Up @@ -495,12 +495,9 @@ public ListenableFuture<BufferResult> getTaskResults(OutputBufferId bufferId, lo
return outputBuffer.get(bufferId, startingSequenceId, maxSize);
}

public Optional<BufferInfo> getTaskBufferInfo(OutputBufferId bufferId)
public OutputBufferInfo getOutputBufferInfo()
{
requireNonNull(bufferId, "bufferId is null");
return outputBuffer.getInfo().getBuffers().stream()
.filter(bufferInfo -> bufferInfo.getBufferId().equals(bufferId))
.findFirst();
return outputBuffer.getInfo();
}

public void acknowledgeTaskResults(OutputBufferId bufferId, long sequenceId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import com.facebook.presto.common.block.BlockEncodingSerde;
import com.facebook.presto.event.SplitMonitor;
import com.facebook.presto.execution.StateMachine.StateChangeListener;
import com.facebook.presto.execution.buffer.BufferInfo;
import com.facebook.presto.execution.buffer.BufferResult;
import com.facebook.presto.execution.buffer.OutputBufferInfo;
import com.facebook.presto.execution.buffer.OutputBuffers;
import com.facebook.presto.execution.buffer.OutputBuffers.OutputBufferId;
import com.facebook.presto.execution.buffer.SpoolingOutputBufferFactory;
Expand Down Expand Up @@ -454,12 +454,10 @@ public ListenableFuture<BufferResult> getTaskResults(TaskId taskId, OutputBuffer
return tasks.getUnchecked(taskId).getTaskResults(bufferId, startingSequenceId, maxSize);
}

@Override
public Optional<BufferInfo> getTaskBufferInfo(TaskId taskId, OutputBufferId bufferId)
public OutputBufferInfo getOutputBufferInfo(TaskId taskId)
{
requireNonNull(taskId, "taskId is null");
requireNonNull(bufferId, "bufferId is null");
return tasks.getUnchecked(taskId).getTaskBufferInfo(bufferId);
return tasks.getUnchecked(taskId).getOutputBufferInfo();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import com.facebook.presto.Session;
import com.facebook.presto.execution.StateMachine.StateChangeListener;
import com.facebook.presto.execution.buffer.BufferInfo;
import com.facebook.presto.execution.buffer.BufferResult;
import com.facebook.presto.execution.buffer.OutputBufferInfo;
import com.facebook.presto.execution.buffer.OutputBuffers;
import com.facebook.presto.execution.buffer.OutputBuffers.OutputBufferId;
import com.facebook.presto.execution.scheduler.TableWriteInfo;
Expand Down Expand Up @@ -119,11 +119,9 @@ TaskInfo updateTask(
ListenableFuture<BufferResult> getTaskResults(TaskId taskId, OutputBufferId bufferId, long startingSequenceId, DataSize maxSize);

/**
* Gets the {@link BufferInfo} associated with the specified task and buffer id.
*
* @return absent if the buffer is not present, otherwise the buffer info
* Gets the {@link OutputBufferInfo} associated with the specified task.
*/
Optional<BufferInfo> getTaskBufferInfo(TaskId taskId, OutputBufferId bufferId);
OutputBufferInfo getOutputBufferInfo(TaskId taskId);

/**
* Acknowledges previously received results.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,11 @@ public void onTimeout(AsyncEvent event)
() -> BufferResult.emptyResults(
taskManager.getTaskInstanceId(taskId),
token,
taskManager.getTaskBufferInfo(taskId, bufferId)
taskManager.getOutputBufferInfo(taskId).getBuffers().stream()
.filter(bufferInfo -> bufferInfo.getBufferId().equals(bufferId))
.map(BufferInfo::getPageBufferInfo)
.map(PageBufferInfo::getBufferedBytes)
.findFirst()
.orElse(0L),
false),
waitTime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.facebook.presto.execution.TaskManager;
import com.facebook.presto.execution.TaskState;
import com.facebook.presto.execution.TaskStatus;
import com.facebook.presto.execution.buffer.OutputBufferInfo;
import com.facebook.presto.execution.buffer.OutputBuffers.OutputBufferId;
import com.facebook.presto.metadata.HandleResolver;
import com.facebook.presto.metadata.MetadataUpdates;
Expand Down Expand Up @@ -300,11 +301,19 @@ public Response taskResultsHeaders(
requireNonNull(taskId, "taskId is null");
requireNonNull(bufferId, "bufferId is null");

return taskManager.getTaskBufferInfo(taskId, bufferId)
.map(bufferInfo -> Response.ok()
.header(PRESTO_BUFFER_REMAINING_BYTES, bufferInfo.getPageBufferInfo().getBufferedBytes())
.header(PRESTO_BUFFER_COMPLETE, bufferInfo.isFinished())
.build())
OutputBufferInfo outputBufferInfo = taskManager.getOutputBufferInfo(taskId);
return outputBufferInfo.getBuffers().stream()
.filter(bufferInfo -> bufferInfo.getBufferId().equals(bufferId))
.map(bufferInfo -> {
long bufferedBytes = bufferInfo.getPageBufferInfo().getBufferedBytes();
return Response.ok()
.header(PRESTO_BUFFER_REMAINING_BYTES, bufferedBytes)
.header(PRESTO_BUFFER_COMPLETE, bufferInfo.isFinished()
// a buffer which has the noMorePages flag set and which is empty is completed
|| (!outputBufferInfo.getState().canAddPages() && bufferedBytes == 0))
.build();
})
.findFirst()
.orElse(Response.status(Response.Status.NOT_FOUND).build());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,11 @@ public ListenableFuture<ThriftBufferResult> getResults(TaskId taskId, OutputBuff
() -> BufferResult.emptyResults(
taskManager.getTaskInstanceId(taskId),
token,
taskManager.getTaskBufferInfo(taskId, bufferId)
taskManager.getOutputBufferInfo(taskId).getBuffers().stream()
.filter(info -> info.getBufferId().equals(bufferId))
.map(BufferInfo::getPageBufferInfo)
.map(PageBufferInfo::getBufferedBytes)
.findFirst()
.orElse(0L),
false),
waitTime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public void testSimpleQuery()
// Task results clear out all buffered data once ack is sent
long pagesRetanedSizeInBytes = results.getSerializedPages().stream().mapToLong(SerializedPage::getRetainedSizeInBytes).sum();
assertEquals(results.getBufferedBytes(), 0);
Optional<BufferInfo> taskBufferInfo = sqlTask.getTaskBufferInfo(OUT);
Optional<BufferInfo> taskBufferInfo = sqlTask.getOutputBufferInfo().getBuffers().stream().filter(buffer -> buffer.getBufferId().equals(OUT)).findFirst();
assertTrue(taskBufferInfo.isPresent());
// Buffer still remains as acknowledgement has not been received
assertEquals(taskBufferInfo.get().getPageBufferInfo().getBufferedBytes(), pagesRetanedSizeInBytes);
Expand All @@ -175,7 +175,7 @@ public void testSimpleQuery()
results = sqlTask.getTaskResults(OUT, results.getToken() + results.getSerializedPages().size(), new DataSize(1, MEGABYTE)).get();
pagesRetanedSizeInBytes = results.getSerializedPages().stream().mapToLong(SerializedPage::getRetainedSizeInBytes).sum();
assertEquals(results.getBufferedBytes(), pagesRetanedSizeInBytes);
taskBufferInfo = sqlTask.getTaskBufferInfo(OUT);
taskBufferInfo = sqlTask.getOutputBufferInfo().getBuffers().stream().filter(buffer -> buffer.getBufferId().equals(OUT)).findFirst();
assertTrue(taskBufferInfo.isPresent());
assertEquals(taskBufferInfo.get().getPageBufferInfo().getBufferedBytes(), pagesRetanedSizeInBytes);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,17 @@ public void testRemainingBufferMetadata()
// Task results clear out all buffered data once ack is sent
long retainedPageSize = results.getSerializedPages().get(0).getRetainedSizeInBytes();
assertEquals(results.getBufferedBytes(), 0);
Optional<BufferInfo> taskBufferInfo = sqlTaskManager.getTaskBufferInfo(TASK_ID, OUT);
Optional<BufferInfo> taskBufferInfo = sqlTaskManager.getOutputBufferInfo(TASK_ID).getBuffers().stream()
.filter(bufferInfo -> bufferInfo.getBufferId().equals(OUT))
.findFirst();
assertTrue(taskBufferInfo.isPresent());
// Buffer still remains as acknowledgement has not been received
assertEquals(taskBufferInfo.get().getPageBufferInfo().getBufferedBytes(), retainedPageSize);
// Once acknowledged, the retained size of the data page is removed from the buffer
sqlTaskManager.acknowledgeTaskResults(taskId, OUT, results.getNextToken());
taskBufferInfo = sqlTaskManager.getTaskBufferInfo(TASK_ID, OUT);
taskBufferInfo = sqlTaskManager.getOutputBufferInfo(TASK_ID).getBuffers().stream()
.filter(bufferInfo -> bufferInfo.getBufferId().equals(OUT))
.findFirst();
assertTrue(taskBufferInfo.isPresent());
assertEquals(taskBufferInfo.get().getPageBufferInfo().getBufferedBytes(), 0);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
import com.facebook.presto.execution.TaskSource;
import com.facebook.presto.execution.TaskState;
import com.facebook.presto.execution.TaskStatus;
import com.facebook.presto.execution.buffer.BufferInfo;
import com.facebook.presto.execution.buffer.BufferResult;
import com.facebook.presto.execution.buffer.OutputBufferInfo;
import com.facebook.presto.execution.buffer.OutputBuffers;
import com.facebook.presto.execution.buffer.OutputBuffers.OutputBufferId;
import com.facebook.presto.execution.scheduler.TableWriteInfo;
Expand Down Expand Up @@ -218,7 +218,7 @@ public ListenableFuture<BufferResult> getTaskResults(TaskId taskId, OutputBuffer
}

@Override
public Optional<BufferInfo> getTaskBufferInfo(TaskId taskId, OutputBufferId bufferId)
public OutputBufferInfo getOutputBufferInfo(TaskId taskId)
{
throw new UnsupportedOperationException();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
import com.facebook.presto.execution.TaskSource;
import com.facebook.presto.execution.TaskState;
import com.facebook.presto.execution.TaskStatus;
import com.facebook.presto.execution.buffer.BufferInfo;
import com.facebook.presto.execution.buffer.BufferResult;
import com.facebook.presto.execution.buffer.OutputBufferInfo;
import com.facebook.presto.execution.buffer.OutputBuffers;
import com.facebook.presto.execution.buffer.OutputBuffers.OutputBufferId;
import com.facebook.presto.execution.buffer.ThriftBufferResult;
Expand Down Expand Up @@ -247,7 +247,7 @@ public ListenableFuture<BufferResult> getTaskResults(TaskId taskId, OutputBuffer
}

@Override
public Optional<BufferInfo> getTaskBufferInfo(TaskId taskId, OutputBufferId bufferId)
public OutputBufferInfo getOutputBufferInfo(TaskId taskId)
{
throw new UnsupportedOperationException();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import com.facebook.presto.execution.TaskSource;
import com.facebook.presto.execution.TaskState;
import com.facebook.presto.execution.TaskStatus;
import com.facebook.presto.execution.buffer.BufferInfo;
import com.facebook.presto.execution.buffer.BufferResult;
import com.facebook.presto.execution.buffer.OutputBufferInfo;
import com.facebook.presto.execution.buffer.OutputBuffers;
import com.facebook.presto.execution.scheduler.TableWriteInfo;
import com.facebook.presto.memory.MemoryPoolAssignmentsRequest;
Expand Down Expand Up @@ -104,7 +104,7 @@ public ListenableFuture<BufferResult> getTaskResults(TaskId taskId, OutputBuffer
}

@Override
public Optional<BufferInfo> getTaskBufferInfo(TaskId taskId, OutputBuffers.OutputBufferId bufferId)
public OutputBufferInfo getOutputBufferInfo(TaskId taskId)
{
throw new UnsupportedOperationException();
}
Expand Down
Loading