Skip to content

Commit 701c4e0

Browse files
committed
Deprecate join-pushdown.with-expressions config property
Deprecate `join-pushdown.with-expressions` config property and associated `complex_join_pushdown_enabled` session property. It was added for transition period when join pushdown behavior was being build out. Removing it will allow simplifying code.
1 parent f94b311 commit 701c4e0

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,14 @@ public JdbcMetadataConfig setJoinPushdownEnabled(boolean joinPushdownEnabled)
7171
return this;
7272
}
7373

74+
@Deprecated
7475
public boolean isComplexJoinPushdownEnabled()
7576
{
7677
return complexJoinPushdownEnabled;
7778
}
7879

79-
@Config("join-pushdown.with-expressions")
80+
@Deprecated
81+
@Config("deprecated.join-pushdown.with-expressions")
8082
@ConfigDescription("Enable join pushdown with complex expressions")
8183
public JdbcMetadataConfig setComplexJoinPushdownEnabled(boolean complexJoinPushdownEnabled)
8284
{

plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataSessionProperties.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public class JdbcMetadataSessionProperties
3333
{
3434
public static final String COMPLEX_EXPRESSION_PUSHDOWN = "complex_expression_pushdown";
3535
public static final String JOIN_PUSHDOWN_ENABLED = "join_pushdown_enabled";
36+
@Deprecated
3637
public static final String COMPLEX_JOIN_PUSHDOWN_ENABLED = "complex_join_pushdown_enabled";
3738
public static final String AGGREGATION_PUSHDOWN_ENABLED = "aggregation_pushdown_enabled";
3839
public static final String TOPN_PUSHDOWN_ENABLED = "topn_pushdown_enabled";
@@ -102,6 +103,7 @@ public static boolean isJoinPushdownEnabled(ConnectorSession session)
102103
return session.getProperty(JOIN_PUSHDOWN_ENABLED, Boolean.class);
103104
}
104105

106+
@Deprecated
105107
public static boolean isComplexJoinPushdownEnabled(ConnectorSession session)
106108
{
107109
return session.getProperty(COMPLEX_JOIN_PUSHDOWN_ENABLED, Boolean.class);

plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcMetadataConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void testExplicitPropertyMappings()
4343
Map<String, String> properties = ImmutableMap.<String, String>builder()
4444
.put("complex-expression-pushdown.enabled", "false")
4545
.put("join-pushdown.enabled", "true")
46-
.put("join-pushdown.with-expressions", "false")
46+
.put("deprecated.join-pushdown.with-expressions", "false")
4747
.put("aggregation-pushdown.enabled", "false")
4848
.put("jdbc.bulk-list-columns.enabled", "true")
4949
.put("domain-compaction-threshold", "42")

0 commit comments

Comments
 (0)