Fix match query on a scaled_float property no longer matches for some values

Signed-off-by: kkewwei <[email protected]>
Signed-off-by: kkewwei <[email protected]>

Author: kkewwei

CHANGELOG.md

@@ -85,6 +85,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix bytes parameter on `_cat/recovery` ([#17598](https://github.com/opensearch-project/OpenSearch/pull/17598))
 - Fix slow performance of FeatureFlag checks ([#17611](https://github.com/opensearch-project/OpenSearch/pull/17611))
 - Fix shard recovery in pull-based ingestion to avoid skipping messages ([#17868](https://github.com/opensearch-project/OpenSearch/pull/17868)))
+- Fix match query on a `scaled_float` property no longer matches for some values ([#17879](https://github.com/opensearch-project/OpenSearch/pull/17879))
 
 ### Security
 

modules/mapper-extras/src/main/java/org/opensearch/index/mapper/ScaledFloatFieldMapper.java

@@ -229,7 +229,7 @@ public String typeName() {
         @Override
         public Query termQuery(Object value, QueryShardContext context) {
             failIfNotIndexedAndNoDocValues();
-            long scaledValue = Math.round(scale(value));
+            long scaledValue = Math.round(parse(value) * scalingFactor);
             Query query = NumberFieldMapper.NumberType.LONG.termQuery(name(), scaledValue, hasDocValues(), isSearchable());
             if (boost() != 1f) {
                 query = new BoostQuery(query, boost());
@@ -242,7 +242,7 @@ public Query termsQuery(List<?> values, QueryShardContext context) {
             failIfNotIndexedAndNoDocValues();
             List<Long> scaledValues = new ArrayList<>(values.size());
             for (Object value : values) {
-                long scaledValue = Math.round(scale(value));
+                long scaledValue = Math.round(parse(value) * scalingFactor);
                 scaledValues.add(scaledValue);
             }
             Query query = NumberFieldMapper.NumberType.LONG.termsQuery(
@@ -262,15 +262,15 @@ public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower
             failIfNotIndexedAndNoDocValues();
             Long lo = null;
             if (lowerTerm != null) {
-                double dValue = scale(lowerTerm);
+                double dValue = Math.round(parse(lowerTerm) * scalingFactor);
                 if (includeLower == false) {
                     dValue = Math.nextUp(dValue);
                 }
                 lo = Math.round(Math.ceil(dValue));
             }
             Long hi = null;
             if (upperTerm != null) {
-                double dValue = scale(upperTerm);
+                double dValue = Math.round(parse(upperTerm) * scalingFactor);
                 if (includeUpper == false) {
                     dValue = Math.nextDown(dValue);
                 }

modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/scaled_float/10_basic.yml

@@ -35,6 +35,17 @@ setup:
         id: 4
         body: { "number" : 1.53 }
 
+  - do:
+      index:
+        index: test
+        id: 5
+        body: { "number": "92233720368547750" }
+  - do:
+      index:
+        index: test
+        id: 6
+        body: { "number": 92233720368547750 }
+
   - do:
       indices.refresh: {}
 
@@ -46,27 +57,27 @@ setup:
         rest_total_hits_as_int: true
         body: { "size" : 0, "aggs" : { "my_terms" : { "terms" : { "field" : "number" } } } }
 
-  - match: { hits.total: 4 }
+  - match: { hits.total: 6 }
 
-  - length: { aggregations.my_terms.buckets: 3 }
+  - length: { aggregations.my_terms.buckets: 4 }
 
   - match: { aggregations.my_terms.buckets.0.key: 1.53 }
 
   - is_false: aggregations.my_terms.buckets.0.key_as_string
 
   - match: { aggregations.my_terms.buckets.0.doc_count: 2 }
 
-  - match: { aggregations.my_terms.buckets.1.key: -2.1 }
+  - match: { aggregations.my_terms.buckets.2.key: -2.1 }
 
-  - is_false: aggregations.my_terms.buckets.1.key_as_string
+  - is_false: aggregations.my_terms.buckets.2.key_as_string
 
-  - match: { aggregations.my_terms.buckets.1.doc_count: 1 }
+  - match: { aggregations.my_terms.buckets.2.doc_count: 1 }
 
-  - match: { aggregations.my_terms.buckets.2.key: 1 }
+  - match: { aggregations.my_terms.buckets.3.key: 1 }
 
-  - is_false: aggregations.my_terms.buckets.2.key_as_string
+  - is_false: aggregations.my_terms.buckets.3.key_as_string
 
-  - match: { aggregations.my_terms.buckets.2.doc_count: 1 }
+  - match: { aggregations.my_terms.buckets.3.doc_count: 1 }
 
 ---
 "Search":
@@ -76,14 +87,14 @@ setup:
         rest_total_hits_as_int: true
         body: { "size" : 0, "query" : { "range" : { "number" : { "gte" : -2 } } } }
 
-  - match: { hits.total: 3 }
+  - match: { hits.total: 5 }
 
   - do:
       search:
         rest_total_hits_as_int: true
         body: { "size" : 0, "query" : { "range" : { "number" : { "gte" : 0 } } } }
 
-  - match: { hits.total: 3 }
+  - match: { hits.total: 5 }
 
   - do:
       search:
@@ -92,6 +103,64 @@ setup:
 
   - match: { hits.total: 2 }
 
+---
+"Search_With_Precision_Lose":
+  - skip:
+      version: " - 3.99.99"
+      reason: "fixed in 3.0.0"
+
+  - do:
+      search:
+        index: test
+        body: {
+          "query": {
+            "range": {
+              "number": {
+                "gte": "92233720368547750"
+              }
+            }
+          }
+        }
+  - length: { hits.hits: 2 }
+  - match: { hits.hits.0._id: "5" }
+  - match: { hits.hits.0._source.number: "92233720368547750" }
+  - match: { hits.hits.1._id: "6" }
+  - match: { hits.hits.1._source.number: 92233720368547750 }
+
+  - do:
+      search:
+        index: test
+        body: {
+          "query": {
+            "term": {
+              "field0_BigDecimal": "92233720368547750"
+            }
+          }
+        }
+
+  - length: { hits.hits: 2 }
+  - match: { hits.hits.0._id: "5" }
+  - match: { hits.hits.0._source.number: "92233720368547750" }
+  - match: { hits.hits.1._id: "6" }
+  - match: { hits.hits.1._source.number: 92233720368547750 }
+
+  - do:
+      search:
+        index: test
+        body: {
+          "query": {
+            "terms": {
+              "field0_BigDecimal": [ "92233720368547750" ]
+            }
+          }
+        }
+
+  - length: { hits.hits: 2 }
+  - match: { hits.hits.0._id: "5" }
+  - match: { hits.hits.0._source.number: "92233720368547750" }
+  - match: { hits.hits.1._id: "6" }
+  - match: { hits.hits.1._source.number: 92233720368547750 }
+
 ---
 "Sort":
 
@@ -103,7 +172,7 @@ setup:
             number:
               order: asc
 
-  - match: { hits.total.value: 4 }
+  - match: { hits.total.value: 6 }
   - match: { hits.hits.0._id: "3" }
   - match: { hits.hits.0.sort.0: -2.1 }
 
@@ -119,7 +188,7 @@ setup:
               order: asc
               numeric_type: long
 
-  - match: { hits.total.value: 4 }
+  - match: { hits.total.value: 6 }
   - match: { hits.hits.0._id: "3" }
   - match: { hits.hits.0.sort.0: -2 }