Skip to content

Remove overrides of BaseFailureRecoveryTest#enableDynamicFiltering #12540

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
losipiuk merged 1 commit into from
May 26, 2022
Merged

Remove overrides of BaseFailureRecoveryTest#enableDynamicFiltering #12540

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
10 changes: 0 additions & 10 deletions plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveFailureRecoveryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,4 @@ public void testDeletePartitionWithSubquery()
Optional.of("DROP TABLE <table>"));
}).hasMessageContaining("Deletes must match whole partitions for non-transactional tables");
}

@Override
protected Session enableDynamicFiltering(boolean enabled)
{
Session session = super.enableDynamicFiltering(enabled);
return Session.builder(session)
// Ensure probe side scan wait until DF is collected
.setCatalogSessionProperty(session.getCatalog().orElseThrow(), "dynamic_filtering_wait_timeout", "1h")
.build();
}
}
11 changes: 0 additions & 11 deletions ...n/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergFailureRecoveryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/
package io.trino.plugin.iceberg;

import io.trino.Session;
import io.trino.operator.RetryPolicy;
import io.trino.spi.ErrorType;
import io.trino.testing.BaseFailureRecoveryTest;
Expand Down Expand Up @@ -258,14 +257,4 @@ public void testInsertIntoExistingPartition()
"INSERT INTO <table> SELECT *, 'partition1' p FROM orders",
Optional.of("DROP TABLE <table>"));
}

@Override
protected Session enableDynamicFiltering(boolean enabled)
{
Session session = super.enableDynamicFiltering(enabled);
return Session.builder(session)
// Ensure probe side scan wait until DF is collected
.setCatalogSessionProperty(session.getCatalog().orElseThrow(), "dynamic_filtering_wait_timeout", "1h")
.build();
}
}
4 changes: 3 additions & 1 deletion testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,13 +814,15 @@ private static StageStats getRootStage(MaterializedResult result)
return requireNonNull(statementStats.getRootStage(), "root stage is null");
}

protected Session enableDynamicFiltering(boolean enabled)
private Session enableDynamicFiltering(boolean enabled)
{
Session defaultSession = getQueryRunner().getDefaultSession();
return Session.builder(defaultSession)
.setSystemProperty(ENABLE_DYNAMIC_FILTERING, Boolean.toString(enabled))
.setSystemProperty(JOIN_REORDERING_STRATEGY, NONE.name())
.setSystemProperty(JOIN_DISTRIBUTION_TYPE, PARTITIONED.name())
// Ensure probe side scan wait until DF is collected
.setCatalogSessionProperty(defaultSession.getCatalog().orElseThrow(), "dynamic_filtering_wait_timeout", "1h")
.build();
}
}