Skip to content

Add error handling for saturated floor cast #17014

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
sopel39 merged 1 commit into from
May 24, 2023
Merged

Add error handling for saturated floor cast #17014

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
17 changes: 15 additions & 2 deletions core/trino-main/src/main/java/io/trino/sql/planner/DomainTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import io.trino.metadata.TableProceduresRegistry;
import io.trino.metadata.TablePropertyManager;
import io.trino.security.AllowAllAccessControl;
import io.trino.spi.ErrorCode;
import io.trino.spi.TrinoException;
import io.trino.spi.predicate.DiscreteValues;
import io.trino.spi.predicate.Domain;
Expand Down Expand Up @@ -94,6 +95,7 @@
import static io.airlift.slice.SliceUtf8.setCodePointAt;
import static io.airlift.slice.Slices.utf8Slice;
import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
import static io.trino.spi.function.InvocationConvention.simpleConvention;
Expand Down Expand Up @@ -835,8 +837,19 @@ private Optional<Expression> coerceComparisonWithRounding(
}
Type valueType = nullableValue.getType();
Object value = nullableValue.getValue();
return floorValue(valueType, symbolExpressionType, value)
.map(floorValue -> rewriteComparisonExpression(symbolExpressionType, symbolExpression, valueType, value, floorValue, comparisonOperator));
Optional<Object> floorValueOptional;
try {
floorValueOptional = floorValue(valueType, symbolExpressionType, value);
Copy link
Copy Markdown
Member

@sopel39 sopel39 May 22, 2023

Choose a reason for hiding this comment

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

Is this the only usage of SaturatedFloorCast that needs to be fixed?

}
catch (TrinoException e) {
ErrorCode errorCode = e.getErrorCode();
if (INVALID_CAST_ARGUMENT.toErrorCode().equals(errorCode)) {
// There's no such value at symbolExpressionType
return Optional.of(FALSE_LITERAL);
}
throw e;
}
return floorValueOptional.map(floorValue -> rewriteComparisonExpression(symbolExpressionType, symbolExpression, valueType, value, floorValue, comparisonOperator));
}

private Expression rewriteComparisonExpression(
Expand Down
10 changes: 10 additions & 0 deletions core/trino-main/src/test/java/io/trino/sql/planner/TestDomainTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,16 @@ public void testFromBasicComparisonsWithNaN()
assertUnsupportedPredicate(not(isDistinctFrom(C_REAL, nanReal)));
}

@Test
public void testFromCoercionComparisonsWithNaN()
{
Expression nanDouble = literalEncoder.toExpression(TEST_SESSION, Double.NaN, DOUBLE);

assertPredicateIsAlwaysFalse(equal(cast(C_TINYINT, DOUBLE), nanDouble));
assertPredicateIsAlwaysFalse(equal(cast(C_SMALLINT, DOUBLE), nanDouble));
assertPredicateIsAlwaysFalse(equal(cast(C_INTEGER, DOUBLE), nanDouble));
}

@Test
public void testNonImplicitCastOnSymbolSide()
{
Expand Down