From 259c48275d79856492b247358f485291d8c9e132 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 21 Jan 2025 15:07:40 +0100 Subject: [PATCH] Rename session property for consistency --- .../src/main/java/io/trino/SystemSessionProperties.java | 8 ++++---- .../main/java/io/trino/execution/QueryStateMachine.java | 4 ++-- 2 files changed, 6 insertions(+), 6 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 40e7f1b41625..d6cd30d41b3b 100644 --- a/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java +++ b/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java @@ -219,7 +219,7 @@ public final class SystemSessionProperties public static final String IDLE_WRITER_MIN_DATA_SIZE_THRESHOLD = "idle_writer_min_data_size_threshold"; public static final String CLOSE_IDLE_WRITERS_TRIGGER_DURATION = "close_idle_writers_trigger_duration"; public static final String COLUMNAR_FILTER_EVALUATION_ENABLED = "columnar_filter_evaluation_enabled"; - public static final String SPOOLING_PROTOCOL_ENABLED = "spooling_protocol_enabled"; + public static final String SPOOLING_ENABLED = "spooling_enabled"; private final List> sessionProperties; @@ -1131,7 +1131,7 @@ public SystemSessionProperties( optimizerConfig.isUnsafePushdownAllowed(), true), booleanProperty( - SPOOLING_PROTOCOL_ENABLED, + SPOOLING_ENABLED, "Enable client spooling protocol", true, true)); @@ -2024,9 +2024,9 @@ public static boolean isColumnarFilterEvaluationEnabled(Session session) return session.getSystemProperty(COLUMNAR_FILTER_EVALUATION_ENABLED, Boolean.class); } - public static boolean isSpoolingProtocolEnabled(Session session) + public static boolean isSpoolingEnabled(Session session) { - return session.getSystemProperty(SPOOLING_PROTOCOL_ENABLED, Boolean.class); + return session.getSystemProperty(SPOOLING_ENABLED, Boolean.class); } public static boolean isUnsafePushdownAllowed(Session session) diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java b/core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java index 83a754e92193..7e84de77b97d 100644 --- a/core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java +++ b/core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java @@ -88,7 +88,7 @@ import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static io.airlift.units.DataSize.succinctBytes; import static io.trino.SystemSessionProperties.getRetryPolicy; -import static io.trino.SystemSessionProperties.isSpoolingProtocolEnabled; +import static io.trino.SystemSessionProperties.isSpoolingEnabled; import static io.trino.execution.BasicStageStats.EMPTY_STAGE_STATS; import static io.trino.execution.QueryState.DISPATCHING; import static io.trino.execution.QueryState.FAILED; @@ -310,7 +310,7 @@ static QueryStateMachine beginWithTicker( session = session.withExchangeEncryption(serializeAesEncryptionKey(createRandomAesEncryptionKey())); } - if (!queryType.map(SELECT::equals).orElse(false) || !isSpoolingProtocolEnabled(session)) { + if (!queryType.map(SELECT::equals).orElse(false) || !isSpoolingEnabled(session)) { session = session.withoutSpooling(); }