Skip to content

Fix nullAllowed of Domain for identical operator in UtcConstraintExtractor #27213

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
merged 2 commits into from
Nov 6, 2025
Merged

Fix nullAllowed of Domain for identical operator in UtcConstraintExtractor #27213

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
9d8205b
Fix nullAllowed of Domain for identical operator in UtcConstraintExtr…
hqbhoho Nov 5, 2025
e82e2c3
Document IDENTICAL_OPERATOR_FUNCTION_NAME in StandardFunctions
hqbhoho Nov 5, 2025
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
3 changes: 3 additions & 0 deletions core/trino-spi/src/main/java/io/trino/spi/expression/StandardFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ private StandardFunctions() {}
public static final FunctionName LESS_THAN_OR_EQUAL_OPERATOR_FUNCTION_NAME = new FunctionName("$less_than_or_equal");
public static final FunctionName GREATER_THAN_OPERATOR_FUNCTION_NAME = new FunctionName("$greater_than");
public static final FunctionName GREATER_THAN_OR_EQUAL_OPERATOR_FUNCTION_NAME = new FunctionName("$greater_than_or_equal");
/**
* $identical function is equivalent to the SQL operator "IS NOT DISTINCT FROM".
*/
public static final FunctionName IDENTICAL_OPERATOR_FUNCTION_NAME = new FunctionName("$identical");

/**
Expand Down
4 changes: 2 additions & 2 deletions ...rino-plugin-toolkit/src/main/java/io/trino/plugin/base/filter/UtcConstraintExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private static Optional<Domain> createDomain(FunctionName functionName, Type typ
return Optional.of(Domain.create(ValueSet.ofRanges(Range.greaterThanOrEqual(type, startOfDate)), false));
}
if (functionName.equals(IDENTICAL_OPERATOR_FUNCTION_NAME)) {
return Optional.of(Domain.create(ValueSet.ofRanges(Range.range(type, startOfDate, true, startOfNextDate, false)), true));
return Optional.of(Domain.create(ValueSet.ofRanges(Range.range(type, startOfDate, true, startOfNextDate, false)), false));
Copy link
Member

@findepi findepi Nov 5, 2025

Choose a reason for hiding this comment

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

Would be good to add a jdoc to IDENTICAL_OPERATOR_FUNCTION_NAME documenting semantics (like SQL's NOT DISTINCT FROM, i assume)

Copy link
Contributor Author

@hqbhoho hqbhoho Nov 5, 2025

Choose a reason for hiding this comment

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

Yes,$identical is equal to IS NOT DISTINCT FROM for SQL.

IDENTICAL(IDENTICAL_OPERATOR_FUNCTION_NAME, "IS NOT DISTINCT FROM"),

https://github.com/trinodb/trino/blob/3f97a0f867df966de09c93004af5161cec7716db/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/ComparisonOperator.java#L41C71-L41C72

Copy link
Member

@findepi findepi Nov 5, 2025

Choose a reason for hiding this comment

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

it would be great to document it where io.trino.spi.expression.StandardFunctions#IDENTICAL_OPERATOR_FUNCTION_NAME is defined.

Copy link
Contributor Author

@hqbhoho hqbhoho Nov 5, 2025

Choose a reason for hiding this comment

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

I have added a jdoc like:
$identical function is equivalent to the SQL operator "IS NOT DISTINCT FROM".

}

return Optional.empty();
Expand Down Expand Up @@ -363,7 +363,7 @@ private static Optional<Domain> unwrapDateTruncInComparison(String unit, Functio
if (!constantAtPeriodStart) {
return Optional.of(Domain.none(type));
}
return Optional.of(Domain.create(ValueSet.ofRanges(Range.range(type, start, true, end, false)), true));
return Optional.of(Domain.create(ValueSet.ofRanges(Range.range(type, start, true, end, false)), false));
}
if (functionName.equals(LESS_THAN_OPERATOR_FUNCTION_NAME)) {
if (constantAtPeriodStart) {
Expand Down
12 changes: 6 additions & 6 deletions ...-plugin-toolkit/src/test/java/io/trino/plugin/base/filter/TestUtcConstraintExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public void testExtractTimestampTzMillisDateComparison()
Map.of(timestampTzColumnSymbol, columnHandle))))
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
columnHandle,
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), true))));
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), false))));
}

/**
Expand Down Expand Up @@ -216,7 +216,7 @@ public void testExtractTimestampTzMicrosDateComparison()
Map.of(timestampTzColumnSymbol, columnHandle))))
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
columnHandle,
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), true))));
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), false))));
}

/**
Expand Down Expand Up @@ -302,7 +302,7 @@ public void testExtractDateTruncTimestampTzMillisComparison()
Map.of(timestampTzColumnSymbol, columnHandle))))
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
columnHandle,
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), true))));
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), false))));
}

/**
Expand Down Expand Up @@ -388,7 +388,7 @@ public void testExtractDateTruncTimestampTzMicrosComparison()
Map.of(timestampTzColumnSymbol, columnHandle))))
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
columnHandle,
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), true))));
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), false))));
}

/**
Expand Down Expand Up @@ -461,7 +461,7 @@ public void testExtractYearTimestampTzMicrosComparison()
Map.of(timestampTzColumnSymbol, columnHandle))))
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
columnHandle,
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfYearUtc, true, startOfNextDateUtc, false)), true))));
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfYearUtc, true, startOfNextDateUtc, false)), false))));
}

/**
Expand Down Expand Up @@ -534,7 +534,7 @@ public void testExtractYearTimestampTzMillisComparison()
Map.of(timestampTzColumnSymbol, columnHandle))))
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
columnHandle,
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfYearUtc, true, startOfNextDateUtc, false)), true))));
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfYearUtc, true, startOfNextDateUtc, false)), false))));
}

@Test
Expand Down