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 ClassCastException in DomainTranslator #14958

Merged
merged 1 commit into from
Nov 15, 2022
Merged

Fix ClassCastException in DomainTranslator #14958

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
25 changes: 12 additions & 13 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 @@ -512,10 +512,10 @@ protected ExtractionResult visitComparisonExpression(ComparisonExpression node,
Type castTargetType = requireNonNull(expressionTypes.get(NodeRef.of(castExpression)), "No type for Cast target expression");
if (castSourceType instanceof VarcharType && castTargetType == DATE && !castExpression.isSafe()) {
Optional<ExtractionResult> result = createVarcharCastToDateComparisonExtractionResult(
node,
normalized,
(VarcharType) castSourceType,
normalized.getValue(),
complement);
complement,
node);
martint marked this conversation as resolved.
Show resolved Hide resolved
if (result.isPresent()) {
return result.get();
}
Expand Down Expand Up @@ -604,15 +604,14 @@ private Map<NodeRef<Expression>, Type> analyzeExpression(Expression expression)
}

private Optional<ExtractionResult> createVarcharCastToDateComparisonExtractionResult(
ComparisonExpression node,
NormalizedSimpleComparison comparison,
VarcharType sourceType,
NullableValue value,
boolean complement)
boolean complement,
ComparisonExpression originalExpression)
{
Cast castExpression = (Cast) node.getLeft();
Expression sourceExpression = castExpression.getExpression();
ComparisonExpression.Operator comparisonOperator = node.getOperator();
requireNonNull(value, "value is null");
Expression sourceExpression = ((Cast) comparison.getSymbolExpression()).getExpression();
ComparisonExpression.Operator operator = comparison.getComparisonOperator();
NullableValue value = comparison.getValue();

if (complement || value.isNull()) {
return Optional.empty();
Expand All @@ -638,7 +637,7 @@ private Optional<ExtractionResult> createVarcharCastToDateComparisonExtractionRe
ValueSet valueSet;
boolean nullAllowed = false;

switch (comparisonOperator) {
switch (operator) {
case EQUAL:
valueSet = dateStringRanges(date, sourceType);
break;
Expand All @@ -649,7 +648,7 @@ private Optional<ExtractionResult> createVarcharCastToDateComparisonExtractionRe
return Optional.empty();
}
valueSet = ValueSet.all(sourceType).subtract(dateStringRanges(date, sourceType));
nullAllowed = (comparisonOperator == IS_DISTINCT_FROM);
nullAllowed = (operator == IS_DISTINCT_FROM);
break;
case LESS_THAN:
case LESS_THAN_OR_EQUAL:
Expand All @@ -670,7 +669,7 @@ private Optional<ExtractionResult> createVarcharCastToDateComparisonExtractionRe

return Optional.of(new ExtractionResult(
TupleDomain.withColumnDomains(ImmutableMap.of(sourceSymbol, Domain.create(valueSet, nullAllowed))),
node));
originalExpression));
}

/**
Expand Down
29 changes: 29 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 @@ -1072,6 +1072,17 @@ public void testPredicateWithVarcharCastToDate()
Range.greaterThan(VARCHAR, utf8Slice("2004"))),
false)));

// Regression test for https://github.com/trinodb/trino/issues/14954
assertPredicateTranslates(
greaterThan(new GenericLiteral("DATE", "2001-01-31"), cast(C_VARCHAR, DATE)),
tupleDomain(
C_VARCHAR,
Domain.create(ValueSet.ofRanges(
Range.lessThan(VARCHAR, utf8Slice("2002")),
Range.greaterThan(VARCHAR, utf8Slice("9"))),
false)),
greaterThan(new GenericLiteral("DATE", "2001-01-31"), cast(C_VARCHAR, DATE)));

// BETWEEN
assertPredicateTranslates(
between(cast(C_VARCHAR, DATE), new GenericLiteral("DATE", "2001-01-31"), new GenericLiteral("DATE", "2005-09-10")),
Expand All @@ -1083,6 +1094,24 @@ public void testPredicateWithVarcharCastToDate()
and(
greaterThanOrEqual(cast(C_VARCHAR, DATE), new GenericLiteral("DATE", "2001-01-31")),
lessThanOrEqual(cast(C_VARCHAR, DATE), new GenericLiteral("DATE", "2005-09-10"))));

// Regression test for https://github.com/trinodb/trino/issues/14954
assertPredicateTranslates(
Copy link
Member

Choose a reason for hiding this comment

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

Add a comment what's special about this case.

between(new GenericLiteral("DATE", "2001-01-31"), cast(C_VARCHAR, DATE), cast(C_VARCHAR_1, DATE)),
martint marked this conversation as resolved.
Show resolved Hide resolved
tupleDomain(
C_VARCHAR,
Domain.create(ValueSet.ofRanges(
Range.lessThan(VARCHAR, utf8Slice("2002")),
Range.greaterThan(VARCHAR, utf8Slice("9"))),
false),
C_VARCHAR_1,
Domain.create(ValueSet.ofRanges(
Range.lessThan(VARCHAR, utf8Slice("1")),
Range.greaterThan(VARCHAR, utf8Slice("2000"))),
false)),
and(
greaterThanOrEqual(new GenericLiteral("DATE", "2001-01-31"), cast(C_VARCHAR, DATE)),
lessThanOrEqual(new GenericLiteral("DATE", "2001-01-31"), cast(C_VARCHAR_1, DATE))));
}

@Test
Expand Down