Skip to content

Commit 4501b99

Browse files
hqbhohofindepi
authored andcommitted
Fix nullAllowed of Domain for identical operator in UtcConstraintExtractor
1 parent 13d3090 commit 4501b99

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/filter/UtcConstraintExtractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private static Optional<Domain> createDomain(FunctionName functionName, Type typ
248248
return Optional.of(Domain.create(ValueSet.ofRanges(Range.greaterThanOrEqual(type, startOfDate)), false));
249249
}
250250
if (functionName.equals(IDENTICAL_OPERATOR_FUNCTION_NAME)) {
251-
return Optional.of(Domain.create(ValueSet.ofRanges(Range.range(type, startOfDate, true, startOfNextDate, false)), true));
251+
return Optional.of(Domain.create(ValueSet.ofRanges(Range.range(type, startOfDate, true, startOfNextDate, false)), false));
252252
}
253253

254254
return Optional.empty();
@@ -363,7 +363,7 @@ private static Optional<Domain> unwrapDateTruncInComparison(String unit, Functio
363363
if (!constantAtPeriodStart) {
364364
return Optional.of(Domain.none(type));
365365
}
366-
return Optional.of(Domain.create(ValueSet.ofRanges(Range.range(type, start, true, end, false)), true));
366+
return Optional.of(Domain.create(ValueSet.ofRanges(Range.range(type, start, true, end, false)), false));
367367
}
368368
if (functionName.equals(LESS_THAN_OPERATOR_FUNCTION_NAME)) {
369369
if (constantAtPeriodStart) {

lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/filter/TestUtcConstraintExtractor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void testExtractTimestampTzMillisDateComparison()
146146
Map.of(timestampTzColumnSymbol, columnHandle))))
147147
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
148148
columnHandle,
149-
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), true))));
149+
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), false))));
150150
}
151151

152152
/**
@@ -216,7 +216,7 @@ public void testExtractTimestampTzMicrosDateComparison()
216216
Map.of(timestampTzColumnSymbol, columnHandle))))
217217
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
218218
columnHandle,
219-
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), true))));
219+
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), false))));
220220
}
221221

222222
/**
@@ -302,7 +302,7 @@ public void testExtractDateTruncTimestampTzMillisComparison()
302302
Map.of(timestampTzColumnSymbol, columnHandle))))
303303
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
304304
columnHandle,
305-
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), true))));
305+
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), false))));
306306
}
307307

308308
/**
@@ -388,7 +388,7 @@ public void testExtractDateTruncTimestampTzMicrosComparison()
388388
Map.of(timestampTzColumnSymbol, columnHandle))))
389389
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
390390
columnHandle,
391-
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), true))));
391+
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfDateUtc, true, startOfNextDateUtc, false)), false))));
392392
}
393393

394394
/**
@@ -461,7 +461,7 @@ public void testExtractYearTimestampTzMicrosComparison()
461461
Map.of(timestampTzColumnSymbol, columnHandle))))
462462
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
463463
columnHandle,
464-
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfYearUtc, true, startOfNextDateUtc, false)), true))));
464+
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfYearUtc, true, startOfNextDateUtc, false)), false))));
465465
}
466466

467467
/**
@@ -534,7 +534,7 @@ public void testExtractYearTimestampTzMillisComparison()
534534
Map.of(timestampTzColumnSymbol, columnHandle))))
535535
.isEqualTo(TupleDomain.withColumnDomains(Map.of(
536536
columnHandle,
537-
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfYearUtc, true, startOfNextDateUtc, false)), true))));
537+
Domain.create(ValueSet.ofRanges(Range.range(columnType, startOfYearUtc, true, startOfNextDateUtc, false)), false))));
538538
}
539539

540540
@Test

0 commit comments

Comments
 (0)