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

@@ -68,6 +68,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Fixed
 - 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 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(

rest-api-spec/src/main/resources/rest-api-spec/test/index/130_scaled_flot.yml

@@ -0,0 +1,123 @@
+# The test setup includes two parts:
+# part1: test mapping and indexing
+# part2: test query
+---
+"Mappings and Indexing":
+
+  # Create indices with constant_keyword field type
+  - do:
+      indices.create:
+        index: test
+        body:
+          mappings:
+            properties:
+              genre:
+                type: "scaled_float"
+                scaling_factor: "100.0"
+
+  # Index documents to test integer and string are both ok.
+  - do:
+      index:
+        index: test
+        id: 1
+        body: {
+          "genre": "92233720368547750"
+        }
+
+  - do:
+      index:
+        index: test
+        id: 2
+        body: {
+          "genre": 92233720368547750
+        }
+
+  - do:
+      index:
+        index: test
+        id: 3
+        body: {
+          "genre": 1.11
+        }
+  # Refresh
+  - do:
+      indices.refresh:
+        index: test
+
+  # Check mapping
+  - do:
+      indices.get_mapping:
+        index: test
+  - is_true: test.mappings
+  - match: { test.mappings.properties.genre.type: scaled_float }
+
+  # Verify Document Count
+  - do:
+      search:
+        index: test
+        body: {
+          query: {
+            match_all: {}
+          }
+        }
+
+  - length: { hits.hits: 3 }
+
+---
+"Queries":
+  - skip:
+      version: " - 3.99.99"
+      reason: "fixed in 3.0.0"
+
+  # Test rangeQuery
+  - do:
+      search:
+        index: test
+        body: {
+          query: {
+            range: {
+              genre: {
+                gte: "92233720368547750"
+              }
+            }
+          }
+        }
+
+  - length: { hits.hits: 2 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.0._id: "2" }
+
+  - do:
+      search:
+        index: test
+        body: {
+          query: {
+            term: {
+              "field0_BigDecimal": "92233720368547750"
+            }
+          }
+        }
+
+  - length: { hits.hits: 2 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.0._id: "2" }
+
+  - do:
+      search:
+        index: test
+        body: {
+          query: {
+            terms: {
+              "field0_BigDecimal": [ "92233720368547750" ]
+            }
+          }
+        }
+
+  - length: { hits.hits: 2 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.0._id: "2" }
+
+  # Delete Index when connection is teardown
+  - do:
+      indices.delete:
+        index: test