diff --git a/core/trino-main/src/test/java/io/trino/execution/TestMemoryRevokingScheduler.java b/core/trino-main/src/test/java/io/trino/execution/TestMemoryRevokingScheduler.java index 31932e6c88e2..be48ebea2d8b 100644 --- a/core/trino-main/src/test/java/io/trino/execution/TestMemoryRevokingScheduler.java +++ b/core/trino-main/src/test/java/io/trino/execution/TestMemoryRevokingScheduler.java @@ -68,7 +68,7 @@ @Test(singleThreaded = true) public class TestMemoryRevokingScheduler { - private final AtomicInteger idGeneator = new AtomicInteger(); + private final AtomicInteger idGenerator = new AtomicInteger(); private final SpillSpaceTracker spillSpaceTracker = new SpillSpaceTracker(DataSize.of(10, GIGABYTE)); private final Map queryContexts = new HashMap<>(); @@ -219,9 +219,8 @@ private OperatorContext createContexts(SqlTask sqlTask) TaskContext taskContext = getOrCreateTaskContext(sqlTask); PipelineContext pipelineContext = taskContext.addPipelineContext(0, false, false, false); DriverContext driverContext = pipelineContext.addDriverContext(); - OperatorContext operatorContext = driverContext.addOperatorContext(1, new PlanNodeId("na"), "na"); - return operatorContext; + return driverContext.addOperatorContext(1, new PlanNodeId("na"), "na"); } private void requestMemoryRevoking(MemoryRevokingScheduler scheduler) @@ -256,7 +255,7 @@ private SqlTask newSqlTask(QueryId queryId) { QueryContext queryContext = getOrCreateQueryContext(queryId); - TaskId taskId = new TaskId(new StageId(queryId.getId(), 0), idGeneator.incrementAndGet(), 0); + TaskId taskId = new TaskId(new StageId(queryId.getId(), 0), idGenerator.incrementAndGet(), 0); URI location = URI.create("fake://task/" + taskId); return createSqlTask( diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSqlTask.java b/core/trino-main/src/test/java/io/trino/execution/TestSqlTask.java index d300aa7e516a..2398a895f129 100644 --- a/core/trino-main/src/test/java/io/trino/execution/TestSqlTask.java +++ b/core/trino-main/src/test/java/io/trino/execution/TestSqlTask.java @@ -282,7 +282,7 @@ public void testBufferCloseOnCancel() sqlTask.cancel(); assertEquals(sqlTask.getTaskInfo().getTaskStatus().getState(), TaskState.CANCELED); - // buffer future will complete.. the event is async so wait a bit for event to propagate + // buffer future will complete, the event is async so wait a bit for event to propagate bufferResult.get(1, SECONDS); bufferResult = sqlTask.getTaskResults(OUT, 0, DataSize.of(1, MEGABYTE)); @@ -332,7 +332,7 @@ public void testDynamicFilters() ListenableFuture future = sqlTask.getTaskStatus(STARTING_VERSION); assertFalse(future.isDone()); - // make sure future gets unblocked when dynamic filters version is updated + // make sure future gets unblocked when dynamic filters' version is updated taskContext.updateDomains(ImmutableMap.of(new DynamicFilterId("filter"), Domain.none(BIGINT))); assertEquals(sqlTask.getTaskStatus().getVersion(), STARTING_VERSION + 1); assertEquals(sqlTask.getTaskStatus().getDynamicFiltersVersion(), INITIAL_DYNAMIC_FILTERS_VERSION + 1); diff --git a/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskExecution.java b/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskExecution.java index 85011910961a..4f23a4a8a89c 100644 --- a/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskExecution.java +++ b/core/trino-main/src/test/java/io/trino/execution/TestSqlTaskExecution.java @@ -50,7 +50,6 @@ import io.trino.spi.block.TestingBlockEncodingSerde; import io.trino.spi.connector.ConnectorSplit; import io.trino.spi.connector.UpdatablePageSource; -import io.trino.spi.type.Type; import io.trino.spiller.SpillSpaceTracker; import io.trino.sql.planner.LocalExecutionPlanner.LocalExecutionPlan; import io.trino.sql.planner.plan.PlanNodeId; @@ -82,7 +81,6 @@ import static io.trino.execution.buffer.OutputBuffers.createInitialEmptyOutputBuffers; import static io.trino.execution.buffer.PagesSerde.getSerializedPagePositionCount; import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext; -import static io.trino.spi.type.VarcharType.VARCHAR; import static java.util.Objects.requireNonNull; import static java.util.concurrent.Executors.newScheduledThreadPool; import static java.util.concurrent.TimeUnit.HOURS; @@ -122,7 +120,7 @@ public void testSimple() // | // Scan // - TestingScanOperatorFactory testingScanOperatorFactory = new TestingScanOperatorFactory(0, TABLE_SCAN_NODE_ID, ImmutableList.of(VARCHAR)); + TestingScanOperatorFactory testingScanOperatorFactory = new TestingScanOperatorFactory(0, TABLE_SCAN_NODE_ID); TaskOutputOperatorFactory taskOutputOperatorFactory = new TaskOutputOperatorFactory( 1, TABLE_SCAN_NODE_ID, @@ -337,8 +335,7 @@ public static class TestingScanOperatorFactory public TestingScanOperatorFactory( int operatorId, - PlanNodeId sourceId, - List types) + PlanNodeId sourceId) { this.operatorId = operatorId; this.sourceId = requireNonNull(sourceId, "sourceId is null"); diff --git a/core/trino-main/src/test/java/io/trino/execution/executor/TaskExecutorSimulator.java b/core/trino-main/src/test/java/io/trino/execution/executor/TaskExecutorSimulator.java index 23649bc8445b..115fa3588dad 100644 --- a/core/trino-main/src/test/java/io/trino/execution/executor/TaskExecutorSimulator.java +++ b/core/trino-main/src/test/java/io/trino/execution/executor/TaskExecutorSimulator.java @@ -154,7 +154,7 @@ private void runExperimentOverloadedCluster(SimulationController controller) SECONDS.sleep(30); - // this gets the executor into a more realistic point-in-time state, where long running tasks start to make progress + // this gets the executor into a more realistic point-in-time state, where long-running tasks start to make progress for (int i = 0; i < 20; i++) { controller.clearPendingQueue(); MINUTES.sleep(1);