Move TaskSource to execution package

trinodb · Feb 3, 2019 · 8ca92f2 · 8ca92f2
1 parent 02711a8
commit 8ca92f2
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 20 deletions.
diff --git a/presto-main/src/main/java/io/prestosql/execution/SqlTask.java b/presto-main/src/main/java/io/prestosql/execution/SqlTask.java
@@ -24,7 +24,6 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.prestosql.Session;
-import io.prestosql.TaskSource;
 import io.prestosql.execution.StateMachine.StateChangeListener;
 import io.prestosql.execution.buffer.BufferResult;
 import io.prestosql.execution.buffer.LazyOutputBuffer;

diff --git 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.TaskSource;
 import io.prestosql.event.SplitMonitor;
 import io.prestosql.execution.StateMachine.StateChangeListener;
 import io.prestosql.execution.buffer.BufferState;

diff --git a/presto-main/src/main/java/io/prestosql/execution/SqlTaskExecutionFactory.java b/presto-main/src/main/java/io/prestosql/execution/SqlTaskExecutionFactory.java
@@ -15,7 +15,6 @@
 
 import io.airlift.concurrent.SetThreadName;
 import io.prestosql.Session;
-import io.prestosql.TaskSource;
 import io.prestosql.event.SplitMonitor;
 import io.prestosql.execution.buffer.OutputBuffer;
 import io.prestosql.execution.executor.TaskExecutor;

diff --git a/presto-main/src/main/java/io/prestosql/execution/SqlTaskManager.java b/presto-main/src/main/java/io/prestosql/execution/SqlTaskManager.java
@@ -27,7 +27,6 @@
 import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.prestosql.Session;
-import io.prestosql.TaskSource;
 import io.prestosql.event.SplitMonitor;
 import io.prestosql.execution.StateMachine.StateChangeListener;
 import io.prestosql.execution.buffer.BufferResult;

diff --git a/presto-main/src/main/java/io/prestosql/execution/TaskManager.java b/presto-main/src/main/java/io/prestosql/execution/TaskManager.java
@@ -16,7 +16,6 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.units.DataSize;
 import io.prestosql.Session;
-import io.prestosql.TaskSource;
 import io.prestosql.execution.StateMachine.StateChangeListener;
 import io.prestosql.execution.buffer.BufferResult;
 import io.prestosql.execution.buffer.OutputBuffers;

diff --git a/...rc/main/java/io/prestosql/TaskSource.java → ...va/io/prestosql/execution/TaskSource.java b/...rc/main/java/io/prestosql/TaskSource.java → ...va/io/prestosql/execution/TaskSource.java
@@ -11,13 +11,11 @@
  * 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;
 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/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.TaskSource;
 import io.prestosql.execution.ScheduledSplit;
+import io.prestosql.execution.TaskSource;
 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
@@ -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.TaskSource;
 import io.prestosql.connector.ConnectorId;
 import io.prestosql.execution.ScheduledSplit;
+import io.prestosql.execution.TaskSource;
 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/TaskUpdateRequest.java b/presto-main/src/main/java/io/prestosql/server/TaskUpdateRequest.java
@@ -17,7 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import io.prestosql.SessionRepresentation;
-import io.prestosql.TaskSource;
+import io.prestosql.execution.TaskSource;
 import io.prestosql.execution.buffer.OutputBuffers;
 import io.prestosql.sql.planner.PlanFragment;
 

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
@@ -32,7 +32,6 @@
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.prestosql.Session;
-import io.prestosql.TaskSource;
 import io.prestosql.execution.FutureStateChange;
 import io.prestosql.execution.Lifespan;
 import io.prestosql.execution.NodeTaskMap.PartitionedSplitCountTracker;
@@ -41,6 +40,7 @@
 import io.prestosql.execution.StateMachine.StateChangeListener;
 import io.prestosql.execution.TaskId;
 import io.prestosql.execution.TaskInfo;
+import io.prestosql.execution.TaskSource;
 import io.prestosql.execution.TaskState;
 import io.prestosql.execution.TaskStatus;
 import io.prestosql.execution.buffer.BufferInfo;

diff --git a/presto-main/src/main/java/io/prestosql/testing/LocalQueryRunner.java b/presto-main/src/main/java/io/prestosql/testing/LocalQueryRunner.java
@@ -23,7 +23,6 @@
 import io.prestosql.PagesIndexPageSorter;
 import io.prestosql.Session;
 import io.prestosql.SystemSessionProperties;
-import io.prestosql.TaskSource;
 import io.prestosql.block.BlockEncodingManager;
 import io.prestosql.connector.ConnectorId;
 import io.prestosql.connector.ConnectorManager;
@@ -64,6 +63,7 @@
 import io.prestosql.execution.SetSessionTask;
 import io.prestosql.execution.StartTransactionTask;
 import io.prestosql.execution.TaskManagerConfig;
+import io.prestosql.execution.TaskSource;
 import io.prestosql.execution.resourceGroups.NoOpResourceGroupManager;
 import io.prestosql.execution.scheduler.LegacyNetworkTopology;
 import io.prestosql.execution.scheduler.NodeScheduler;

diff --git 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.TaskSource;
 import io.prestosql.block.BlockEncodingManager;
 import io.prestosql.connector.ConnectorId;
 import io.prestosql.cost.StatsAndCosts;

diff --git a/presto-main/src/test/java/io/prestosql/execution/TestSqlTask.java b/presto-main/src/test/java/io/prestosql/execution/TestSqlTask.java
@@ -21,7 +21,6 @@
 import io.airlift.stats.CounterStat;
 import io.airlift.stats.TestingGcMonitor;
 import io.airlift.units.DataSize;
-import io.prestosql.TaskSource;
 import io.prestosql.execution.buffer.BufferResult;
 import io.prestosql.execution.buffer.BufferState;
 import io.prestosql.execution.buffer.OutputBuffers;

diff --git 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.TaskSource;
 import io.prestosql.block.BlockEncodingManager;
 import io.prestosql.connector.ConnectorId;
 import io.prestosql.execution.buffer.BufferResult;

diff --git 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.TaskSource;
 import io.prestosql.execution.buffer.BufferResult;
 import io.prestosql.execution.buffer.BufferState;
 import io.prestosql.execution.buffer.OutputBuffers;

diff --git 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.TaskSource;
 import io.prestosql.connector.ConnectorId;
 import io.prestosql.execution.ScheduledSplit;
+import io.prestosql.execution.TaskSource;
 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
@@ -20,9 +20,9 @@
 import com.google.common.util.concurrent.Uninterruptibles;
 import io.airlift.units.Duration;
 import io.prestosql.Session;
-import io.prestosql.TaskSource;
 import io.prestosql.connector.ConnectorId;
 import io.prestosql.execution.ScheduledSplit;
+import io.prestosql.execution.TaskSource;
 import io.prestosql.memory.context.LocalMemoryContext;
 import io.prestosql.metadata.Split;
 import io.prestosql.spi.HostAddress;

diff --git a/presto-main/src/test/java/io/prestosql/server/remotetask/TestHttpRemoteTask.java b/presto-main/src/test/java/io/prestosql/server/remotetask/TestHttpRemoteTask.java
@@ -27,7 +27,6 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonModule;
 import io.airlift.units.Duration;
-import io.prestosql.TaskSource;
 import io.prestosql.client.NodeVersion;
 import io.prestosql.connector.ConnectorId;
 import io.prestosql.execution.Lifespan;
@@ -37,6 +36,7 @@
 import io.prestosql.execution.TaskId;
 import io.prestosql.execution.TaskInfo;
 import io.prestosql.execution.TaskManagerConfig;
+import io.prestosql.execution.TaskSource;
 import io.prestosql.execution.TaskState;
 import io.prestosql.execution.TaskStatus;
 import io.prestosql.execution.TaskTestUtils;