Skip to content

Allow non literal rhs in MV_FILTER_ONLY and MV_FILTER_NONE #16113

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
kfaraz merged 4 commits into from
Mar 26, 2024
Merged

Allow non literal rhs in MV_FILTER_ONLY and MV_FILTER_NONE #16113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0de4b9
mv_filter_only to allow non literal expr
sreemanamala Mar 13, 2024
59ced97
update existing filter function to return null
sreemanamala Mar 14, 2024
47ae2e5
Trigger Build
sreemanamala Mar 20, 2024
e113f5d
coverage
sreemanamala Mar 20, 2024
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
6 changes: 5 additions & 1 deletion processing/src/main/java/org/apache/druid/math/expr/ApplyFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,11 +442,15 @@ public ExprEval apply(LambdaExpr lambdaExpr, List<Expr> argsExpr, Expr.ObjectBin

Object[] array = arrayEval.asArray();
if (array == null) {
return ExprEval.of(null);
return ExprEval.ofArray(arrayEval.asArrayType(), null);
}

SettableLambdaBinding lambdaBinding = new SettableLambdaBinding(arrayEval.elementType(), lambdaExpr, bindings);
Object[] filtered = filter(arrayEval.asArray(), lambdaExpr, lambdaBinding).toArray();
// return null array expr if nothing is left in filtered
if (filtered.length == 0) {
return ExprEval.ofArray(arrayEval.asArrayType(), null);
}
return ExprEval.ofArray(arrayEval.asArrayType(), filtered);
}

Expand Down
4 changes: 4 additions & 0 deletions processing/src/test/java/org/apache/druid/math/expr/ApplyFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ public void testFilter()

assertExpr("filter((x) -> x > 2, [1, 2, 3, 4, 5])", new Long[] {3L, 4L, 5L});
assertExpr("filter((x) -> x > 2, b)", new Long[] {3L, 4L, 5L});

String dummyNull = null;
assertExpr("filter((x) -> array_contains([], x), ['a', 'b'])", dummyNull);
assertExpr("filter((x) -> array_contains([], x), null)", dummyNull);
Copy link
Copy Markdown
Member

@clintropolis clintropolis Mar 22, 2024

Choose a reason for hiding this comment

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

nit: this variable seems more chars than just using null directly...

}

@Test
Expand Down
26 changes: 11 additions & 15 deletions .../org/apache/druid/sql/calcite/expression/builtin/MultiValueStringOperatorConversions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,20 +341,6 @@ public DruidExpression toDruidExpression(
return null;
}

Expr expr = plannerContext.parseExpression(druidExpressions.get(1).getExpression());
// the right expression must be a literal array for this to work, since we need the values of the column
if (!expr.isLiteral()) {
return null;
}
Object[] lit = expr.eval(InputBindings.nilBindings()).asArray();
if (lit == null || lit.length == 0) {
return null;
}
HashSet<String> literals = Sets.newHashSetWithExpectedSize(lit.length);
for (Object o : lit) {
literals.add(Evals.asString(o));
}

final DruidExpression.ExpressionGenerator builder = (args) -> {
final StringBuilder expressionBuilder;
if (isAllowList()) {
Expand All @@ -370,7 +356,17 @@ public DruidExpression toDruidExpression(
return expressionBuilder.toString();
};

if (druidExpressions.get(0).isSimpleExtraction()) {
Expr expr = plannerContext.parseExpression(druidExpressions.get(1).getExpression());
if (druidExpressions.get(0).isSimpleExtraction() && expr.isLiteral()) {
Object[] lit = expr.eval(InputBindings.nilBindings()).asArray();
if (lit == null || lit.length == 0) {
return null;
}
HashSet<String> literals = Sets.newHashSetWithExpectedSize(lit.length);
for (Object o : lit) {
literals.add(Evals.asString(o));
}

DruidExpression druidExpression = DruidExpression.ofVirtualColumn(
Calcites.getColumnTypeForRelDataType(rexNode.getType()),
builder,
Expand Down
70 changes: 70 additions & 0 deletions sql/src/test/java/org/apache/druid/sql/calcite/CalciteMultiValueStringQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,6 +1333,41 @@ public void testMultiValueListFilter()
);
}

@Test
public void testMultiValueListFilterNonLiteral()
{
// Cannot vectorize due to usage of expressions.
cannotVectorize();

testQuery(
"SELECT MV_FILTER_ONLY(dim3, ARRAY[dim2]) FROM druid.numfoo",
ImmutableList.of(
newScanQueryBuilder()
.dataSource(CalciteTests.DATASOURCE3)
.intervals(querySegmentSpec(Filtration.eternity()))
.virtualColumns(
new ExpressionVirtualColumn(
"v0",
"filter((x) -> array_contains(array(\"dim2\"), x), \"dim3\")",
ColumnType.STRING,
TestExprMacroTable.INSTANCE
)
)
.columns("v0")
.context(QUERY_CONTEXT_DEFAULT)
.build()
),
ImmutableList.of(
new Object[]{"a"},
new Object[]{NullHandling.defaultStringValue()},
new Object[]{NullHandling.defaultStringValue()},
new Object[]{NullHandling.defaultStringValue()},
new Object[]{NullHandling.defaultStringValue()},
new Object[]{NullHandling.defaultStringValue()}
)
);
}

@Test
public void testMultiValueListFilterDeny()
{
Expand Down Expand Up @@ -1388,6 +1423,41 @@ public void testMultiValueListFilterDeny()
);
}

@Test
public void testMultiValueListFilterDenyNonLiteral()
{
// Cannot vectorize due to usage of expressions.
cannotVectorize();

testQuery(
"SELECT MV_FILTER_NONE(dim3, ARRAY[dim2]) FROM druid.numfoo",
ImmutableList.of(
newScanQueryBuilder()
.dataSource(CalciteTests.DATASOURCE3)
.intervals(querySegmentSpec(Filtration.eternity()))
.virtualColumns(
new ExpressionVirtualColumn(
"v0",
"filter((x) -> !array_contains(array(\"dim2\"), x), \"dim3\")",
ColumnType.STRING,
TestExprMacroTable.INSTANCE
)
)
.columns("v0")
.context(QUERY_CONTEXT_DEFAULT)
.build()
),
ImmutableList.of(
new Object[]{"b"},
new Object[]{"[\"b\",\"c\"]"},
new Object[]{"d"},
new Object[]{""},
new Object[]{NullHandling.defaultStringValue()},
new Object[]{NullHandling.defaultStringValue()}
)
);
}

@Test
public void testMultiValueListFilterComposed()
{
Expand Down