Skip to content
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

fix issue with SQL boolean constants not respecting nulls when strict booleans and sql compatible null handling are enabled #15135

Merged
merged 2 commits into from
Oct 12, 2023
Merged

fix issue with SQL boolean constants not respecting nulls when strict booleans and sql compatible null handling are enabled #15135

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
dd6686f
fix issue with SQL boolean constants not respecting nulls when strict…
clintropolis Oct 11, 2023
a8e083a
require sql compatible null handling and strict booleans
clintropolis Oct 12, 2023
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
5 changes: 5 additions & 0 deletions sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidLogicalValuesRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
import org.apache.calcite.plan.RelOptRuleCall;
import org.apache.calcite.rel.logical.LogicalValues;
import org.apache.calcite.rex.RexLiteral;
import org.apache.druid.common.config.NullHandling;
import org.apache.druid.error.InvalidSqlInput;
import org.apache.druid.math.expr.ExpressionProcessing;
import org.apache.druid.query.InlineDataSource;
import org.apache.druid.segment.column.RowSignature;
import org.apache.druid.sql.calcite.planner.Calcites;
Expand Down Expand Up @@ -120,6 +122,9 @@ public static Object getValueFromLiteral(RexLiteral literal, PlannerContext plan
}
return ((Number) RexLiteral.value(literal)).longValue();
case BOOLEAN:
if (ExpressionProcessing.useStrictBooleans() && NullHandling.sqlCompatible() && literal.isNull()) {
return null;
}
return literal.isAlwaysTrue() ? 1L : 0L;
case TIMESTAMP:
case DATE:
Expand Down
17 changes: 17 additions & 0 deletions sql/src/test/java/org/apache/druid/sql/calcite/rule/DruidLogicalValuesRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
import org.apache.calcite.util.DateString;
import org.apache.calcite.util.TimeString;
import org.apache.calcite.util.TimestampString;
import org.apache.druid.common.config.NullHandling;
import org.apache.druid.error.DruidExceptionMatcher;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.math.expr.ExpressionProcessing;
import org.apache.druid.sql.calcite.planner.DruidTypeSystem;
import org.apache.druid.sql.calcite.planner.PlannerContext;
import org.apache.druid.testing.InitializedNullHandlingTest;
Expand Down Expand Up @@ -139,6 +141,21 @@ public void testGetValueFromFalseLiteral()
Assert.assertEquals(0L, fromLiteral);
}

@Test
public void testGetValueFromNullBooleanLiteral()
{
RexLiteral literal = REX_BUILDER.makeLiteral(null, REX_BUILDER.getTypeFactory().createSqlType(SqlTypeName.BOOLEAN));

if (NullHandling.sqlCompatible() && ExpressionProcessing.useStrictBooleans()) {
final Object fromLiteral = DruidLogicalValuesRule.getValueFromLiteral(literal, DEFAULT_CONTEXT);
Assert.assertNull(fromLiteral);
} else {
final Object fromLiteralNonStrict = DruidLogicalValuesRule.getValueFromLiteral(literal, DEFAULT_CONTEXT);
Assert.assertSame(Long.class, fromLiteralNonStrict.getClass());
Assert.assertEquals(0L, fromLiteralNonStrict);
}
}

@Test
public void testGetValueFromTimestampLiteral()
{
Expand Down
Loading