Merge branch 'main' into hybrid-collector

anandpatel9998 · anandpatel9998 · commit a34c044a5505 · 2025-10-08T21:31:31.000-07:00
Signed-off-by: Anand Patel &lt;anandpatel9998@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,8 +54,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Harden the circuit breaker and failure handle logic in query result consumer ([#19396](https://github.com/opensearch-project/OpenSearch/pull/19396))
 - Add streaming cardinality aggregator ([#19484](https://github.com/opensearch-project/OpenSearch/pull/19484))
 - Add Hybrid Cardinality collector to prioritize Ordinals Collector ([#19524](https://github.com/opensearch-project/OpenSearch/pull/19524))
+- Use Lucene `pack` method for `half_float` and `usigned_long` when using `ApproximatePointRangeQuery`.
 
 ### Changed
+- Refactor to move prepareIndex and prepareDelete methods to Engine class ([#19551](https://github.com/opensearch-project/OpenSearch/pull/19551))
 
 ### Fixed
 
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -37,6 +37,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Sarat Vemulapalli | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon      |
 | Shweta Thareja    | [shwetathareja](https://github.com/shwetathareja)       | Amazon      |
 | Sorabh Hamirwasia | [sohami](https://github.com/sohami)                     | Amazon      |
+| Varun Bharadwaj   | [varunbharadwaj](https://github.com/varunbharadwaj)     | Uber        |
 | Yupeng Fu         | [yupeng9](https://github.com/yupeng9)                   | Uber        |
 
 ## Emeritus
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/170_cardinality_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/170_cardinality_metric.yml
@@ -268,7 +268,7 @@ setup:
 ---
 "profiler string":
   - skip:
-      version: " - 3.2.99"
+      version: " - 3.3.99"
       reason:  hybrid collector added in 3.3.0
   - do:
       search:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/170_cardinality_metric_unsigned.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/170_cardinality_metric_unsigned.yml
@@ -266,7 +266,7 @@ setup:
 ---
 "profiler string":
   - skip:
-      version: " - 3.2.99"
+      version: " - 3.3.99"
       reason:  hybrid collector added in 3.3.0
   - do:
       search:
diff --git a/server/src/main/java/org/opensearch/index/engine/Engine.java b/server/src/main/java/org/opensearch/index/engine/Engine.java
@@ -79,11 +79,14 @@
 import org.opensearch.core.common.unit.ByteSizeValue;
 import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.index.VersionType;
+import org.opensearch.index.mapper.DocumentMapperForType;
 import org.opensearch.index.mapper.IdFieldMapper;
 import org.opensearch.index.mapper.Mapping;
 import org.opensearch.index.mapper.ParseContext.Document;
 import org.opensearch.index.mapper.ParsedDocument;
 import org.opensearch.index.mapper.SeqNoFieldMapper;
+import org.opensearch.index.mapper.SourceToParse;
+import org.opensearch.index.mapper.Uid;
 import org.opensearch.index.merge.MergeStats;
 import org.opensearch.index.seqno.SeqNoStats;
 import org.opensearch.index.seqno.SequenceNumbers;
@@ -1594,6 +1597,85 @@ public long startTime() {
         public abstract TYPE operationType();
     }
 
+    /**
+     * Prepares an index operation by parsing the source document and creating an Engine.Index operation.
+     *
+     * @param docMapper the document mapper instance
+     * @param source the source to parse
+     * @param seqNo the sequence number
+     * @param primaryTerm the primary term
+     * @param version the version
+     * @param versionType the version type
+     * @param origin the operation origin
+     * @param autoGeneratedIdTimestamp the timestamp for auto-generated IDs
+     * @param isRetry whether this is a retry
+     * @param ifSeqNo the ifSeqNo
+     * @param ifPrimaryTerm the ifPrimaryTerm
+     * @return the prepared index operation
+     */
+    public Engine.Index prepareIndex(
+        DocumentMapperForType docMapper,
+        SourceToParse source,
+        long seqNo,
+        long primaryTerm,
+        long version,
+        VersionType versionType,
+        Engine.Operation.Origin origin,
+        long autoGeneratedIdTimestamp,
+        boolean isRetry,
+        long ifSeqNo,
+        long ifPrimaryTerm
+    ) {
+        long startTime = System.nanoTime();
+        ParsedDocument doc = docMapper.getDocumentMapper().parse(source);
+        if (docMapper.getMapping() != null) {
+            doc.addDynamicMappingsUpdate(docMapper.getMapping());
+        }
+        Term uid = new Term(IdFieldMapper.NAME, Uid.encodeId(doc.id()));
+        return new Engine.Index(
+            uid,
+            doc,
+            seqNo,
+            primaryTerm,
+            version,
+            versionType,
+            origin,
+            startTime,
+            autoGeneratedIdTimestamp,
+            isRetry,
+            ifSeqNo,
+            ifPrimaryTerm
+        );
+    }
+
+    /**
+     * Prepares a delete operation by creating an Engine.Delete operation.
+     *
+     * @param id the document id
+     * @param seqNo the sequence number
+     * @param primaryTerm the primary term
+     * @param version the version
+     * @param versionType the version type
+     * @param origin the operation origin
+     * @param ifSeqNo the ifSeqNo
+     * @param ifPrimaryTerm the ifPrimaryTerm
+     * @return the prepared delete operation
+     */
+    public Engine.Delete prepareDelete(
+        String id,
+        long seqNo,
+        long primaryTerm,
+        long version,
+        VersionType versionType,
+        Engine.Operation.Origin origin,
+        long ifSeqNo,
+        long ifPrimaryTerm
+    ) {
+        long startTime = System.nanoTime();
+        final Term uid = new Term(IdFieldMapper.NAME, Uid.encodeId(id));
+        return new Engine.Delete(id, uid, seqNo, primaryTerm, version, versionType, origin, startTime, ifSeqNo, ifPrimaryTerm);
+    }
+
     /**
      * Index operation
      *
diff --git a/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java
@@ -405,8 +405,8 @@ public Query rangeQuery(
                         query,
                         new ApproximatePointRangeQuery(
                             field,
-                            NumberType.HALF_FLOAT.encodePoint(l),
-                            NumberType.HALF_FLOAT.encodePoint(u),
+                            HalfFloatPoint.pack(l).bytes,
+                            HalfFloatPoint.pack(u).bytes,
                             APPROX_QUERY_NUMERIC_DIMS,
                             ApproximatePointRangeQuery.HALF_FLOAT_FORMAT
                         )
@@ -604,8 +604,8 @@ public Query rangeQuery(
                         query,
                         new ApproximatePointRangeQuery(
                             field,
-                            FloatPoint.pack(new float[] { l }).bytes,
-                            FloatPoint.pack(new float[] { u }).bytes,
+                            FloatPoint.pack(l).bytes,
+                            FloatPoint.pack(u).bytes,
                             APPROX_QUERY_NUMERIC_DIMS,
                             ApproximatePointRangeQuery.FLOAT_FORMAT
                         )
@@ -778,8 +778,8 @@ public Query rangeQuery(
                             query,
                             new ApproximatePointRangeQuery(
                                 field,
-                                DoublePoint.pack(new double[] { l }).bytes,
-                                DoublePoint.pack(new double[] { u }).bytes,
+                                DoublePoint.pack(l).bytes,
+                                DoublePoint.pack(u).bytes,
                                 APPROX_QUERY_NUMERIC_DIMS,
                                 ApproximatePointRangeQuery.DOUBLE_FORMAT
                             )
@@ -1228,8 +1228,8 @@ public Query rangeQuery(
                         query,
                         new ApproximatePointRangeQuery(
                             field,
-                            IntPoint.pack(new int[] { l }).bytes,
-                            IntPoint.pack(new int[] { u }).bytes,
+                            IntPoint.pack(l).bytes,
+                            IntPoint.pack(u).bytes,
                             APPROX_QUERY_NUMERIC_DIMS,
                             ApproximatePointRangeQuery.INT_FORMAT
                         )
@@ -1396,8 +1396,8 @@ public Query rangeQuery(
                             query,
                             new ApproximatePointRangeQuery(
                                 field,
-                                LongPoint.pack(new long[] { l }).bytes,
-                                LongPoint.pack(new long[] { u }).bytes,
+                                LongPoint.pack(l).bytes,
+                                LongPoint.pack(u).bytes,
                                 APPROX_QUERY_NUMERIC_DIMS,
                                 ApproximatePointRangeQuery.LONG_FORMAT
                             )
@@ -1555,8 +1555,8 @@ public Query rangeQuery(
                             query,
                             new ApproximatePointRangeQuery(
                                 field,
-                                NumberType.UNSIGNED_LONG.encodePoint(l),
-                                NumberType.UNSIGNED_LONG.encodePoint(u),
+                                BigIntegerPoint.pack(l).bytes,
+                                BigIntegerPoint.pack(u).bytes,
                                 APPROX_QUERY_NUMERIC_DIMS,
                                 ApproximatePointRangeQuery.UNSIGNED_LONG_FORMAT
                             )
diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -1199,7 +1199,7 @@ private Engine.IndexResult applyIndexOperation(
         ensureWriteAllowed(origin);
         Engine.Index operation;
         try {
-            operation = prepareIndex(
+            operation = engine.prepareIndex(
                 docMapper(),
                 sourceToParse,
                 seqNo,
@@ -1228,6 +1228,12 @@ private Engine.IndexResult applyIndexOperation(
         return index(engine, operation);
     }
 
+    /**
+     * Prepares an index operation by parsing the source document and creating an Engine.Index operation.
+     *
+     * @deprecated This static method has been moved to {@link Engine#prepareIndex} as an instance method.
+     */
+    @Deprecated(since = "3.4.0", forRemoval = true)
     public static Engine.Index prepareIndex(
         DocumentMapperForType docMapper,
         SourceToParse source,
@@ -1418,10 +1424,16 @@ private Engine.DeleteResult applyDeleteOperation(
             + getOperationPrimaryTerm()
             + "]";
         ensureWriteAllowed(origin);
-        final Engine.Delete delete = prepareDelete(id, seqNo, opPrimaryTerm, version, versionType, origin, ifSeqNo, ifPrimaryTerm);
+        final Engine.Delete delete = engine.prepareDelete(id, seqNo, opPrimaryTerm, version, versionType, origin, ifSeqNo, ifPrimaryTerm);
         return delete(engine, delete);
     }
 
+    /**
+     * Prepares a delete operation by creating an Engine.Delete operation.
+     *
+     * @deprecated This static method has been moved to {@link Engine#prepareDelete} as an instance method.
+     */
+    @Deprecated(since = "3.4.0", forRemoval = true)
     public static Engine.Delete prepareDelete(
         String id,
         long seqNo,
diff --git a/test/framework/src/main/java/org/opensearch/index/engine/TranslogHandler.java b/test/framework/src/main/java/org/opensearch/index/engine/TranslogHandler.java
@@ -47,7 +47,6 @@
 import org.opensearch.index.mapper.RootObjectMapper;
 import org.opensearch.index.mapper.SourceToParse;
 import org.opensearch.index.seqno.SequenceNumbers;
-import org.opensearch.index.shard.IndexShard;
 import org.opensearch.index.similarity.SimilarityService;
 import org.opensearch.index.translog.Translog;
 import org.opensearch.index.translog.TranslogRecoveryRunner;
@@ -135,7 +134,7 @@ public Engine.Operation convertToEngineOp(Translog.Operation operation, Engine.O
             case INDEX:
                 final Translog.Index index = (Translog.Index) operation;
                 final String indexName = mapperService.index().getName();
-                final Engine.Index engineIndex = IndexShard.prepareIndex(
+                final Engine.Index engineIndex = engine.prepareIndex(
                     docMapper(MapperService.SINGLE_MAPPING_NAME),
                     new SourceToParse(
                         indexName,
@@ -157,7 +156,7 @@ public Engine.Operation convertToEngineOp(Translog.Operation operation, Engine.O
                 return engineIndex;
             case DELETE:
                 final Translog.Delete delete = (Translog.Delete) operation;
-                return IndexShard.prepareDelete(
+                return engine.prepareDelete(
                     delete.id(),
                     delete.seqNo(),
                     delete.primaryTerm(),
