From 02711a863a08607303077e2f55fb7af7c1ac8baf Mon Sep 17 00:00:00 2001 From: David Phillips Date: Tue, 22 Jan 2019 22:46:19 -0800 Subject: [PATCH] Move ScheduledSplit to execution package --- presto-main/src/main/java/io/prestosql/TaskSource.java | 1 + .../main/java/io/prestosql/{ => execution}/ScheduledSplit.java | 2 +- .../src/main/java/io/prestosql/execution/SqlTaskExecution.java | 1 - presto-main/src/main/java/io/prestosql/operator/Driver.java | 2 +- .../src/main/java/io/prestosql/operator/index/IndexLoader.java | 2 +- .../java/io/prestosql/server/remotetask/HttpRemoteTask.java | 2 +- .../src/main/java/io/prestosql/testing/LocalQueryRunner.java | 2 +- .../src/test/java/io/prestosql/execution/TaskTestUtils.java | 1 - .../test/java/io/prestosql/execution/TestSqlTaskExecution.java | 1 - .../test/java/io/prestosql/execution/TestSqlTaskManager.java | 1 - .../test/java/io/prestosql/memory/TestSystemMemoryBlocking.java | 2 +- presto-main/src/test/java/io/prestosql/operator/TestDriver.java | 2 +- 12 files changed, 8 insertions(+), 11 deletions(-) rename presto-main/src/main/java/io/prestosql/{ => execution}/ScheduledSplit.java (98%) diff --git a/presto-main/src/main/java/io/prestosql/TaskSource.java b/presto-main/src/main/java/io/prestosql/TaskSource.java index 651672fc7405..7004e4f50a9b 100644 --- a/presto-main/src/main/java/io/prestosql/TaskSource.java +++ b/presto-main/src/main/java/io/prestosql/TaskSource.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; import io.prestosql.execution.Lifespan; +import io.prestosql.execution.ScheduledSplit; import io.prestosql.sql.planner.plan.PlanNodeId; import java.util.Set; diff --git a/presto-main/src/main/java/io/prestosql/ScheduledSplit.java b/presto-main/src/main/java/io/prestosql/execution/ScheduledSplit.java similarity index 98% rename from presto-main/src/main/java/io/prestosql/ScheduledSplit.java rename to presto-main/src/main/java/io/prestosql/execution/ScheduledSplit.java index 0a311fb4ce53..3427796d70b4 100644 --- a/presto-main/src/main/java/io/prestosql/ScheduledSplit.java +++ b/presto-main/src/main/java/io/prestosql/execution/ScheduledSplit.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.prestosql; +package io.prestosql.execution; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/presto-main/src/main/java/io/prestosql/execution/SqlTaskExecution.java b/presto-main/src/main/java/io/prestosql/execution/SqlTaskExecution.java index 175472bd15f7..6bbbb9898ffe 100644 --- a/presto-main/src/main/java/io/prestosql/execution/SqlTaskExecution.java +++ b/presto-main/src/main/java/io/prestosql/execution/SqlTaskExecution.java @@ -23,7 +23,6 @@ import com.google.common.util.concurrent.ListenableFuture; import io.airlift.concurrent.SetThreadName; import io.airlift.units.Duration; -import io.prestosql.ScheduledSplit; import io.prestosql.TaskSource; import io.prestosql.event.SplitMonitor; import io.prestosql.execution.StateMachine.StateChangeListener; diff --git a/presto-main/src/main/java/io/prestosql/operator/Driver.java b/presto-main/src/main/java/io/prestosql/operator/Driver.java index 20fb5527f994..daa93dd939af 100644 --- a/presto-main/src/main/java/io/prestosql/operator/Driver.java +++ b/presto-main/src/main/java/io/prestosql/operator/Driver.java @@ -22,8 +22,8 @@ import com.google.common.util.concurrent.SettableFuture; import io.airlift.log.Logger; import io.airlift.units.Duration; -import io.prestosql.ScheduledSplit; import io.prestosql.TaskSource; +import io.prestosql.execution.ScheduledSplit; import io.prestosql.metadata.Split; import io.prestosql.spi.Page; import io.prestosql.spi.PrestoException; diff --git a/presto-main/src/main/java/io/prestosql/operator/index/IndexLoader.java b/presto-main/src/main/java/io/prestosql/operator/index/IndexLoader.java index 7bb3c08698d7..270027c80f02 100644 --- a/presto-main/src/main/java/io/prestosql/operator/index/IndexLoader.java +++ b/presto-main/src/main/java/io/prestosql/operator/index/IndexLoader.java @@ -18,9 +18,9 @@ import com.google.common.collect.Iterables; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.DataSize; -import io.prestosql.ScheduledSplit; import io.prestosql.TaskSource; import io.prestosql.connector.ConnectorId; +import io.prestosql.execution.ScheduledSplit; import io.prestosql.metadata.Split; import io.prestosql.operator.Driver; import io.prestosql.operator.DriverFactory; diff --git a/presto-main/src/main/java/io/prestosql/server/remotetask/HttpRemoteTask.java b/presto-main/src/main/java/io/prestosql/server/remotetask/HttpRemoteTask.java index c65b56cf927a..efee3c505388 100644 --- a/presto-main/src/main/java/io/prestosql/server/remotetask/HttpRemoteTask.java +++ b/presto-main/src/main/java/io/prestosql/server/remotetask/HttpRemoteTask.java @@ -31,13 +31,13 @@ import io.airlift.json.JsonCodec; import io.airlift.log.Logger; import io.airlift.units.Duration; -import io.prestosql.ScheduledSplit; import io.prestosql.Session; import io.prestosql.TaskSource; import io.prestosql.execution.FutureStateChange; import io.prestosql.execution.Lifespan; import io.prestosql.execution.NodeTaskMap.PartitionedSplitCountTracker; import io.prestosql.execution.RemoteTask; +import io.prestosql.execution.ScheduledSplit; import io.prestosql.execution.StateMachine.StateChangeListener; import io.prestosql.execution.TaskId; import io.prestosql.execution.TaskInfo; diff --git a/presto-main/src/main/java/io/prestosql/testing/LocalQueryRunner.java b/presto-main/src/main/java/io/prestosql/testing/LocalQueryRunner.java index ee0c680dd18f..4e62aa816dd5 100644 --- a/presto-main/src/main/java/io/prestosql/testing/LocalQueryRunner.java +++ b/presto-main/src/main/java/io/prestosql/testing/LocalQueryRunner.java @@ -21,7 +21,6 @@ import io.airlift.units.Duration; import io.prestosql.GroupByHashPageIndexerFactory; import io.prestosql.PagesIndexPageSorter; -import io.prestosql.ScheduledSplit; import io.prestosql.Session; import io.prestosql.SystemSessionProperties; import io.prestosql.TaskSource; @@ -60,6 +59,7 @@ import io.prestosql.execution.RenameTableTask; import io.prestosql.execution.ResetSessionTask; import io.prestosql.execution.RollbackTask; +import io.prestosql.execution.ScheduledSplit; import io.prestosql.execution.SetPathTask; import io.prestosql.execution.SetSessionTask; import io.prestosql.execution.StartTransactionTask; diff --git a/presto-main/src/test/java/io/prestosql/execution/TaskTestUtils.java b/presto-main/src/test/java/io/prestosql/execution/TaskTestUtils.java index 3c3d99fd7ace..df09d2ab933a 100644 --- a/presto-main/src/test/java/io/prestosql/execution/TaskTestUtils.java +++ b/presto-main/src/test/java/io/prestosql/execution/TaskTestUtils.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.json.ObjectMapperProvider; -import io.prestosql.ScheduledSplit; import io.prestosql.TaskSource; import io.prestosql.block.BlockEncodingManager; import io.prestosql.connector.ConnectorId; diff --git a/presto-main/src/test/java/io/prestosql/execution/TestSqlTaskExecution.java b/presto-main/src/test/java/io/prestosql/execution/TestSqlTaskExecution.java index c41ff16b1539..260cddfd18c0 100644 --- a/presto-main/src/test/java/io/prestosql/execution/TestSqlTaskExecution.java +++ b/presto-main/src/test/java/io/prestosql/execution/TestSqlTaskExecution.java @@ -24,7 +24,6 @@ import io.airlift.stats.TestingGcMonitor; import io.airlift.units.DataSize; import io.airlift.units.Duration; -import io.prestosql.ScheduledSplit; import io.prestosql.TaskSource; import io.prestosql.block.BlockEncodingManager; import io.prestosql.connector.ConnectorId; diff --git a/presto-main/src/test/java/io/prestosql/execution/TestSqlTaskManager.java b/presto-main/src/test/java/io/prestosql/execution/TestSqlTaskManager.java index 1c504631b11b..566419f9d352 100644 --- a/presto-main/src/test/java/io/prestosql/execution/TestSqlTaskManager.java +++ b/presto-main/src/test/java/io/prestosql/execution/TestSqlTaskManager.java @@ -21,7 +21,6 @@ import io.airlift.units.DataSize; import io.airlift.units.DataSize.Unit; import io.airlift.units.Duration; -import io.prestosql.ScheduledSplit; import io.prestosql.TaskSource; import io.prestosql.execution.buffer.BufferResult; import io.prestosql.execution.buffer.BufferState; diff --git a/presto-main/src/test/java/io/prestosql/memory/TestSystemMemoryBlocking.java b/presto-main/src/test/java/io/prestosql/memory/TestSystemMemoryBlocking.java index e1489e13c179..23643b400f3c 100644 --- a/presto-main/src/test/java/io/prestosql/memory/TestSystemMemoryBlocking.java +++ b/presto-main/src/test/java/io/prestosql/memory/TestSystemMemoryBlocking.java @@ -18,9 +18,9 @@ import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.DataSize; import io.airlift.units.Duration; -import io.prestosql.ScheduledSplit; import io.prestosql.TaskSource; import io.prestosql.connector.ConnectorId; +import io.prestosql.execution.ScheduledSplit; import io.prestosql.metadata.Split; import io.prestosql.operator.Driver; import io.prestosql.operator.DriverContext; diff --git a/presto-main/src/test/java/io/prestosql/operator/TestDriver.java b/presto-main/src/test/java/io/prestosql/operator/TestDriver.java index f3c59d761635..2732c3363934 100644 --- a/presto-main/src/test/java/io/prestosql/operator/TestDriver.java +++ b/presto-main/src/test/java/io/prestosql/operator/TestDriver.java @@ -19,10 +19,10 @@ import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.Uninterruptibles; import io.airlift.units.Duration; -import io.prestosql.ScheduledSplit; import io.prestosql.Session; import io.prestosql.TaskSource; import io.prestosql.connector.ConnectorId; +import io.prestosql.execution.ScheduledSplit; import io.prestosql.memory.context.LocalMemoryContext; import io.prestosql.metadata.Split; import io.prestosql.spi.HostAddress;