Fixing some tests

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
harshavamsi · Dec 7, 2023 · a89340f · a89340f
1 parent 3eb4316
commit a89340f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/...ec/src/main/resources/rest-api-spec/test/search/360_number_field_term_doc_values_only.yml b/...ec/src/main/resources/rest-api-spec/test/search/360_number_field_term_doc_values_only.yml
@@ -62,7 +62,7 @@ setup:
           integer: 1
           long: 1
           short: 1
-          unsigned_long: 1
+          unsigned_long: 10223372036854775807
 
   - do:
       headers:
@@ -78,7 +78,7 @@ setup:
           integer: 1
           long: 1
           short: 1
-          unsigned_long: 1
+          unsigned_long: 10223372036854775807
 
 
   - do:
@@ -95,7 +95,7 @@ setup:
           integer: 1
           long: 1
           short: 1
-          unsigned_long: 1
+          unsigned_long: 10223372036854775807
 
 
   - do:

diff --git a/...g/apache/lucene/document/LongHashSet.java → ...a/org/apache/lucene/util/LongHashSet.java b/...g/apache/lucene/document/LongHashSet.java → ...a/org/apache/lucene/util/LongHashSet.java
@@ -6,10 +6,8 @@
  * compatible open source license.
  */
 
-package org.apache.lucene.document;
+package org.apache.lucene.util;
 
-import org.apache.lucene.util.Accountable;
-import org.apache.lucene.util.RamUsageEstimator;
 import org.apache.lucene.util.packed.PackedInts;
 
 import java.util.Arrays;

diff --git a/server/src/main/java/org/opensearch/index/document/SortedUnsignedLongDocValuesSetQuery.java b/server/src/main/java/org/opensearch/index/document/SortedUnsignedLongDocValuesSetQuery.java
@@ -8,7 +8,6 @@
 
 package org.opensearch.index.document;
 
-import org.apache.lucene.document.LongHashSet;
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.FieldInfo;
 import org.apache.lucene.index.LeafReader;
@@ -25,6 +24,7 @@
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.TwoPhaseIterator;
 import org.apache.lucene.search.Weight;
+import org.apache.lucene.util.LongHashSet;
 
 import java.io.IOException;
 import java.math.BigInteger;

diff --git a/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java
@@ -222,7 +222,9 @@ public Query termsQuery(String field, List<Object> values, boolean hasDocValues,
                 long points[] = new long[v.length];
                 for (int i = 0; i < values.size(); ++i) {
                     v[i] = parse(values.get(i), false);
-                    points[i] = HalfFloatPoint.halfFloatToSortableShort(v[i]);
+                    if (hasDocValues) {
+                        points[i] = HalfFloatPoint.halfFloatToSortableShort(v[i]);
+                    }
                 }
                 if (isSearchable && hasDocValues) {
                     Query query = HalfFloatPoint.newSetQuery(field, v);
@@ -357,7 +359,9 @@ public Query termsQuery(String field, List<Object> values, boolean hasDocValues,
                 long points[] = new long[v.length];
                 for (int i = 0; i < values.size(); ++i) {
                     v[i] = parse(values.get(i), false);
-                    points[i] = NumericUtils.floatToSortableInt(v[i]);
+                    if (hasDocValues) {
+                        points[i] = NumericUtils.floatToSortableInt(v[i]);
+                    }
                 }
                 if (isSearchable && hasDocValues) {
                     return new IndexOrDocValuesQuery(
@@ -481,7 +485,9 @@ public Query termsQuery(String field, List<Object> values, boolean hasDocValues,
                 long points[] = new long[v.length];
                 for (int i = 0; i < values.size(); ++i) {
                     v[i] = parse(values.get(i), false);
-                    points[i] = NumericUtils.doubleToSortableLong(v[i]);
+                    if (hasDocValues) {
+                        points[i] = NumericUtils.doubleToSortableLong(v[i]);
+                    }
                 }
                 if (isSearchable && hasDocValues) {
                     return new IndexOrDocValuesQuery(
@@ -758,8 +764,10 @@ public Query termsQuery(String field, List<Object> values, boolean hasDocValues,
                     v = Arrays.copyOf(v, upTo);
                 }
                 long points[] = new long[v.length];
-                for (int i = 0; i < v.length; i++) {
-                    points[i] = v[i];
+                if (hasDocValues) {
+                    for (int i = 0; i < v.length; i++) {
+                        points[i] = v[i];
+                    }
                 }
                 if (isSearchable && hasDocValues) {
                     return new IndexOrDocValuesQuery(
@@ -999,14 +1007,12 @@ public Query termQuery(String field, Object value, boolean hasDocValues, boolean
             @Override
             public Query termsQuery(String field, List<Object> values, boolean hasDocvalues, boolean isSearchable) {
                 BigInteger[] v = new BigInteger[values.size()];
-                long points[] = new long[v.length];
                 int upTo = 0;
 
                 for (int i = 0; i < values.size(); i++) {
                     Object value = values.get(i);
                     if (!hasDecimalPart(value)) {
                         v[upTo++] = parse(value, true);
-                        points[i] = v[i].longValue();
                     }
                 }