Make configuration and session property names consistent

It makes it easier to reason about which session property maps to which configuration property.
trinodb · Jan 23, 2025 · dce1c7e · dce1c7e
1 parent 6f64088
commit dce1c7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingConfig.java b/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingConfig.java
@@ -16,6 +16,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
+import io.airlift.configuration.DefunctConfig;
 import io.airlift.units.DataSize;
 import io.airlift.units.MaxDataSize;
 import io.airlift.units.MinDataSize;
@@ -33,6 +34,7 @@
 import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static java.util.Base64.getDecoder;
 
+@DefunctConfig({"protocol.spooling.inlining.max-size", "protocol.spooling.inlining.max-rows"})
 public class SpoolingConfig
 {
     private Optional<SecretKey> sharedSecretKey = Optional.empty();
@@ -122,7 +124,7 @@ public long getMaximumInlinedRows()
         return maximumInlinedRows;
     }
 
-    @Config("protocol.spooling.inlining.max-rows")
+    @Config("protocol.spooling.inlining.maximum-rows")
     @ConfigDescription("Maximum number of rows that are allowed to be inlined per worker")
     public SpoolingConfig setMaximumInlinedRows(long maximumInlinedRows)
     {
@@ -137,7 +139,7 @@ public DataSize getMaximumInlinedSize()
         return maximumInlinedSize;
     }
 
-    @Config("protocol.spooling.inlining.max-size")
+    @Config("protocol.spooling.inlining.maximum-size")
     @ConfigDescription("Maximum size of rows that are allowed to be inlined per worker")
     public SpoolingConfig setMaximumInlinedSize(DataSize maximumInlinedSize)
     {

diff --git a/...trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingSessionProperties.java b/...trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingSessionProperties.java
@@ -36,12 +36,12 @@ public class SpoolingSessionProperties
 {
     // Spooled segments
     public static final String INITIAL_SEGMENT_SIZE = "spooling_initial_segment_size";
-    public static final String MAX_SEGMENT_SIZE = "spooling_max_segment_size";
+    public static final String MAX_SEGMENT_SIZE = "spooling_maximum_segment_size";
 
     // Inlined segments
     public static final String ALLOW_INLINING = "spooling_inlining_enabled";
-    public static final String MAX_INLINED_SIZE = "spooling_max_inlined_size";
-    public static final String MAX_INLINED_ROWS = "spooling_max_inlined_rows";
+    public static final String MAX_INLINED_SIZE = "spooling_inlining_maximum_size";
+    public static final String MAX_INLINED_ROWS = "spooling_inlining_maximum_rows";
 
     private final List<PropertyMetadata<?>> sessionProperties;