Skip to content

fix greatest/least function non-vectorized processing to ignore null argument types #16649

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
clintropolis merged 2 commits into from
Jun 26, 2024
Merged

fix greatest/least function non-vectorized processing to ignore null argument types #16649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7c78f
fix greatest/least function non-vectorized processing to ignore null …
clintropolis Jun 24, 2024
7554301
fix tests
clintropolis Jun 24, 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
7 changes: 3 additions & 4 deletions processing/src/main/java/org/apache/druid/math/expr/Function.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,11 +622,10 @@ public ExprEval apply(List<Expr> args, Expr.ObjectBinding bindings)
ExprEval<?> exprEval = expr.eval(bindings);
ExpressionType exprType = exprEval.type();

if (isValidType(exprType)) {
outputType = ExpressionTypeConversion.function(outputType, exprType);
}

if (exprEval.value() != null) {
if (isValidType(exprType)) {
outputType = ExpressionTypeConversion.function(outputType, exprType);
}
evals.add(exprEval);
}
}
Expand Down
2 changes: 2 additions & 0 deletions processing/src/test/java/org/apache/druid/math/expr/FunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,7 @@ public void testGreatest()
assertExpr("greatest()", null);
assertExpr("greatest(null, null)", null);
assertExpr("greatest(1, null, 'A')", "A");
assertExpr("greatest(1.0, 1, null)", 1.0);
}

@Test
Expand All @@ -703,6 +704,7 @@ public void testLeast()
assertExpr("least()", null);
assertExpr("least(null, null)", null);
assertExpr("least(1, null, 'A')", "1");
assertExpr("least(1.0, 1, null)", 1.0);
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions sql/src/test/java/org/apache/druid/sql/calcite/expression/GreatestExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public void testDecimal()
}

@Test
public void testDecimalWithNullShouldReturnString()
public void testDecimalWithNullShouldNotReturnString()
{
testExpression(
Arrays.asList(
Expand All @@ -227,7 +227,7 @@ public void testDecimalWithNullShouldReturnString()
null,
3.4
),
"3.4"
3.4
);
}
@Test
Expand Down
4 changes: 2 additions & 2 deletions sql/src/test/java/org/apache/druid/sql/calcite/expression/LeastExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public void testDecimal()
}

@Test
public void testDecimalWithNullShouldReturnString()
public void testDecimalWithNullShouldNotReturnString()
{
testExpression(
Arrays.asList(
Expand All @@ -227,7 +227,7 @@ public void testDecimalWithNullShouldReturnString()
3.4,
null
),
"1.2"
1.2
);
}

Expand Down