Skip to content

Support STRPOS pushdown to Pinot; Fix missing configuration property pinot.query-options error #18566

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
highker merged 1 commit into from
Oct 31, 2022
Merged

Support STRPOS pushdown to Pinot; Fix missing configuration property pinot.query-options error #18566

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-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,6 @@ public String getControllerUrl()
return controllerUrls.get(ThreadLocalRandom.current().nextInt(controllerUrls.size()));
}

@NotNull
public String getQueryOptions()
{
return queryOptions;
Expand Down
22 changes: 19 additions & 3 deletions ...toolkit/src/main/java/com/facebook/presto/pinot/query/PinotFilterExpressionConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,24 +340,40 @@ private PinotExpression handleFunction(
Function<VariableReferenceExpression, Selection> context)
{
String functionName = function.getDisplayName().toLowerCase(ENGLISH);
List<RowExpression> arguments = function.getArguments();
switch (functionName) {
case "lower":
case "trim":
return derived(String.format(
"%s(%s)",
functionName,
function.getArguments().get(0).accept(this, context).getDefinition()));
arguments.get(0).accept(this, context).getDefinition()));
case "concat":
// Pinot's concat function is a bit different from Presto's, taking only two arguments (and a separator) at a time.
// We nest and repeat concat function calls to handle additional arguments.
int numArguments = function.getArguments().size();
int numArguments = arguments.size();
return derived(String.format(
"%s%s%s",
Strings.repeat(String.format("%s(", functionName), numArguments - 1),
getExpressionOrConstantString(function.getArguments().get(0), context),
function.getArguments().subList(1, numArguments).stream()
arguments.subList(1, numArguments).stream()
.map(argument -> String.format(", %s, '')", getExpressionOrConstantString(argument, context)))
.collect(Collectors.joining(""))));
case "strpos":
// Pinot strings are 0-indexed, while Presto strings are 1-indexed.
if (arguments.size() == 2) {
return derived(String.format(
"%s(%s,%s) + 1",
functionName,
arguments.get(0).accept(this, context).getDefinition(),
arguments.get(1).accept(this, context).getDefinition()));
}
return derived(String.format(
"%s(%s,%s,%s) + 1",
functionName,
arguments.get(0).accept(this, context).getDefinition(),
arguments.get(1).accept(this, context).getDefinition(),
arguments.get(2).accept(this, context).getDefinition()));
default:
throw new PinotException(PINOT_UNSUPPORTED_EXPRESSION, Optional.empty(), format("function %s not supported in filter yet", function.getDisplayName()));
}
Expand Down
3 changes: 3 additions & 0 deletions ...-toolkit/src/test/java/com/facebook/presto/pinot/query/TestPinotExpressionConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ public void testFilterExpressionConverter()
testFilter("CONCAT(city, ', CA', city) IN ('San Jose', 'Campbell')",
"(concat(concat(\"city\", ', CA', ''), \"city\", '') IN ('San Jose', 'Campbell'))", sessionHolder);

// strpos
testFilter("STRPOS(\"city\", 'Seattle') = 1", "(strpos(\"city\",'Seattle') + 1 = 1)", sessionHolder);

// case, coalesce, if
testFilter("CASE WHEN city = 'Campbell' THEN regionid ELSE 0 END",
"CASE true WHEN (\"city\" = 'Campbell') THEN \"regionId\" ELSE 0 END", sessionHolder);
Expand Down