From f15c978b8797abc55bcc38e05be04110f78b4773 Mon Sep 17 00:00:00 2001 From: Karol Sobczak Date: Mon, 3 Jan 2022 22:53:41 +0100 Subject: [PATCH] Enable phased execution policy by default --- .../src/test/java/io/trino/jdbc/TestJdbcConnection.java | 2 +- .../src/main/java/io/trino/execution/QueryManagerConfig.java | 2 +- .../test/java/io/trino/execution/TestQueryManagerConfig.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java index 7a9363b619dad..e342be2a0e9bd 100644 --- a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java +++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java @@ -425,7 +425,7 @@ public void testSessionProperties() .extractingByKeys("hive.temporary_staging_directory_path", "execution_policy") .containsExactly("/tmp", "legacy-phased"); assertThat(listSession(connection)).containsAll(ImmutableSet.of( - "execution_policy|legacy-phased|all-at-once", + "execution_policy|legacy-phased|phased", "hive.temporary_staging_directory_path|/tmp|/tmp/presto-${USER}")); } } 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 346f6353c030f..f462dcc6a0e67 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 @@ -62,7 +62,7 @@ public class QueryManagerConfig private Duration remoteTaskMaxErrorDuration = new Duration(5, TimeUnit.MINUTES); private int remoteTaskMaxCallbackThreads = 1000; - private String queryExecutionPolicy = "all-at-once"; + private String queryExecutionPolicy = "phased"; private Duration queryMaxRunTime = new Duration(100, TimeUnit.DAYS); private Duration queryMaxExecutionTime = new Duration(100, TimeUnit.DAYS); private Duration queryMaxPlanningTime = new Duration(10, TimeUnit.MINUTES); 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 890137187a8cb..6749cc7efe8ec 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 @@ -51,7 +51,7 @@ public void testDefaults() .setRemoteTaskMinErrorDuration(new Duration(5, MINUTES)) .setRemoteTaskMaxErrorDuration(new Duration(5, MINUTES)) .setRemoteTaskMaxCallbackThreads(1000) - .setQueryExecutionPolicy("all-at-once") + .setQueryExecutionPolicy("phased") .setQueryMaxRunTime(new Duration(100, DAYS)) .setQueryMaxExecutionTime(new Duration(100, DAYS)) .setQueryMaxPlanningTime(new Duration(10, MINUTES))