Move FTE scheduler related classes to separate package

trinodb · Oct 16, 2023 · 4237217 · 4237217
1 parent ae88f44
commit 4237217
Show file tree

Hide file tree

Showing 34 changed files with 76 additions and 67 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
@@ -30,16 +30,16 @@
 import io.trino.execution.QueryPreparer.PreparedQuery;
 import io.trino.execution.StateMachine.StateChangeListener;
 import io.trino.execution.querystats.PlanOptimizersStatsCollector;
-import io.trino.execution.scheduler.EventDrivenFaultTolerantQueryScheduler;
-import io.trino.execution.scheduler.EventDrivenTaskSourceFactory;
-import io.trino.execution.scheduler.NodeAllocatorService;
 import io.trino.execution.scheduler.NodeScheduler;
-import io.trino.execution.scheduler.PartitionMemoryEstimatorFactory;
 import io.trino.execution.scheduler.PipelinedQueryScheduler;
 import io.trino.execution.scheduler.QueryScheduler;
 import io.trino.execution.scheduler.SplitSchedulerStats;
-import io.trino.execution.scheduler.TaskDescriptorStorage;
 import io.trino.execution.scheduler.TaskExecutionStats;
+import io.trino.execution.scheduler.faulttolerant.EventDrivenFaultTolerantQueryScheduler;
+import io.trino.execution.scheduler.faulttolerant.EventDrivenTaskSourceFactory;
+import io.trino.execution.scheduler.faulttolerant.NodeAllocatorService;
+import io.trino.execution.scheduler.faulttolerant.PartitionMemoryEstimatorFactory;
+import io.trino.execution.scheduler.faulttolerant.TaskDescriptorStorage;
 import io.trino.execution.scheduler.policy.ExecutionPolicy;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.failuredetector.FailureDetector;

diff --git a/...r/ArbitraryDistributionSplitAssigner.java → ...t/ArbitraryDistributionSplitAssigner.java b/...r/ArbitraryDistributionSplitAssigner.java → ...t/ArbitraryDistributionSplitAssigner.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.faulttolerant;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;

diff --git a/...duler/BinPackingNodeAllocatorService.java → ...erant/BinPackingNodeAllocatorService.java b/...duler/BinPackingNodeAllocatorService.java → ...erant/BinPackingNodeAllocatorService.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.faulttolerant;
 
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Ticker;
@@ -27,6 +27,7 @@
 import io.airlift.units.DataSize;
 import io.trino.Session;
 import io.trino.execution.TaskId;
+import io.trino.execution.scheduler.NodeSchedulerConfig;
 import io.trino.memory.ClusterMemoryManager;
 import io.trino.memory.MemoryInfo;
 import io.trino.memory.MemoryManagerConfig;
@@ -63,9 +64,9 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Sets.newConcurrentHashSet;
 import static io.airlift.concurrent.Threads.daemonThreadsNamed;
-import static io.trino.execution.scheduler.TaskExecutionClass.EAGER_SPECULATIVE;
-import static io.trino.execution.scheduler.TaskExecutionClass.SPECULATIVE;
-import static io.trino.execution.scheduler.TaskExecutionClass.STANDARD;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.EAGER_SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.STANDARD;
 import static io.trino.spi.StandardErrorCode.NO_NODES_AVAILABLE;
 import static java.lang.Math.max;
 import static java.lang.Thread.currentThread;

diff --git a/...entDrivenFaultTolerantQueryScheduler.java → ...entDrivenFaultTolerantQueryScheduler.java b/...entDrivenFaultTolerantQueryScheduler.java → ...entDrivenFaultTolerantQueryScheduler.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.faulttolerant;
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ArrayListMultimap;
@@ -58,11 +58,15 @@
 import io.trino.execution.buffer.SpoolingOutputBuffers;
 import io.trino.execution.buffer.SpoolingOutputStats;
 import io.trino.execution.resourcegroups.IndexedPriorityQueue;
-import io.trino.execution.scheduler.NodeAllocator.NodeLease;
-import io.trino.execution.scheduler.PartitionMemoryEstimator.MemoryRequirements;
-import io.trino.execution.scheduler.SplitAssigner.AssignmentResult;
-import io.trino.execution.scheduler.SplitAssigner.Partition;
-import io.trino.execution.scheduler.SplitAssigner.PartitionUpdate;
+import io.trino.execution.scheduler.OutputDataSizeEstimate;
+import io.trino.execution.scheduler.QueryScheduler;
+import io.trino.execution.scheduler.SplitSchedulerStats;
+import io.trino.execution.scheduler.TaskExecutionStats;
+import io.trino.execution.scheduler.faulttolerant.NodeAllocator.NodeLease;
+import io.trino.execution.scheduler.faulttolerant.PartitionMemoryEstimator.MemoryRequirements;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.AssignmentResult;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.Partition;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.PartitionUpdate;
 import io.trino.failuredetector.FailureDetector;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.Metadata;
@@ -154,9 +158,9 @@
 import static io.trino.execution.scheduler.ErrorCodes.isOutOfMemoryError;
 import static io.trino.execution.scheduler.Exchanges.getAllSourceHandles;
 import static io.trino.execution.scheduler.SchedulingUtils.canStream;
-import static io.trino.execution.scheduler.TaskExecutionClass.EAGER_SPECULATIVE;
-import static io.trino.execution.scheduler.TaskExecutionClass.SPECULATIVE;
-import static io.trino.execution.scheduler.TaskExecutionClass.STANDARD;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.EAGER_SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.STANDARD;
 import static io.trino.failuredetector.FailureDetector.State.GONE;
 import static io.trino.operator.ExchangeOperator.REMOTE_CATALOG_HANDLE;
 import static io.trino.operator.RetryPolicy.TASK;

diff --git a/...tion/scheduler/EventDrivenTaskSource.java → .../faulttolerant/EventDrivenTaskSource.java b/...tion/scheduler/EventDrivenTaskSource.java → .../faulttolerant/EventDrivenTaskSource.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.faulttolerant;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -29,7 +29,7 @@
 import io.trino.exchange.SpoolingExchangeInput;
 import io.trino.execution.TableExecuteContext;
 import io.trino.execution.TableExecuteContextManager;
-import io.trino.execution.scheduler.SplitAssigner.AssignmentResult;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.AssignmentResult;
 import io.trino.metadata.Split;
 import io.trino.spi.QueryId;
 import io.trino.spi.connector.CatalogHandle;

diff --git a/...heduler/EventDrivenTaskSourceFactory.java → ...olerant/EventDrivenTaskSourceFactory.java b/...heduler/EventDrivenTaskSourceFactory.java → ...olerant/EventDrivenTaskSourceFactory.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.faulttolerant;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
@@ -21,6 +21,7 @@
 import io.trino.execution.ForQueryExecution;
 import io.trino.execution.QueryManagerConfig;
 import io.trino.execution.TableExecuteContextManager;
+import io.trino.execution.scheduler.OutputDataSizeEstimate;
 import io.trino.metadata.InternalNodeManager;
 import io.trino.spi.HostAddress;
 import io.trino.spi.Node;

diff --git a/...entialGrowthPartitionMemoryEstimator.java → ...entialGrowthPartitionMemoryEstimator.java b/...entialGrowthPartitionMemoryEstimator.java → ...entialGrowthPartitionMemoryEstimator.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.faulttolerant;
 
 import com.google.common.collect.Ordering;
 import com.google.inject.Inject;

diff --git a/...uler/FaultTolerantPartitioningScheme.java → ...rant/FaultTolerantPartitioningScheme.java b/...uler/FaultTolerantPartitioningScheme.java → ...rant/FaultTolerantPartitioningScheme.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.faulttolerant;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;

diff --git a/...ultTolerantPartitioningSchemeFactory.java → ...ultTolerantPartitioningSchemeFactory.java b/...ultTolerantPartitioningSchemeFactory.java → ...ultTolerantPartitioningSchemeFactory.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.faulttolerant;
 
 import com.google.common.collect.ImmutableList;
 import io.trino.Session;

diff --git a/...eduler/HashDistributionSplitAssigner.java → ...lerant/HashDistributionSplitAssigner.java b/...eduler/HashDistributionSplitAssigner.java → ...lerant/HashDistributionSplitAssigner.java
@@ -11,14 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.faulttolerant;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ListMultimap;
+import io.trino.execution.scheduler.OutputDataSizeEstimate;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.Split;
 import io.trino.spi.HostAddress;

diff --git a/...oMemoryAwarePartitionMemoryEstimator.java → ...oMemoryAwarePartitionMemoryEstimator.java b/...oMemoryAwarePartitionMemoryEstimator.java → ...oMemoryAwarePartitionMemoryEstimator.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.faulttolerant;
 
 import com.google.inject.BindingAnnotation;
 import com.google.inject.Inject;

diff --git a/...ler/NoMemoryPartitionMemoryEstimator.java → ...ant/NoMemoryPartitionMemoryEstimator.java b/...ler/NoMemoryPartitionMemoryEstimator.java → ...ant/NoMemoryPartitionMemoryEstimator.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.faulttolerant;
 
 import io.airlift.units.DataSize;
 import io.trino.spi.ErrorCode;

diff --git a/...no/execution/scheduler/NodeAllocator.java → ...cheduler/faulttolerant/NodeAllocator.java b/...no/execution/scheduler/NodeAllocator.java → ...cheduler/faulttolerant/NodeAllocator.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.faulttolerant;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import io.airlift.units.DataSize;

diff --git a/...ution/scheduler/NodeAllocatorService.java → ...r/faulttolerant/NodeAllocatorService.java b/...ution/scheduler/NodeAllocatorService.java → ...r/faulttolerant/NodeAllocatorService.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.faulttolerant;
 
 import io.trino.Session;
 

diff --git a/...execution/scheduler/NodeRequirements.java → ...duler/faulttolerant/NodeRequirements.java b/...execution/scheduler/NodeRequirements.java → ...duler/faulttolerant/NodeRequirements.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.faulttolerant;
 
 import com.google.common.collect.ImmutableSet;
 import io.trino.spi.HostAddress;

diff --git a/...n/scheduler/PartitionMemoryEstimator.java → ...ulttolerant/PartitionMemoryEstimator.java b/...n/scheduler/PartitionMemoryEstimator.java → ...ulttolerant/PartitionMemoryEstimator.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.faulttolerant;
 
 import io.airlift.units.DataSize;
 import io.trino.spi.ErrorCode;

diff --git a/...uler/PartitionMemoryEstimatorFactory.java → ...rant/PartitionMemoryEstimatorFactory.java b/...uler/PartitionMemoryEstimatorFactory.java → ...rant/PartitionMemoryEstimatorFactory.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.faulttolerant;
 
 import io.trino.Session;
 import io.trino.sql.planner.PlanFragment;

diff --git a/...uler/SingleDistributionSplitAssigner.java → ...rant/SingleDistributionSplitAssigner.java b/...uler/SingleDistributionSplitAssigner.java → ...rant/SingleDistributionSplitAssigner.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.faulttolerant;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;

diff --git a/...no/execution/scheduler/SplitAssigner.java → ...cheduler/faulttolerant/SplitAssigner.java b/...no/execution/scheduler/SplitAssigner.java → ...cheduler/faulttolerant/SplitAssigner.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.faulttolerant;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ListMultimap;

diff --git a/...o/execution/scheduler/TaskDescriptor.java → ...heduler/faulttolerant/TaskDescriptor.java b/...o/execution/scheduler/TaskDescriptor.java → ...heduler/faulttolerant/TaskDescriptor.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.faulttolerant;
 
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ListMultimap;

diff --git a/...tion/scheduler/TaskDescriptorStorage.java → .../faulttolerant/TaskDescriptorStorage.java b/...tion/scheduler/TaskDescriptorStorage.java → .../faulttolerant/TaskDescriptorStorage.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.faulttolerant;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Suppliers;

diff --git a/...ecution/scheduler/TaskExecutionClass.java → ...ler/faulttolerant/TaskExecutionClass.java b/...ecution/scheduler/TaskExecutionClass.java → ...ler/faulttolerant/TaskExecutionClass.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.faulttolerant;
 
 public enum TaskExecutionClass
 {

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
@@ -63,16 +63,16 @@
 import io.trino.execution.resourcegroups.InternalResourceGroupManager;
 import io.trino.execution.resourcegroups.LegacyResourceGroupConfigurationManager;
 import io.trino.execution.resourcegroups.ResourceGroupManager;
-import io.trino.execution.scheduler.BinPackingNodeAllocatorService;
-import io.trino.execution.scheduler.EventDrivenTaskSourceFactory;
-import io.trino.execution.scheduler.ExponentialGrowthPartitionMemoryEstimator;
-import io.trino.execution.scheduler.NoMemoryAwarePartitionMemoryEstimator;
-import io.trino.execution.scheduler.NoMemoryAwarePartitionMemoryEstimator.ForNoMemoryAwarePartitionMemoryEstimator;
-import io.trino.execution.scheduler.NodeAllocatorService;
-import io.trino.execution.scheduler.PartitionMemoryEstimatorFactory;
 import io.trino.execution.scheduler.SplitSchedulerStats;
-import io.trino.execution.scheduler.TaskDescriptorStorage;
 import io.trino.execution.scheduler.TaskExecutionStats;
+import io.trino.execution.scheduler.faulttolerant.BinPackingNodeAllocatorService;
+import io.trino.execution.scheduler.faulttolerant.EventDrivenTaskSourceFactory;
+import io.trino.execution.scheduler.faulttolerant.ExponentialGrowthPartitionMemoryEstimator;
+import io.trino.execution.scheduler.faulttolerant.NoMemoryAwarePartitionMemoryEstimator;
+import io.trino.execution.scheduler.faulttolerant.NoMemoryAwarePartitionMemoryEstimator.ForNoMemoryAwarePartitionMemoryEstimator;
+import io.trino.execution.scheduler.faulttolerant.NodeAllocatorService;
+import io.trino.execution.scheduler.faulttolerant.PartitionMemoryEstimatorFactory;
+import io.trino.execution.scheduler.faulttolerant.TaskDescriptorStorage;
 import io.trino.execution.scheduler.policy.AllAtOnceExecutionPolicy;
 import io.trino.execution.scheduler.policy.ExecutionPolicy;
 import io.trino.execution.scheduler.policy.PhasedExecutionPolicy;

diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/MergePartitioningHandle.java b/core/trino-main/src/main/java/io/trino/sql/planner/MergePartitioningHandle.java
@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.google.common.base.VerifyException;
-import io.trino.execution.scheduler.FaultTolerantPartitioningScheme;
+import io.trino.execution.scheduler.faulttolerant.FaultTolerantPartitioningScheme;
 import io.trino.operator.BucketPartitionFunction;
 import io.trino.operator.PartitionFunction;
 import io.trino.spi.Page;

diff --git a/...cution/scheduler/SplitAssignerTester.java → ...er/faulttolerant/SplitAssignerTester.java b/...cution/scheduler/SplitAssignerTester.java → ...er/faulttolerant/SplitAssignerTester.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.faulttolerant;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultimap;
@@ -20,9 +20,9 @@
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.SetMultimap;
 import com.google.common.collect.Sets;
-import io.trino.execution.scheduler.SplitAssigner.AssignmentResult;
-import io.trino.execution.scheduler.SplitAssigner.Partition;
-import io.trino.execution.scheduler.SplitAssigner.PartitionUpdate;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.AssignmentResult;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.Partition;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.PartitionUpdate;
 import io.trino.metadata.Split;
 import io.trino.sql.planner.plan.PlanNodeId;
 

diff --git a/...stArbitraryDistributionSplitAssigner.java → ...stArbitraryDistributionSplitAssigner.java b/...stArbitraryDistributionSplitAssigner.java → ...stArbitraryDistributionSplitAssigner.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.faulttolerant;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;

diff --git a/...cheduler/TestBinPackingNodeAllocator.java → ...tolerant/TestBinPackingNodeAllocator.java b/...cheduler/TestBinPackingNodeAllocator.java → ...tolerant/TestBinPackingNodeAllocator.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.faulttolerant;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.Futures;
@@ -45,9 +45,9 @@
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static io.airlift.concurrent.MoreFutures.getFutureValue;
 import static io.airlift.units.DataSize.Unit.GIGABYTE;
-import static io.trino.execution.scheduler.TaskExecutionClass.EAGER_SPECULATIVE;
-import static io.trino.execution.scheduler.TaskExecutionClass.SPECULATIVE;
-import static io.trino.execution.scheduler.TaskExecutionClass.STANDARD;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.EAGER_SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.SPECULATIVE;
+import static io.trino.execution.scheduler.faulttolerant.TaskExecutionClass.STANDARD;
 import static io.trino.testing.TestingHandles.createTestCatalogHandle;
 import static io.trino.testing.TestingSession.testSessionBuilder;
 import static java.time.temporal.ChronoUnit.MINUTES;

diff --git a/.../scheduler/TestEventDrivenTaskSource.java → ...lttolerant/TestEventDrivenTaskSource.java b/.../scheduler/TestEventDrivenTaskSource.java → ...lttolerant/TestEventDrivenTaskSource.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.faulttolerant;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultimap;
@@ -28,7 +28,8 @@
 import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.trino.exchange.SpoolingExchangeInput;
 import io.trino.execution.TableExecuteContextManager;
-import io.trino.execution.scheduler.SplitAssigner.AssignmentResult;
+import io.trino.execution.scheduler.TestingExchangeSourceHandle;
+import io.trino.execution.scheduler.faulttolerant.SplitAssigner.AssignmentResult;
 import io.trino.metadata.Split;
 import io.trino.spi.QueryId;
 import io.trino.spi.connector.CatalogHandle;