Skip to content

Support JOIN pushdown for relational operators on varchar in PostgreSQL connector #10435

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

Closed
takezoe wants to merge 1 commit into from
Closed

Support JOIN pushdown for relational operators on varchar in PostgreSQL connector #10435

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
11 changes: 9 additions & 2 deletions plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import io.trino.spi.connector.ConnectorSplitSource;
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.spi.connector.FixedSplitSource;
import io.trino.spi.connector.JoinCondition;
import io.trino.spi.connector.JoinStatistics;
import io.trino.spi.connector.JoinType;
import io.trino.spi.connector.SchemaTableName;
Expand Down Expand Up @@ -412,7 +413,7 @@ public Optional<PreparedQuery> implementJoin(
JoinStatistics statistics)
{
for (JdbcJoinCondition joinCondition : joinConditions) {
if (!isSupportedJoinCondition(joinCondition)) {
if (!isSupportedJoinCondition(session, joinCondition)) {
return Optional.empty();
}
}
Expand All @@ -428,7 +429,13 @@ public Optional<PreparedQuery> implementJoin(
rightAssignments));
}

protected boolean isSupportedJoinCondition(JdbcJoinCondition joinCondition)
@Override
public String buildJoinColumn(JdbcJoinCondition joinCondition, JdbcColumnHandle column)
{
return quoted(column.getColumnName());
}

protected boolean isSupportedJoinCondition(ConnectorSession session, JdbcJoinCondition joinCondition)
{
return false;
}
Expand Down
2 changes: 2 additions & 0 deletions plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ default Optional<SystemTable> getSystemTable(ConnectorSession session, SchemaTab
return Optional.empty();
}

String buildJoinColumn(JdbcJoinCondition joinCondition, JdbcColumnHandle column);

String quoted(String name);

String quoted(RemoteTableName remoteTableName);
Expand Down
4 changes: 2 additions & 2 deletions plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/QueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ public PreparedQuery prepareJoinQuery(
joinConditions.stream()
.map(condition -> format(
"l.%s %s r.%s",
client.quoted(condition.getLeftColumn().getColumnName()),
client.buildJoinColumn(condition, condition.getLeftColumn()),
condition.getOperator().getValue(),
client.quoted(condition.getRightColumn().getColumnName())))
client.buildJoinColumn(condition, condition.getRightColumn())))
.collect(joining(" AND ")));
List<QueryParameter> parameters = ImmutableList.<QueryParameter>builder()
.addAll(leftSource.getParameters())
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-memsql/src/main/java/io/trino/plugin/memsql/MemSqlClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ public Optional<PreparedQuery> implementJoin(
}

@Override
protected boolean isSupportedJoinCondition(JdbcJoinCondition joinCondition)
protected boolean isSupportedJoinCondition(ConnectorSession session, JdbcJoinCondition joinCondition)
{
if (joinCondition.getOperator() == JoinCondition.Operator.IS_DISTINCT_FROM) {
// Not supported in MemSQL
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ public Optional<PreparedQuery> implementJoin(
}

@Override
protected boolean isSupportedJoinCondition(JdbcJoinCondition joinCondition)
protected boolean isSupportedJoinCondition(ConnectorSession session, JdbcJoinCondition joinCondition)
{
if (joinCondition.getOperator() == JoinCondition.Operator.IS_DISTINCT_FROM) {
// Not supported in MySQL
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ else if (precision > Decimals.MAX_PRECISION || actualPrecision <= 0) {
}

@Override
protected boolean isSupportedJoinCondition(JdbcJoinCondition joinCondition)
protected boolean isSupportedJoinCondition(ConnectorSession session, JdbcJoinCondition joinCondition)
{
return joinCondition.getOperator() != JoinCondition.Operator.IS_DISTINCT_FROM;
}
Expand Down
25 changes: 23 additions & 2 deletions plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ public OptionalLong delete(ConnectorSession session, JdbcTableHandle handle)
}

@Override
protected boolean isSupportedJoinCondition(JdbcJoinCondition joinCondition)
protected boolean isSupportedJoinCondition(ConnectorSession session, JdbcJoinCondition joinCondition)
{
boolean isVarchar = Stream.of(joinCondition.getLeftColumn(), joinCondition.getRightColumn())
.map(JdbcColumnHandle::getColumnType)
Expand All @@ -830,7 +830,7 @@ protected boolean isSupportedJoinCondition(JdbcJoinCondition joinCondition)
case LESS_THAN_OR_EQUAL:
case GREATER_THAN:
case GREATER_THAN_OR_EQUAL:
break;
return isEnableStringPushdownWithCollate(session);
case EQUAL:
case NOT_EQUAL:
case IS_DISTINCT_FROM:
Expand All @@ -842,6 +842,27 @@ protected boolean isSupportedJoinCondition(JdbcJoinCondition joinCondition)
return true;
}

@Override
public String buildJoinColumn(JdbcJoinCondition joinCondition, JdbcColumnHandle column)
{
boolean isVarchar = Stream.of(joinCondition.getLeftColumn(), joinCondition.getRightColumn())
.map(JdbcColumnHandle::getColumnType)
.anyMatch(type -> type instanceof CharType || type instanceof VarcharType);
String collation = "";
if (isVarchar) {
JoinCondition.Operator operator = joinCondition.getOperator();
switch (operator) {
case LESS_THAN:
case LESS_THAN_OR_EQUAL:
case GREATER_THAN:
case GREATER_THAN_OR_EQUAL:
collation = "COLLATE \"C\"";
}
}

return String.format("%s %s", quoted(column.getColumnName()), collation);
}

private static ColumnMapping charColumnMapping(int charLength)
{
if (charLength > CharType.MAX_LENGTH) {
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ public boolean isTopNGuaranteed(ConnectorSession session)
}

@Override
protected boolean isSupportedJoinCondition(JdbcJoinCondition joinCondition)
protected boolean isSupportedJoinCondition(ConnectorSession session, JdbcJoinCondition joinCondition)
{
if (joinCondition.getOperator() == JoinCondition.Operator.IS_DISTINCT_FROM) {
// Not supported in SQL Server
Expand Down