apply review comments

Signed-off-by: panguixin <[email protected]>
opensearch-project · Jul 30, 2024 · 896e850 · 896e850
1 parent f1bc420
commit 896e850
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/sort/FieldSortIT.java b/server/src/internalClusterTest/java/org/opensearch/search/sort/FieldSortIT.java
@@ -1080,11 +1080,7 @@ public void testSortMissingNumbers() throws Exception {
         SearchRequestBuilder searchRequestBuilder = client().prepareSearch()
             .setQuery(matchAllQuery())
             .addSort(SortBuilders.fieldSort("u_value").order(SortOrder.ASC).missing(randomBoolean() ? -1 : "-1"));
-        assertFailures(
-            searchRequestBuilder,
-            RestStatus.BAD_REQUEST,
-            containsString("missing value of type [unsigned_long] must not be negative")
-        );
+        assertFailures(searchRequestBuilder, RestStatus.BAD_REQUEST, containsString("Value [-1] is out of range for an unsigned long"));
     }
 
     public void testSortMissingNumbersMinMax() throws Exception {

diff --git a/...va/org/opensearch/index/fielddata/fieldcomparator/UnsignedLongValuesComparatorSource.java b/...va/org/opensearch/index/fielddata/fieldcomparator/UnsignedLongValuesComparatorSource.java
@@ -81,15 +81,11 @@ public Object missingObject(Object missingValue, boolean reversed) {
             return min ? Numbers.MIN_UNSIGNED_LONG_VALUE : Numbers.MAX_UNSIGNED_LONG_VALUE;
         } else {
             if (missingValue instanceof Number) {
-                long ul = ((Number) missingValue).longValue();
-                if (ul < 0) {
-                    throw new IllegalArgumentException("missing value of type [unsigned_long] must not be negative");
-                }
-                return BigInteger.valueOf(ul);
+                return Numbers.toUnsignedLongExact((Number) missingValue);
             } else {
                 BigInteger missing = new BigInteger(missingValue.toString());
                 if (missing.signum() < 0) {
-                    throw new IllegalArgumentException("missing value of type [unsigned_long] must not be negative");
+                    throw new IllegalArgumentException("Value [" + missingValue + "] is out of range for an unsigned long");
                 }
                 return missing;
             }