Remove long deprecated configs

Remove configs deprecated in 2022 or earlier.
trinodb · Apr 8, 2024 · 1164e9e · 1164e9e
1 parent 2bbc41d
commit 1164e9e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/FeaturesConfig.java b/core/trino-main/src/main/java/io/trino/FeaturesConfig.java
@@ -55,10 +55,19 @@
         "deprecated.legacy-unnest-array-rows",
         "deprecated.legacy-update-delete-implementation",
         "experimental-syntax-enabled",
+        "experimental.aggregation-operator-unspill-memory-limit",
+        "experimental.filter-and-project-min-output-page-row-count",
+        "experimental.filter-and-project-min-output-page-size",
         "experimental.late-materialization.enabled",
+        "experimental.memory-revoking-target",
+        "experimental.memory-revoking-threshold",
         "experimental.resource-groups-enabled",
+        "experimental.spill-enabled",
         "experimental.spill-order-by",
         "experimental.spill-window-operator",
+        "experimental.spiller-max-used-space-threshold",
+        "experimental.spiller-spill-path",
+        "experimental.spiller-threads",
         "fast-inequality-joins",
         "histogram.implementation",
         "legacy.allow-set-view-authorization",
@@ -241,7 +250,6 @@ public boolean isSpillEnabled()
     }
 
     @Config("spill-enabled")
-    @LegacyConfig("experimental.spill-enabled")
     public FeaturesConfig setSpillEnabled(boolean spillEnabled)
     {
         this.spillEnabled = spillEnabled;
@@ -254,7 +262,6 @@ public DataSize getAggregationOperatorUnspillMemoryLimit()
     }
 
     @Config("aggregation-operator-unspill-memory-limit")
-    @LegacyConfig("experimental.aggregation-operator-unspill-memory-limit")
     public FeaturesConfig setAggregationOperatorUnspillMemoryLimit(DataSize aggregationOperatorUnspillMemoryLimit)
     {
         this.aggregationOperatorUnspillMemoryLimit = aggregationOperatorUnspillMemoryLimit;
@@ -267,7 +274,6 @@ public List<Path> getSpillerSpillPaths()
     }
 
     @Config("spiller-spill-path")
-    @LegacyConfig("experimental.spiller-spill-path")
     public FeaturesConfig setSpillerSpillPaths(String spillPaths)
     {
         List<String> spillPathsSplit = ImmutableList.copyOf(Splitter.on(",").trimResults().omitEmptyStrings().split(spillPaths));
@@ -282,7 +288,6 @@ public int getSpillerThreads()
     }
 
     @Config("spiller-threads")
-    @LegacyConfig("experimental.spiller-threads")
     public FeaturesConfig setSpillerThreads(int spillerThreads)
     {
         this.spillerThreads = spillerThreads;
@@ -297,7 +302,6 @@ public double getMemoryRevokingThreshold()
     }
 
     @Config("memory-revoking-threshold")
-    @LegacyConfig("experimental.memory-revoking-threshold")
     @ConfigDescription("Revoke memory when memory pool is filled over threshold")
     public FeaturesConfig setMemoryRevokingThreshold(double memoryRevokingThreshold)
     {
@@ -313,7 +317,6 @@ public double getMemoryRevokingTarget()
     }
 
     @Config("memory-revoking-target")
-    @LegacyConfig("experimental.memory-revoking-target")
     @ConfigDescription("When revoking memory, try to revoke so much that pool is filled below target at the end")
     public FeaturesConfig setMemoryRevokingTarget(double memoryRevokingTarget)
     {
@@ -327,7 +330,6 @@ public double getSpillMaxUsedSpaceThreshold()
     }
 
     @Config("spiller-max-used-space-threshold")
-    @LegacyConfig("experimental.spiller-max-used-space-threshold")
     public FeaturesConfig setSpillMaxUsedSpaceThreshold(double spillMaxUsedSpaceThreshold)
     {
         this.spillMaxUsedSpaceThreshold = spillMaxUsedSpaceThreshold;
@@ -386,7 +388,6 @@ public DataSize getFilterAndProjectMinOutputPageSize()
     }
 
     @Config("filter-and-project-min-output-page-size")
-    @LegacyConfig("experimental.filter-and-project-min-output-page-size")
     public FeaturesConfig setFilterAndProjectMinOutputPageSize(DataSize filterAndProjectMinOutputPageSize)
     {
         this.filterAndProjectMinOutputPageSize = filterAndProjectMinOutputPageSize;
@@ -400,7 +401,6 @@ public int getFilterAndProjectMinOutputPageRowCount()
     }
 
     @Config("filter-and-project-min-output-page-row-count")
-    @LegacyConfig("experimental.filter-and-project-min-output-page-row-count")
     public FeaturesConfig setFilterAndProjectMinOutputPageRowCount(int filterAndProjectMinOutputPageRowCount)
     {
         this.filterAndProjectMinOutputPageRowCount = filterAndProjectMinOutputPageRowCount;

diff --git a/core/trino-main/src/main/java/io/trino/execution/DynamicFilterConfig.java b/core/trino-main/src/main/java/io/trino/execution/DynamicFilterConfig.java
@@ -33,6 +33,7 @@
         "experimental.dynamic-filtering-max-per-driver-row-count",
         "experimental.dynamic-filtering-max-per-driver-size",
         "experimental.dynamic-filtering-refresh-interval",
+        "experimental.enable-dynamic-filtering",
 })
 public class DynamicFilterConfig
 {
@@ -78,7 +79,6 @@ public boolean isEnableDynamicFiltering()
     }
 
     @Config("enable-dynamic-filtering")
-    @LegacyConfig("experimental.enable-dynamic-filtering")
     public DynamicFilterConfig setEnableDynamicFiltering(boolean enableDynamicFiltering)
     {
         this.enableDynamicFiltering = enableDynamicFiltering;

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
@@ -45,10 +45,13 @@
         "fault-tolerant-execution-target-task-split-count",
         "query-manager.initialization-required-workers",
         "query-manager.initialization-timeout",
+        "query.initial-hash-partitions",
+        "query.max-age",
         "query.max-pending-splits-per-node",
         "query.queue-config-file",
         "query.remote-task.max-consecutive-error-count",
         "query.remote-task.min-error-duration",
+        "retry-attempts",
 })
 public class QueryManagerConfig
 {
@@ -223,7 +226,7 @@ public int getMaxHashPartitionCount()
     }
 
     @Config("query.max-hash-partition-count")
-    @LegacyConfig({"query.initial-hash-partitions", "query.hash-partition-count"})
+    @LegacyConfig("query.hash-partition-count")
     @ConfigDescription("Maximum number of partitions for distributed joins and aggregations")
     public QueryManagerConfig setMaxHashPartitionCount(int maxHashPartitionCount)
     {
@@ -279,7 +282,6 @@ public Duration getMinQueryExpireAge()
         return minQueryExpireAge;
     }
 
-    @LegacyConfig("query.max-age")
     @Config("query.min-expire-age")
     public QueryManagerConfig setMinQueryExpireAge(Duration minQueryExpireAge)
     {
@@ -576,7 +578,6 @@ public int getQueryRetryAttempts()
     }
 
     @Config("query-retry-attempts")
-    @LegacyConfig("retry-attempts")
     public QueryManagerConfig setQueryRetryAttempts(int queryRetryAttempts)
     {
         this.queryRetryAttempts = queryRetryAttempts;

diff --git a/core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java b/core/trino-main/src/main/java/io/trino/execution/TaskManagerConfig.java
@@ -43,6 +43,8 @@
         "task.level-absolute-priority",
         "task.max-memory",
         "task.operator-pre-allocated-memory",
+        "task.shard.max-threads",
+        "task.verbose-stats",
 })
 public class TaskManagerConfig
 {
@@ -168,7 +170,6 @@ public boolean isPerOperatorCpuTimerEnabled()
         return perOperatorCpuTimerEnabled;
     }
 
-    @LegacyConfig("task.verbose-stats")
     @Config("task.per-operator-cpu-timer-enabled")
     public TaskManagerConfig setPerOperatorCpuTimerEnabled(boolean perOperatorCpuTimerEnabled)
     {
@@ -284,7 +285,6 @@ public int getMaxWorkerThreads()
         return maxWorkerThreads;
     }
 
-    @LegacyConfig("task.shard.max-threads")
     @Config("task.max-worker-threads")
     public TaskManagerConfig setMaxWorkerThreads(String maxWorkerThreads)
     {