Skip to content

Add OperatorContext to WorkProcessorSourceOperatorFactory.create #17845

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
sopel39 merged 1 commit into from
Jun 12, 2023
Merged

Add OperatorContext to WorkProcessorSourceOperatorFactory.create #17845

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions core/trino-main/src/main/java/io/trino/operator/ScanFilterAndProjectOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,33 +491,33 @@ public SourceOperator createOperator(DriverContext driverContext)

@Override
public WorkProcessorSourceOperator create(
Session session,
OperatorContext operatorContext,
MemoryTrackingContext memoryTrackingContext,
DriverYieldSignal yieldSignal,
WorkProcessor<Split> splits)
{
return create(session, memoryTrackingContext, yieldSignal, splits, true);
return create(operatorContext, memoryTrackingContext, yieldSignal, splits, true);
}

@Override
public WorkProcessorSourceOperator createAdapterOperator(
Session session,
OperatorContext operatorContext,
MemoryTrackingContext memoryTrackingContext,
DriverYieldSignal yieldSignal,
WorkProcessor<Split> splits)
{
return create(session, memoryTrackingContext, yieldSignal, splits, false);
return create(operatorContext, memoryTrackingContext, yieldSignal, splits, false);
}

private ScanFilterAndProjectOperator create(
Session session,
OperatorContext operatorContext,
MemoryTrackingContext memoryTrackingContext,
DriverYieldSignal yieldSignal,
WorkProcessor<Split> splits,
boolean avoidPageMaterialization)
{
return new ScanFilterAndProjectOperator(
session,
operatorContext.getSession(),
memoryTrackingContext,
yieldSignal,
splits,
Expand Down
5 changes: 2 additions & 3 deletions core/trino-main/src/main/java/io/trino/operator/TableScanOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import io.trino.Session;
import io.trino.memory.context.LocalMemoryContext;
import io.trino.memory.context.MemoryTrackingContext;
import io.trino.metadata.Split;
Expand Down Expand Up @@ -114,13 +113,13 @@ public SourceOperator createOperator(DriverContext driverContext)

@Override
public WorkProcessorSourceOperator create(
Session session,
OperatorContext operatorContext,
MemoryTrackingContext memoryTrackingContext,
DriverYieldSignal yieldSignal,
WorkProcessor<Split> splits)
{
return new TableScanWorkProcessorOperator(
session,
operatorContext.getSession(),
memoryTrackingContext,
splits,
pageSourceProvider,
Expand Down
2 changes: 1 addition & 1 deletion core/trino-main/src/main/java/io/trino/operator/WorkProcessorPipelineSourceOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private WorkProcessorPipelineSourceOperator(
WorkProcessor<Split> splits = WorkProcessor.create(new Splits());

sourceOperator = sourceOperatorFactory.create(
operatorContext.getSession(),
operatorContext,
sourceOperatorMemoryTrackingContext,
operatorContext.getDriverContext().getYieldSignal(),
splits);
Expand Down
7 changes: 3 additions & 4 deletions core/trino-main/src/main/java/io/trino/operator/WorkProcessorSourceOperatorAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.google.common.base.Suppliers;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import io.trino.Session;
import io.trino.memory.context.MemoryTrackingContext;
import io.trino.metadata.Split;
import io.trino.spi.Page;
Expand Down Expand Up @@ -56,12 +55,12 @@ public interface AdapterWorkProcessorSourceOperatorFactory
extends WorkProcessorSourceOperatorFactory
{
default WorkProcessorSourceOperator createAdapterOperator(
Session session,
OperatorContext operatorContext,
Copy link
Copy Markdown
Member

@sopel39 sopel39 Jun 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to introduce WorkProcessorOperatorContext

MemoryTrackingContext memoryTrackingContext,
DriverYieldSignal yieldSignal,
WorkProcessor<Split> splits)
{
return create(session, memoryTrackingContext, yieldSignal, splits);
return create(operatorContext, memoryTrackingContext, yieldSignal, splits);
}
}

Expand All @@ -72,7 +71,7 @@ public WorkProcessorSourceOperatorAdapter(OperatorContext operatorContext, Adapt
this.splitBuffer = new SplitBuffer();
this.sourceOperator = sourceOperatorFactory
.createAdapterOperator(
operatorContext.getSession(),
operatorContext,
new MemoryTrackingContext(
operatorContext.aggregateUserMemoryContext(),
operatorContext.aggregateRevocableMemoryContext()),
Expand Down
3 changes: 1 addition & 2 deletions core/trino-main/src/main/java/io/trino/operator/WorkProcessorSourceOperatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/
package io.trino.operator;

import io.trino.Session;
import io.trino.memory.context.MemoryTrackingContext;
import io.trino.metadata.Split;
import io.trino.sql.planner.plan.PlanNodeId;
Expand All @@ -29,7 +28,7 @@ public interface WorkProcessorSourceOperatorFactory
String getOperatorType();

WorkProcessorSourceOperator create(
Session session,
OperatorContext operatorContext,
MemoryTrackingContext memoryTrackingContext,
DriverYieldSignal yieldSignal,
WorkProcessor<Split> splits);
Expand Down
3 changes: 1 addition & 2 deletions core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorPipelineSourceOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.google.common.util.concurrent.SettableFuture;
import io.airlift.units.DataSize;
import io.airlift.units.Duration;
import io.trino.Session;
import io.trino.memory.context.MemoryTrackingContext;
import io.trino.metadata.Split;
import io.trino.operator.WorkProcessor.Transformation;
Expand Down Expand Up @@ -342,7 +341,7 @@ public String getOperatorType()
}

@Override
public WorkProcessorSourceOperator create(Session session, MemoryTrackingContext memoryTrackingContext, DriverYieldSignal yieldSignal, WorkProcessor<Split> splits)
public WorkProcessorSourceOperator create(OperatorContext operatorContext, MemoryTrackingContext memoryTrackingContext, DriverYieldSignal yieldSignal, WorkProcessor<Split> splits)
{
assertNull(sourceOperator, "source operator already created");
sourceOperator = new TestWorkProcessorSourceOperator(
Expand Down
3 changes: 1 addition & 2 deletions core/trino-main/src/test/java/io/trino/operator/TestWorkProcessorSourceOperatorAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.MoreExecutors;
import io.airlift.units.Duration;
import io.trino.Session;
import io.trino.memory.context.MemoryTrackingContext;
import io.trino.metadata.Split;
import io.trino.operator.WorkProcessorSourceOperatorAdapter.AdapterWorkProcessorSourceOperatorFactory;
Expand Down Expand Up @@ -93,7 +92,7 @@ private static class TestWorkProcessorOperatorFactory
{
@Override
public WorkProcessorSourceOperator create(
Session session,
OperatorContext operatorContext,
MemoryTrackingContext memoryTrackingContext,
DriverYieldSignal yieldSignal,
WorkProcessor<Split> splits)
Expand Down