From 52599a2515e6371f1ad67cff300cac7ee6e7c614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Osipiuk?= Date: Mon, 28 Aug 2023 10:11:48 +0200 Subject: [PATCH] Remove obsolete config/session property Remove obsolete fault_tolerant_execution_force_preferred_write_partitioning_enabled session property and experimental.fault-tolerant-execution-force-preferred-write-partitioning-enabled config property --- .../main/java/io/trino/SystemSessionProperties.java | 11 ----------- .../java/io/trino/execution/QueryManagerConfig.java | 13 +------------ .../io/trino/execution/TestQueryManagerConfig.java | 3 --- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java b/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java index dd67fecfcf8d..21285e7cad74 100644 --- a/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java +++ b/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java @@ -207,7 +207,6 @@ public final class SystemSessionProperties public static final String USE_EXACT_PARTITIONING = "use_exact_partitioning"; public static final String USE_COST_BASED_PARTITIONING = "use_cost_based_partitioning"; public static final String FORCE_SPILLING_JOIN = "force_spilling_join"; - public static final String FAULT_TOLERANT_EXECUTION_FORCE_PREFERRED_WRITE_PARTITIONING_ENABLED = "fault_tolerant_execution_force_preferred_write_partitioning_enabled"; public static final String PAGE_PARTITIONING_BUFFER_POOL_SIZE = "page_partitioning_buffer_pool_size"; public static final String FLAT_GROUP_BY_HASH = "flat_group_by_hash"; @@ -1063,11 +1062,6 @@ public SystemSessionProperties( "Force the usage of spliing join operator in favor of the non-spilling one, even if spill is not enabled", featuresConfig.isForceSpillingJoin(), false), - booleanProperty( - FAULT_TOLERANT_EXECUTION_FORCE_PREFERRED_WRITE_PARTITIONING_ENABLED, - "Force preferred write partitioning for fault tolerant execution", - queryManagerConfig.isFaultTolerantExecutionForcePreferredWritePartitioningEnabled(), - true), integerProperty(PAGE_PARTITIONING_BUFFER_POOL_SIZE, "Maximum number of free buffers in the per task partitioned page buffer pool. Setting this to zero effectively disables the pool", taskManagerConfig.getPagePartitioningBufferPoolSize(), @@ -1915,11 +1909,6 @@ public static boolean isForceSpillingOperator(Session session) return session.getSystemProperty(FORCE_SPILLING_JOIN, Boolean.class); } - public static boolean isFaultTolerantExecutionForcePreferredWritePartitioningEnabled(Session session) - { - return session.getSystemProperty(FAULT_TOLERANT_EXECUTION_FORCE_PREFERRED_WRITE_PARTITIONING_ENABLED, Boolean.class); - } - public static int getPagePartitioningBufferPoolSize(Session session) { return session.getSystemProperty(PAGE_PARTITIONING_BUFFER_POOL_SIZE, Integer.class); diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java b/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java index f9092c221638..c3cfe8a16c82 100644 --- a/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java +++ b/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java @@ -40,6 +40,7 @@ "query.max-pending-splits-per-node", "query.queue-config-file", "experimental.big-query-initial-hash-partitions", + "experimental.fault-tolerant-execution-force-preferred-write-partitioning-enabled", "experimental.max-concurrent-big-queries", "experimental.max-queued-big-queries", "query-manager.initialization-required-workers", @@ -1010,18 +1011,6 @@ public QueryManagerConfig setFaultTolerantExecutionRuntimeAdaptivePartitioningMa return this; } - public boolean isFaultTolerantExecutionForcePreferredWritePartitioningEnabled() - { - return faultTolerantExecutionForcePreferredWritePartitioningEnabled; - } - - @Config("experimental.fault-tolerant-execution-force-preferred-write-partitioning-enabled") - public QueryManagerConfig setFaultTolerantExecutionForcePreferredWritePartitioningEnabled(boolean faultTolerantExecutionForcePreferredWritePartitioningEnabled) - { - this.faultTolerantExecutionForcePreferredWritePartitioningEnabled = faultTolerantExecutionForcePreferredWritePartitioningEnabled; - return this; - } - public double getFaultTolerantExecutionMinSourceStageProgress() { return faultTolerantExecutionMinSourceStageProgress; diff --git a/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java b/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java index 34dbcd3615dc..8b4a1a1dc206 100644 --- a/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java +++ b/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java @@ -102,7 +102,6 @@ public void testDefaults() .setFaultTolerantExecutionRuntimeAdaptivePartitioningEnabled(false) .setFaultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize(DataSize.of(12, GIGABYTE)) .setFaultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount(FAULT_TOLERANT_EXECUTION_MAX_PARTITION_COUNT_LIMIT) - .setFaultTolerantExecutionForcePreferredWritePartitioningEnabled(true) .setFaultTolerantExecutionMinSourceStageProgress(0.2) .setFaultTolerantExecutionSmallStageEstimationEnabled(true) .setFaultTolerantExecutionSmallStageEstimationThreshold(DataSize.of(20, GIGABYTE)) @@ -177,7 +176,6 @@ public void testExplicitPropertyMappings() .put("fault-tolerant-execution-runtime-adaptive-partitioning-enabled", "true") .put("fault-tolerant-execution-runtime-adaptive-partitioning-partition-count", "888") .put("fault-tolerant-execution-runtime-adaptive-partitioning-max-task-size", "18GB") - .put("experimental.fault-tolerant-execution-force-preferred-write-partitioning-enabled", "false") .put("fault-tolerant-execution-min-source-stage-progress", "0.3") .put("query.max-writer-task-count", "101") .put("fault-tolerant-execution-small-stage-estimation-enabled", "false") @@ -249,7 +247,6 @@ public void testExplicitPropertyMappings() .setFaultTolerantExecutionRuntimeAdaptivePartitioningEnabled(true) .setFaultTolerantExecutionRuntimeAdaptivePartitioningPartitionCount(888) .setFaultTolerantExecutionRuntimeAdaptivePartitioningMaxTaskSize(DataSize.of(18, GIGABYTE)) - .setFaultTolerantExecutionForcePreferredWritePartitioningEnabled(false) .setFaultTolerantExecutionMinSourceStageProgress(0.3) .setFaultTolerantExecutionSmallStageEstimationEnabled(false) .setFaultTolerantExecutionSmallStageEstimationThreshold(DataSize.of(6, GIGABYTE))