Skip to content

Fix in clause handling of varchars in filter pushdown #9181

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
hashhar merged 1 commit into from
Sep 9, 2021
+39 −7
Merged

Fix in clause handling of varchars in filter pushdown #9181

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
18 changes: 11 additions & 7 deletions plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/query/PinotQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import io.trino.spi.predicate.TupleDomain;
import io.trino.spi.type.RealType;
import io.trino.spi.type.Type;
import io.trino.spi.type.VarcharType;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -136,13 +137,13 @@ private static String toPredicate(String columnName, Domain domain)
checkState(!rangeConjuncts.isEmpty());
disjuncts.add("(" + Joiner.on(" AND ").join(rangeConjuncts) + ")");
}
// Add back all of the possible single values either as an equality or an IN predicate
if (singleValues.size() == 1) {
disjuncts.add(toConjunct(columnName, "=", getOnlyElement(singleValues)));
}
else if (singleValues.size() > 1) {
disjuncts.add(inClauseValues(columnName, singleValues));
}
}
// Add back all of the possible single values either as an equality or an IN predicate
if (singleValues.size() == 1) {
disjuncts.add(toConjunct(columnName, "=", getOnlyElement(singleValues)));
}
else if (singleValues.size() > 1) {
disjuncts.add(inClauseValues(columnName, singleValues));
}
return "(" + Joiner.on(" OR ").join(disjuncts) + ")";
}
Expand All @@ -152,6 +153,9 @@ private static Object convertValue(Type type, Object value)
if (type instanceof RealType) {
return intBitsToFloat(toIntExact((Long) value));
}
else if (type instanceof VarcharType) {
return ((Slice) value).toStringUtf8();
}
return value;
Copy link
Copy Markdown
Member

@hashhar hashhar Sep 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In future we should handle all types explicitly here to avoid surprises.

Copy link
Copy Markdown
Member Author

@elonazoulay elonazoulay Sep 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds good, will do!

}

Expand Down
28 changes: 28 additions & 0 deletions plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestPinotIntegrationSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,4 +1203,32 @@ public void testAggregationPushdown()
.withRootCauseInstanceOf(RuntimeException.class)
.withMessage("Operation not supported for DISTINCT aggregation function");
}

@Test
public void testInClause()
{
assertThat(query("SELECT string_col, sum(long_col)" +
" FROM " + ALL_TYPES_TABLE +
" WHERE string_col IN ('string_1200','string_2400','string_3600')" +
" GROUP BY string_col"))
.isFullyPushedDown();

assertThat(query("SELECT string_col, sum(long_col)" +
" FROM " + ALL_TYPES_TABLE +
" WHERE string_col NOT IN ('string_1200','string_2400','string_3600')" +
" GROUP BY string_col"))
.isFullyPushedDown();

assertThat(query("SELECT int_col, sum(long_col)" +
" FROM " + ALL_TYPES_TABLE +
" WHERE int_col IN (54, 56)" +
" GROUP BY int_col"))
.isFullyPushedDown();

assertThat(query("SELECT int_col, sum(long_col)" +
" FROM " + ALL_TYPES_TABLE +
" WHERE int_col NOT IN (54, 56)" +
" GROUP BY int_col"))
.isFullyPushedDown();
}
}