From acc5844006cb1425fca8a743fa519214fb027f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Osipiuk?= Date: Sat, 14 Oct 2023 20:23:45 +0200 Subject: [PATCH] Move FTE scheduler related classes to separate package --- .../io/trino/execution/SqlQueryExecution.java | 10 ++++----- .../ArbitraryDistributionSplitAssigner.java | 2 +- .../BinPackingNodeAllocatorService.java | 9 ++++---- ...ventDrivenFaultTolerantQueryScheduler.java | 22 +++++++++++-------- .../EventDrivenTaskSource.java | 4 ++-- .../EventDrivenTaskSourceFactory.java | 3 ++- ...nentialGrowthPartitionMemoryEstimator.java | 2 +- .../FaultTolerantPartitioningScheme.java | 2 +- ...aultTolerantPartitioningSchemeFactory.java | 2 +- .../HashDistributionSplitAssigner.java | 3 ++- ...NoMemoryAwarePartitionMemoryEstimator.java | 2 +- .../NoMemoryPartitionMemoryEstimator.java | 2 +- .../{ => faulttolerant}/NodeAllocator.java | 2 +- .../NodeAllocatorService.java | 2 +- .../{ => faulttolerant}/NodeRequirements.java | 2 +- .../PartitionMemoryEstimator.java | 2 +- .../PartitionMemoryEstimatorFactory.java | 2 +- .../SingleDistributionSplitAssigner.java | 2 +- .../{ => faulttolerant}/SplitAssigner.java | 2 +- .../{ => faulttolerant}/TaskDescriptor.java | 2 +- .../TaskDescriptorStorage.java | 2 +- .../TaskExecutionClass.java | 2 +- .../io/trino/server/CoordinatorModule.java | 16 +++++++------- .../sql/planner/MergePartitioningHandle.java | 2 +- .../SplitAssignerTester.java | 8 +++---- ...estArbitraryDistributionSplitAssigner.java | 2 +- .../TestBinPackingNodeAllocator.java | 8 +++---- .../TestEventDrivenTaskSource.java | 5 +++-- ...nentialGrowthPartitionMemoryEstimator.java | 4 ++-- .../TestHashDistributionSplitAssigner.java | 7 +++--- ...NoMemoryAwarePartitionMemoryEstimator.java | 2 +- .../TestSingleDistributionSplitAssigner.java | 2 +- .../TestTaskDescriptorStorage.java | 2 +- .../TestingConnectorSplit.java | 2 +- 34 files changed, 76 insertions(+), 67 deletions(-) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/ArbitraryDistributionSplitAssigner.java (99%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/BinPackingNodeAllocatorService.java (98%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/EventDrivenFaultTolerantQueryScheduler.java (99%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/EventDrivenTaskSource.java (99%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/EventDrivenTaskSourceFactory.java (99%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/ExponentialGrowthPartitionMemoryEstimator.java (99%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/FaultTolerantPartitioningScheme.java (98%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/FaultTolerantPartitioningSchemeFactory.java (99%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/HashDistributionSplitAssigner.java (99%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/NoMemoryAwarePartitionMemoryEstimator.java (99%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/NoMemoryPartitionMemoryEstimator.java (96%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/NodeAllocator.java (97%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/NodeAllocatorService.java (92%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/NodeRequirements.java (98%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/PartitionMemoryEstimator.java (97%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/PartitionMemoryEstimatorFactory.java (95%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/SingleDistributionSplitAssigner.java (98%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/SplitAssigner.java (98%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/TaskDescriptor.java (98%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/TaskDescriptorStorage.java (99%) rename core/trino-main/src/main/java/io/trino/execution/scheduler/{ => faulttolerant}/TaskExecutionClass.java (97%) rename core/trino-main/src/test/java/io/trino/execution/scheduler/{ => faulttolerant}/SplitAssignerTester.java (95%) rename core/trino-main/src/test/java/io/trino/execution/scheduler/{ => faulttolerant}/TestArbitraryDistributionSplitAssigner.java (99%) rename core/trino-main/src/test/java/io/trino/execution/scheduler/{ => faulttolerant}/TestBinPackingNodeAllocator.java (99%) rename core/trino-main/src/test/java/io/trino/execution/scheduler/{ => faulttolerant}/TestEventDrivenTaskSource.java (99%) rename core/trino-main/src/test/java/io/trino/execution/scheduler/{ => faulttolerant}/TestExponentialGrowthPartitionMemoryEstimator.java (99%) rename core/trino-main/src/test/java/io/trino/execution/scheduler/{ => faulttolerant}/TestHashDistributionSplitAssigner.java (99%) rename core/trino-main/src/test/java/io/trino/execution/scheduler/{ => faulttolerant}/TestNoMemoryAwarePartitionMemoryEstimator.java (99%) rename core/trino-main/src/test/java/io/trino/execution/scheduler/{ => faulttolerant}/TestSingleDistributionSplitAssigner.java (99%) rename core/trino-main/src/test/java/io/trino/execution/scheduler/{ => faulttolerant}/TestTaskDescriptorStorage.java (99%) rename core/trino-main/src/test/java/io/trino/execution/scheduler/{ => faulttolerant}/TestingConnectorSplit.java (98%) 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 index 3c62be74273c..805322d2a917 100644 --- 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/core/trino-main/src/main/java/io/trino/execution/scheduler/ArbitraryDistributionSplitAssigner.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ArbitraryDistributionSplitAssigner.java similarity index 99% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/ArbitraryDistributionSplitAssigner.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ArbitraryDistributionSplitAssigner.java index b917d2448040..4452ead39c02 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/ArbitraryDistributionSplitAssigner.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/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/core/trino-main/src/main/java/io/trino/execution/scheduler/BinPackingNodeAllocatorService.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/BinPackingNodeAllocatorService.java similarity index 98% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/BinPackingNodeAllocatorService.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/BinPackingNodeAllocatorService.java index 73e951bd5eea..c77fab6592cf 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/BinPackingNodeAllocatorService.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/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/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenFaultTolerantQueryScheduler.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenFaultTolerantQueryScheduler.java similarity index 99% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenFaultTolerantQueryScheduler.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenFaultTolerantQueryScheduler.java index abd1774c5da3..9e612ff8d514 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenFaultTolerantQueryScheduler.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenFaultTolerantQueryScheduler.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/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSource.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSource.java similarity index 99% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSource.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSource.java index a84d13b7861a..d6e6d74582f8 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSource.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/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/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSourceFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSourceFactory.java similarity index 99% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSourceFactory.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSourceFactory.java index 0e8242235eac..9b3867875f62 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/EventDrivenTaskSourceFactory.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/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/core/trino-main/src/main/java/io/trino/execution/scheduler/ExponentialGrowthPartitionMemoryEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ExponentialGrowthPartitionMemoryEstimator.java similarity index 99% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/ExponentialGrowthPartitionMemoryEstimator.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ExponentialGrowthPartitionMemoryEstimator.java index 10b94f61b042..4d92ba20d77f 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/ExponentialGrowthPartitionMemoryEstimator.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/ExponentialGrowthPartitionMemoryEstimator.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/core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningScheme.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningScheme.java similarity index 98% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningScheme.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningScheme.java index 05b01a3305a3..d64cae61d71f 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningScheme.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/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/core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningSchemeFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningSchemeFactory.java similarity index 99% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningSchemeFactory.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningSchemeFactory.java index 3a7221967641..d81a4f3195ed 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/FaultTolerantPartitioningSchemeFactory.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningSchemeFactory.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/core/trino-main/src/main/java/io/trino/execution/scheduler/HashDistributionSplitAssigner.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/HashDistributionSplitAssigner.java similarity index 99% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/HashDistributionSplitAssigner.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/HashDistributionSplitAssigner.java index 3289eb56c403..df7762680fc4 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/HashDistributionSplitAssigner.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/HashDistributionSplitAssigner.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.ArrayListMultimap; @@ -19,6 +19,7 @@ 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/core/trino-main/src/main/java/io/trino/execution/scheduler/NoMemoryAwarePartitionMemoryEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryAwarePartitionMemoryEstimator.java similarity index 99% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/NoMemoryAwarePartitionMemoryEstimator.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryAwarePartitionMemoryEstimator.java index 0f0e328b03d9..bceb6b20159d 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NoMemoryAwarePartitionMemoryEstimator.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryAwarePartitionMemoryEstimator.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/core/trino-main/src/main/java/io/trino/execution/scheduler/NoMemoryPartitionMemoryEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryPartitionMemoryEstimator.java similarity index 96% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/NoMemoryPartitionMemoryEstimator.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NoMemoryPartitionMemoryEstimator.java index 70b34057af4a..9f17ada58eeb 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NoMemoryPartitionMemoryEstimator.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/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/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeAllocator.java similarity index 97% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocator.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeAllocator.java index 027802914b2b..73346eaf3af3 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocator.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/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/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocatorService.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeAllocatorService.java similarity index 92% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocatorService.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeAllocatorService.java index faea8c229f25..068d41e3bb93 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeAllocatorService.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/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/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeRequirements.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeRequirements.java similarity index 98% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/NodeRequirements.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/NodeRequirements.java index adb1a6a5955f..8dbbc262ebea 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/NodeRequirements.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/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/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimator.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/PartitionMemoryEstimator.java similarity index 97% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimator.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/PartitionMemoryEstimator.java index 2cbfaab3f52a..632e0f5e0241 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimator.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/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/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimatorFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/PartitionMemoryEstimatorFactory.java similarity index 95% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimatorFactory.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/PartitionMemoryEstimatorFactory.java index 3f6e0a1c02f5..47beb0bbd03a 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/PartitionMemoryEstimatorFactory.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/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/core/trino-main/src/main/java/io/trino/execution/scheduler/SingleDistributionSplitAssigner.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SingleDistributionSplitAssigner.java similarity index 98% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/SingleDistributionSplitAssigner.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SingleDistributionSplitAssigner.java index a07e5b455db3..5bbf9a1771a3 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/SingleDistributionSplitAssigner.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/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/core/trino-main/src/main/java/io/trino/execution/scheduler/SplitAssigner.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SplitAssigner.java similarity index 98% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/SplitAssigner.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/SplitAssigner.java index 6199b3453553..3801c872f32b 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/SplitAssigner.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/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/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptor.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskDescriptor.java similarity index 98% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptor.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskDescriptor.java index a9f6bfa6b313..6b0710768264 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptor.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/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/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptorStorage.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskDescriptorStorage.java similarity index 99% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptorStorage.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskDescriptorStorage.java index 10a17253030e..676e036352a7 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskDescriptorStorage.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/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/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskExecutionClass.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskExecutionClass.java similarity index 97% rename from core/trino-main/src/main/java/io/trino/execution/scheduler/TaskExecutionClass.java rename to core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/TaskExecutionClass.java index 2f867cca3dc5..949db5a03c9a 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/TaskExecutionClass.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/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 index ad9f98364567..844ac20135f8 100644 --- 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 index ce5b38994e9e..2b9608defade 100644 --- 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/core/trino-main/src/test/java/io/trino/execution/scheduler/SplitAssignerTester.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/SplitAssignerTester.java similarity index 95% rename from core/trino-main/src/test/java/io/trino/execution/scheduler/SplitAssignerTester.java rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/SplitAssignerTester.java index f2a4602e71d2..fe9cd438fda4 100644 --- a/core/trino-main/src/test/java/io/trino/execution/scheduler/SplitAssignerTester.java +++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/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/core/trino-main/src/test/java/io/trino/execution/scheduler/TestArbitraryDistributionSplitAssigner.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestArbitraryDistributionSplitAssigner.java similarity index 99% rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestArbitraryDistributionSplitAssigner.java rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestArbitraryDistributionSplitAssigner.java index 707a51ed957d..eb7864c578b7 100644 --- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestArbitraryDistributionSplitAssigner.java +++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestArbitraryDistributionSplitAssigner.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/core/trino-main/src/test/java/io/trino/execution/scheduler/TestBinPackingNodeAllocator.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestBinPackingNodeAllocator.java similarity index 99% rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestBinPackingNodeAllocator.java rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestBinPackingNodeAllocator.java index cacc6dc0fa67..b14aea5a8026 100644 --- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestBinPackingNodeAllocator.java +++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/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/core/trino-main/src/test/java/io/trino/execution/scheduler/TestEventDrivenTaskSource.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestEventDrivenTaskSource.java similarity index 99% rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestEventDrivenTaskSource.java rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestEventDrivenTaskSource.java index e80684324082..05a70b539e6b 100644 --- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestEventDrivenTaskSource.java +++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/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; diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestExponentialGrowthPartitionMemoryEstimator.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestExponentialGrowthPartitionMemoryEstimator.java similarity index 99% rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestExponentialGrowthPartitionMemoryEstimator.java rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestExponentialGrowthPartitionMemoryEstimator.java index 552bd28bc85a..013961a65d16 100644 --- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestExponentialGrowthPartitionMemoryEstimator.java +++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestExponentialGrowthPartitionMemoryEstimator.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; @@ -19,7 +19,7 @@ import io.trino.Session; import io.trino.client.NodeVersion; import io.trino.cost.StatsAndCosts; -import io.trino.execution.scheduler.PartitionMemoryEstimator.MemoryRequirements; +import io.trino.execution.scheduler.faulttolerant.PartitionMemoryEstimator.MemoryRequirements; import io.trino.memory.MemoryInfo; import io.trino.metadata.InternalNode; import io.trino.spi.StandardErrorCode; diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestHashDistributionSplitAssigner.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestHashDistributionSplitAssigner.java similarity index 99% rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestHashDistributionSplitAssigner.java rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestHashDistributionSplitAssigner.java index 940869ae958f..6538216db1d8 100644 --- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestHashDistributionSplitAssigner.java +++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestHashDistributionSplitAssigner.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; @@ -23,7 +23,8 @@ import com.google.common.collect.SetMultimap; import com.google.common.primitives.ImmutableLongArray; import io.trino.client.NodeVersion; -import io.trino.execution.scheduler.HashDistributionSplitAssigner.TaskPartition; +import io.trino.execution.scheduler.OutputDataSizeEstimate; +import io.trino.execution.scheduler.faulttolerant.HashDistributionSplitAssigner.TaskPartition; import io.trino.metadata.InternalNode; import io.trino.metadata.Split; import io.trino.sql.planner.plan.PlanNodeId; @@ -46,7 +47,7 @@ import static com.google.common.collect.ImmutableMap.toImmutableMap; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.collect.ImmutableSetMultimap.toImmutableSetMultimap; -import static io.trino.execution.scheduler.HashDistributionSplitAssigner.createSourcePartitionToTaskPartition; +import static io.trino.execution.scheduler.faulttolerant.HashDistributionSplitAssigner.createSourcePartitionToTaskPartition; import static io.trino.testing.TestingHandles.TEST_CATALOG_HANDLE; import static java.util.Objects.requireNonNull; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestNoMemoryAwarePartitionMemoryEstimator.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestNoMemoryAwarePartitionMemoryEstimator.java similarity index 99% rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestNoMemoryAwarePartitionMemoryEstimator.java rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestNoMemoryAwarePartitionMemoryEstimator.java index f341bca7e21c..5330327109a0 100644 --- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestNoMemoryAwarePartitionMemoryEstimator.java +++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestNoMemoryAwarePartitionMemoryEstimator.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; diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSingleDistributionSplitAssigner.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestSingleDistributionSplitAssigner.java similarity index 99% rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestSingleDistributionSplitAssigner.java rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestSingleDistributionSplitAssigner.java index 5f96879fa806..c95e3d17479e 100644 --- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestSingleDistributionSplitAssigner.java +++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestSingleDistributionSplitAssigner.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.ImmutableSet; diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTaskDescriptorStorage.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestTaskDescriptorStorage.java similarity index 99% rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestTaskDescriptorStorage.java rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestTaskDescriptorStorage.java index 93658b076537..6a763eaf9a88 100644 --- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestTaskDescriptorStorage.java +++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestTaskDescriptorStorage.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.ImmutableListMultimap; diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestingConnectorSplit.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestingConnectorSplit.java similarity index 98% rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestingConnectorSplit.java rename to core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestingConnectorSplit.java index 92eefa58d7cb..6aba490cc553 100644 --- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestingConnectorSplit.java +++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/faulttolerant/TestingConnectorSplit.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.metadata.Split;