Move policies to separate package

trinodb · Jan 3, 2022 · 909f59c · 909f59c
1 parent f01a6fa
commit 909f59c
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 11 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/execution/SqlQueryExecution.java b/core/trino-main/src/main/java/io/trino/execution/SqlQueryExecution.java
@@ -24,10 +24,10 @@
 import io.trino.cost.StatsCalculator;
 import io.trino.execution.QueryPreparer.PreparedQuery;
 import io.trino.execution.StateMachine.StateChangeListener;
-import io.trino.execution.scheduler.ExecutionPolicy;
 import io.trino.execution.scheduler.NodeScheduler;
 import io.trino.execution.scheduler.SplitSchedulerStats;
 import io.trino.execution.scheduler.SqlQueryScheduler;
+import io.trino.execution.scheduler.policy.ExecutionPolicy;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.failuredetector.FailureDetector;
 import io.trino.memory.VersionedMemoryPoolId;

diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/SqlQueryScheduler.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/SqlQueryScheduler.java
@@ -46,6 +46,8 @@
 import io.trino.execution.TaskId;
 import io.trino.execution.TaskManager;
 import io.trino.execution.TaskStatus;
+import io.trino.execution.scheduler.policy.ExecutionPolicy;
+import io.trino.execution.scheduler.policy.ExecutionSchedule;
 import io.trino.failuredetector.FailureDetector;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.Metadata;

diff --git a/...n/scheduler/AllAtOnceExecutionPolicy.java → ...uler/policy/AllAtOnceExecutionPolicy.java b/...n/scheduler/AllAtOnceExecutionPolicy.java → ...uler/policy/AllAtOnceExecutionPolicy.java
@@ -11,7 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
+
+import io.trino.execution.scheduler.PipelinedStageExecution;
 
 import java.util.Collection;
 

diff --git a/...scheduler/AllAtOnceExecutionSchedule.java → ...er/policy/AllAtOnceExecutionSchedule.java b/...scheduler/AllAtOnceExecutionSchedule.java → ...er/policy/AllAtOnceExecutionSchedule.java
@@ -11,12 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
+import io.trino.execution.scheduler.PipelinedStageExecution;
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.ExchangeNode;
 import io.trino.sql.planner.plan.IndexJoinNode;

diff --git a/.../execution/scheduler/ExecutionPolicy.java → ...ion/scheduler/policy/ExecutionPolicy.java b/.../execution/scheduler/ExecutionPolicy.java → ...ion/scheduler/policy/ExecutionPolicy.java
@@ -11,7 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
+
+import io.trino.execution.scheduler.PipelinedStageExecution;
 
 import java.util.Collection;
 

diff --git a/...xecution/scheduler/ExecutionSchedule.java → ...n/scheduler/policy/ExecutionSchedule.java b/...xecution/scheduler/ExecutionSchedule.java → ...n/scheduler/policy/ExecutionSchedule.java
@@ -11,7 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
+
+import io.trino.execution.scheduler.PipelinedStageExecution;
 
 import java.util.Set;
 

diff --git a/...tion/scheduler/PhasedExecutionPolicy.java → ...heduler/policy/PhasedExecutionPolicy.java b/...tion/scheduler/PhasedExecutionPolicy.java → ...heduler/policy/PhasedExecutionPolicy.java
@@ -11,7 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
+
+import io.trino.execution.scheduler.PipelinedStageExecution;
 
 import java.util.Collection;
 

diff --git a/...on/scheduler/PhasedExecutionSchedule.java → ...duler/policy/PhasedExecutionSchedule.java b/...on/scheduler/PhasedExecutionSchedule.java → ...duler/policy/PhasedExecutionSchedule.java
@@ -11,11 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import io.trino.execution.scheduler.PipelinedStageExecution;
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.ExchangeNode;
 import io.trino.sql.planner.plan.IndexJoinNode;

diff --git a/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java b/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java
@@ -60,10 +60,10 @@
 import io.trino.execution.resourcegroups.InternalResourceGroupManager;
 import io.trino.execution.resourcegroups.LegacyResourceGroupConfigurationManager;
 import io.trino.execution.resourcegroups.ResourceGroupManager;
-import io.trino.execution.scheduler.AllAtOnceExecutionPolicy;
-import io.trino.execution.scheduler.ExecutionPolicy;
-import io.trino.execution.scheduler.PhasedExecutionPolicy;
 import io.trino.execution.scheduler.SplitSchedulerStats;
+import io.trino.execution.scheduler.policy.AllAtOnceExecutionPolicy;
+import io.trino.execution.scheduler.policy.ExecutionPolicy;
+import io.trino.execution.scheduler.policy.PhasedExecutionPolicy;
 import io.trino.failuredetector.FailureDetectorModule;
 import io.trino.memory.ClusterMemoryManager;
 import io.trino.memory.ForMemoryManager;

diff --git a/...cheduler/TestPhasedExecutionSchedule.java → ...r/policy/TestPhasedExecutionSchedule.java b/...cheduler/TestPhasedExecutionSchedule.java → ...r/policy/TestPhasedExecutionSchedule.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;