Add NumericType.Date to missingObject Method

hanjongho · web-flow · commit e6d3f46d2912 · 2024-11-01T19:46:32.000+09:00
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java
@@ -152,11 +152,11 @@ protected long docValue() {
 
     @Override
     public Object missingObject(Object missingValue, boolean reversed) {
-        if (targetNumericType == NumericType.DATE_NANOSECONDS) {
+        if (targetNumericType == NumericType.DATE_NANOSECONDS || targetNumericType == NumericType.DATE) {
             // special case to prevent negative values that would cause invalid nanosecond ranges
             if (sortMissingFirst(missingValue) || sortMissingLast(missingValue)) {
                 final boolean min = sortMissingFirst(missingValue) ^ reversed;
-                return min ? 0L : DateUtils.MAX_NANOSECOND;
+                return min ? 0L : targetNumericType == IndexNumericFieldData.NumericType.DATE_NANOSECONDS ? DateUtils.MAX_NANOSECOND : Long.MAX_VALUE;
             }
         }
         return super.missingObject(missingValue, reversed);

Original file line number	Diff line number	Diff line change
`@@ -152,11 +152,11 @@ protected long docValue() {`
`152`	`152`
`153`	`153`	`@Override`
`154`	`154`	`public Object missingObject(Object missingValue, boolean reversed) {`
`155`		`- if (targetNumericType == NumericType.DATE_NANOSECONDS) {`
	`155`	`+ if (targetNumericType == NumericType.DATE_NANOSECONDS \|\| targetNumericType == NumericType.DATE) {`
`156`	`156`	`// special case to prevent negative values that would cause invalid nanosecond ranges`
`157`	`157`	`if (sortMissingFirst(missingValue) \|\| sortMissingLast(missingValue)) {`
`158`	`158`	`final boolean min = sortMissingFirst(missingValue) ^ reversed;`
`159`		`- return min ? 0L : DateUtils.MAX_NANOSECOND;`
	`159`	`+ return min ? 0L : targetNumericType == IndexNumericFieldData.NumericType.DATE_NANOSECONDS ? DateUtils.MAX_NANOSECOND : Long.MAX_VALUE;`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`	`return super.missingObject(missingValue, reversed);`