Skip to content

Set experimental.join-spill-enabled to true by default #16560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rschlussel merged 1 commit into from
Aug 4, 2021
Merged

Set experimental.join-spill-enabled to true by default #16560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion presto-hive/src/test/java/com/facebook/presto/hive/HiveQueryRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ public static DistributedQueryRunner createMaterializingAndSpillingQueryRunner(I
.put("colocated-joins-enabled", "true")
.put("grouped-execution-enabled", "true")
.put("experimental.spill-enabled", "true")
.put("experimental.join-spill-enabled", "true")
.put("experimental.spiller-spill-path", Paths.get(System.getProperty("java.io.tmpdir"), "presto", "spills").toString())
.put("experimental.spiller-max-used-space-threshold", "1.0")
.put("experimental.memory-revoking-threshold", "0.0") // revoke always
Expand Down
8 changes: 1 addition & 7 deletions presto-main/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public class FeaturesConfig
private ArrayAggGroupImplementation arrayAggGroupImplementation = ArrayAggGroupImplementation.NEW;
private MultimapAggGroupImplementation multimapAggGroupImplementation = MultimapAggGroupImplementation.NEW;
private boolean spillEnabled;
private boolean joinSpillingEnabled;
private boolean joinSpillingEnabled = true;
private boolean distinctAggregationSpillEnabled = true;
private boolean orderByAggregationSpillEnabled = true;
private DataSize aggregationOperatorUnspillMemoryLimit = new DataSize(4, DataSize.Unit.MEGABYTE);
Expand Down Expand Up @@ -928,12 +928,6 @@ public boolean isOrderByAggregationSpillEnabled()
return orderByAggregationSpillEnabled;
}

@AssertTrue(message = "If " + JOIN_SPILL_ENABLED + " is set to true, spilling must be enabled " + SPILL_ENABLED)
public boolean isSpillEnabledIfJoinSpillingIsEnabled()
{
return !isJoinSpillingEnabled() || isSpillEnabled();
}

public boolean isIterativeOptimizerEnabled()
{
return iterativeOptimizerEnabled;
Expand Down
6 changes: 3 additions & 3 deletions presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestFeaturesConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void testDefaults()
.setRe2JDfaStatesLimit(Integer.MAX_VALUE)
.setRe2JDfaRetries(5)
.setSpillEnabled(false)
.setJoinSpillingEnabled(false)
.setJoinSpillingEnabled(true)
.setDistinctAggregationSpillEnabled(true)
.setOrderByAggregationSpillEnabled(true)
.setAggregationOperatorUnspillMemoryLimit(DataSize.valueOf("4MB"))
Expand Down Expand Up @@ -234,7 +234,7 @@ public void testExplicitPropertyMappings()
.put("re2j.dfa-states-limit", "42")
.put("re2j.dfa-retries", "42")
.put("experimental.spill-enabled", "true")
.put("experimental.join-spill-enabled", "true")
.put("experimental.join-spill-enabled", "false")
.put("experimental.distinct-aggregation-spill-enabled", "false")
.put("experimental.order-by-aggregation-spill-enabled", "false")
.put("experimental.aggregation-operator-unspill-memory-limit", "100MB")
Expand Down Expand Up @@ -352,7 +352,7 @@ public void testExplicitPropertyMappings()
.setRe2JDfaStatesLimit(42)
.setRe2JDfaRetries(42)
.setSpillEnabled(true)
.setJoinSpillingEnabled(true)
.setJoinSpillingEnabled(false)
.setDistinctAggregationSpillEnabled(false)
.setOrderByAggregationSpillEnabled(false)
.setAggregationOperatorUnspillMemoryLimit(DataSize.valueOf("100MB"))
Expand Down
1 change: 0 additions & 1 deletion presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ public static PrestoSparkQueryRunner createSpilledHivePrestoSparkQueryRunner(Ite
{
Map<String, String> properties = new HashMap<>();
properties.put("experimental.spill-enabled", "true");
properties.put("experimental.join-spill-enabled", "true");
properties.put("experimental.temp-storage-buffer-size", "1MB");
properties.put("spark.memory-revoking-threshold", "0.0");
properties.put("experimental.spiller-spill-path", Paths.get(System.getProperty("java.io.tmpdir"), "presto", "spills").toString());
Expand Down
1 change: 0 additions & 1 deletion presto-tests/src/test/java/com/facebook/presto/tests/TestDistributedSpilledQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ public static QueryRunner localCreateQueryRunner()
.setSchema(TINY_SCHEMA_NAME)
.setSystemProperty(SystemSessionProperties.TASK_CONCURRENCY, "2")
.setSystemProperty(SystemSessionProperties.SPILL_ENABLED, "true")
.setSystemProperty(SystemSessionProperties.JOIN_SPILL_ENABLED, "true")
.setSystemProperty(SystemSessionProperties.AGGREGATION_OPERATOR_UNSPILL_MEMORY_LIMIT, "128kB")
.setSystemProperty(SystemSessionProperties.USE_MARK_DISTINCT, "false")
.build();
Expand Down
1 change: 0 additions & 1 deletion ...src/test/java/com/facebook/presto/tests/TestDistributedSpilledQueriesWithTempStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public static DistributedQueryRunner localCreateQueryRunner()
.setSchema(TINY_SCHEMA_NAME)
.setSystemProperty(SystemSessionProperties.TASK_CONCURRENCY, "2")
.setSystemProperty(SystemSessionProperties.SPILL_ENABLED, "true")
.setSystemProperty(SystemSessionProperties.JOIN_SPILL_ENABLED, "true")
.setSystemProperty(SystemSessionProperties.AGGREGATION_OPERATOR_UNSPILL_MEMORY_LIMIT, "128kB")
.setSystemProperty(SystemSessionProperties.USE_MARK_DISTINCT, "false")
.build();
Expand Down