From 164a85e459d52038cd2067a113d236721227e52c Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Fri, 20 Jun 2025 01:31:08 -0700
Subject: [PATCH 01/74] temorary solve

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .idea/runConfigurations/Debug_OpenSearch.xml    |  6 +++++-
 .../search/270_wildcard_fieldtype_queries.yml   | 17 +++++++++++++++++
 .../index/mapper/WildcardFieldMapper.java       |  2 ++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.idea/runConfigurations/Debug_OpenSearch.xml b/.idea/runConfigurations/Debug_OpenSearch.xml
index 0d8bf59823acf..c18046f873477 100644
--- a/.idea/runConfigurations/Debug_OpenSearch.xml
+++ b/.idea/runConfigurations/Debug_OpenSearch.xml
@@ -6,6 +6,10 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5005" />
     <option name="AUTO_RESTART" value="true" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="5005" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
index a85399feefd25..e156f270292f7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
@@ -393,3 +393,20 @@ setup:
             terms: { my_field: [ "\\*" ] }
   - match: { hits.total.value: 1 }
   - match: { hits.hits.0._id: "9" }
+
+---
+"sort on doc value enabled wildcard":
+  - do:
+      search:
+        index: test
+        body:
+          query:
+            wildcard:
+              my_field:
+                value: "*"
+          sort:
+            - my_field.doc_values:
+                order: asc
+          size: 4
+  - match: { hits.total.value: 4 }
+  - match: { hits.hits.0._id: "8" }
\ No newline at end of file
diff --git a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
index 21179122c0b5e..9d6c1bfd6f7c6 100644
--- a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
@@ -13,6 +13,7 @@
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.SortedSetDocValuesField;
+import org.apache.lucene.document.StringField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.Term;
@@ -219,6 +220,7 @@ protected void parseCreateField(ParseContext context) throws IOException {
         Tokenizer tokenizer = new WildcardFieldTokenizer();
         tokenizer.setReader(new StringReader(value));
         context.doc().add(new Field(fieldType().name(), tokenizer, FIELD_TYPE));
+        context.doc().add(new StringField(fieldType().name(), value, null));
         if (fieldType().hasDocValues()) {
             context.doc().add(new SortedSetDocValuesField(fieldType().name(), binaryValue));
         } else {

From 182555922d738a2654d4525a0c06582508b0154c Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 25 Jun 2025 17:22:01 -0700
Subject: [PATCH 02/74] spotless

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .idea/runConfigurations/Debug_OpenSearch.xml                | 6 +-----
 .../test/search/270_wildcard_fieldtype_queries.yml          | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.idea/runConfigurations/Debug_OpenSearch.xml b/.idea/runConfigurations/Debug_OpenSearch.xml
index c18046f873477..0d8bf59823acf 100644
--- a/.idea/runConfigurations/Debug_OpenSearch.xml
+++ b/.idea/runConfigurations/Debug_OpenSearch.xml
@@ -6,10 +6,6 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5005" />
     <option name="AUTO_RESTART" value="true" />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="5005" />
-      <option name="LOCAL" value="false" />
-    </RunnerSettings>
     <method v="2" />
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
index e156f270292f7..ac51220e3c595 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
@@ -409,4 +409,4 @@ setup:
                 order: asc
           size: 4
   - match: { hits.total.value: 4 }
-  - match: { hits.hits.0._id: "8" }
\ No newline at end of file
+  - match: { hits.hits.0._id: "8" }

From 1741b80f3f056b3d073343f276df56f25130df95 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 17 Jul 2025 10:20:12 -0700
Subject: [PATCH 03/74] still have to change derived field generator

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../test/search/270_wildcard_fieldtype_queries.yml       | 2 +-
 .../org/opensearch/index/mapper/WildcardFieldMapper.java | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
index ac51220e3c595..3105a9ced61da 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
@@ -408,5 +408,5 @@ setup:
             - my_field.doc_values:
                 order: asc
           size: 4
-  - match: { hits.total.value: 4 }
+  - match: { hits.total.value: 8 }
   - match: { hits.hits.0._id: "8" }
diff --git a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
index 9d6c1bfd6f7c6..646644892cfe2 100644
--- a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
@@ -10,10 +10,12 @@
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.document.StringField;
+import org.apache.lucene.index.BinaryDocValues;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.Term;
@@ -48,6 +50,7 @@
 import org.opensearch.index.analysis.IndexAnalyzers;
 import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.plain.BinaryIndexFieldData;
 import org.opensearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.DocValueFormat;
@@ -220,9 +223,9 @@ protected void parseCreateField(ParseContext context) throws IOException {
         Tokenizer tokenizer = new WildcardFieldTokenizer();
         tokenizer.setReader(new StringReader(value));
         context.doc().add(new Field(fieldType().name(), tokenizer, FIELD_TYPE));
-        context.doc().add(new StringField(fieldType().name(), value, null));
+        //context.doc().add(new StringField(fieldType().name(), value, null));
         if (fieldType().hasDocValues()) {
-            context.doc().add(new SortedSetDocValuesField(fieldType().name(), binaryValue));
+            context.doc().add(new BinaryDocValuesField(fieldType().name(), binaryValue));
         } else {
             if (fieldType().hasDocValues() == false) {
                 createFieldNamesField(context);
@@ -368,7 +371,7 @@ NamedAnalyzer normalizer() {
         @Override
         public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
             failIfNoDocValues();
-            return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
+            return new BinaryIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
         }
 
         @Override

From 90f73e21c63432c70ff1efaf7275dfbf194bb941 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 17 Jul 2025 11:10:00 -0700
Subject: [PATCH 04/74] spotless apply

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../org/opensearch/index/mapper/WildcardFieldMapper.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
index 646644892cfe2..bf0071adc97bf 100644
--- a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
@@ -13,9 +13,6 @@
 import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.SortedSetDocValuesField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.BinaryDocValues;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.Term;
@@ -51,7 +48,6 @@
 import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.plain.BinaryIndexFieldData;
-import org.opensearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.DocValueFormat;
 import org.opensearch.search.aggregations.support.CoreValuesSourceType;
@@ -223,7 +219,7 @@ protected void parseCreateField(ParseContext context) throws IOException {
         Tokenizer tokenizer = new WildcardFieldTokenizer();
         tokenizer.setReader(new StringReader(value));
         context.doc().add(new Field(fieldType().name(), tokenizer, FIELD_TYPE));
-        //context.doc().add(new StringField(fieldType().name(), value, null));
+        // context.doc().add(new StringField(fieldType().name(), value, null));
         if (fieldType().hasDocValues()) {
             context.doc().add(new BinaryDocValuesField(fieldType().name(), binaryValue));
         } else {

From ffda2626d97db946c9de4b3b43731bf4aefe2418 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 17 Jul 2025 21:12:00 -0700
Subject: [PATCH 05/74] added binary doc values fetcher

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../index/mapper/BinaryDocValuesFetcher.java  | 39 +++++++++++++++++++
 .../index/mapper/WildcardFieldMapper.java     |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java

diff --git a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
new file mode 100644
index 0000000000000..ec9bb72f12880
--- /dev/null
+++ b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.index.mapper;
+
+import org.apache.lucene.index.BinaryDocValues;
+import org.apache.lucene.index.LeafReader;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BinaryDocValuesFetcher extends FieldValueFetcher {
+
+    public BinaryDocValuesFetcher(MappedFieldType mappedFieldType, String simpleName) {
+        super(simpleName);
+        this.mappedFieldType = mappedFieldType;
+    }
+
+    @Override
+    public List<Object> fetch(LeafReader reader, int docId) throws IOException {
+        List<Object> values = new ArrayList<>();
+        try {
+            final BinaryDocValues binaryDocValues = reader.getBinaryDocValues(mappedFieldType.name());
+            if (binaryDocValues == null || !binaryDocValues.advanceExact(docId)) {
+                return values;
+            }
+            values.add(binaryDocValues.binaryValue());
+        } catch (IOException e) {
+            throw new IOException("Failed to read doc values for document " + docId + " in field " + mappedFieldType.name(), e);
+        }
+        return values;
+    }
+}
diff --git a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
index bf0071adc97bf..0dd93d25a90f2 100644
--- a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
@@ -930,7 +930,7 @@ protected void canDeriveSourceInternal() {
      */
     @Override
     protected DerivedFieldGenerator derivedFieldGenerator() {
-        return new DerivedFieldGenerator(mappedFieldType, new SortedSetDocValuesFetcher(mappedFieldType, simpleName()) {
+        return new DerivedFieldGenerator(mappedFieldType, new BinaryDocValuesFetcher(mappedFieldType, simpleName()) {
             @Override
             public Object convert(Object value) {
                 if (value == null) {

From 723ab8f71fc9da0f860c0ffe83d055e8305b7186 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 17 Jul 2025 23:11:05 -0700
Subject: [PATCH 06/74] supported field types

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../opensearch/index/mapper/BinaryDocValuesFetcher.java  | 5 +++++
 .../index/mapper/WildcardFieldMapperTests.java           | 9 +++++----
 .../search/aggregations/AggregatorTestCase.java          | 3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
index ec9bb72f12880..6b9662d4469f8 100644
--- a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
+++ b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
@@ -15,6 +15,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * FieldValueFetcher for binary doc values
+ *
+ * @opensearch.internal
+ */
 public class BinaryDocValuesFetcher extends FieldValueFetcher {
 
     public BinaryDocValuesFetcher(MappedFieldType mappedFieldType, String simpleName) {
diff --git a/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
index d50cd380cd824..2a3c23e86d031 100644
--- a/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
@@ -14,6 +14,7 @@
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.SortedSetDocValuesField;
@@ -126,7 +127,7 @@ public void testEnableDocValues() throws IOException {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         assertEquals(DocValuesType.NONE, fields[0].fieldType().docValuesType());
-        assertEquals(DocValuesType.SORTED_SET, fields[1].fieldType().docValuesType());
+        assertEquals(DocValuesType.BINARY, fields[1].fieldType().docValuesType());
 
         mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "wildcard")));
         doc = mapper.parse(source(b -> b.field("field", "1234")));
@@ -214,7 +215,7 @@ public void testNormalizer() throws IOException {
         assertEquals(new BytesRef("abc"), fields[1].binaryValue());
         fieldType = fields[1].fieldType();
         assertEquals(IndexOptions.NONE, fieldType.indexOptions());
-        assertEquals(DocValuesType.SORTED_SET, fieldType.docValuesType());
+        assertEquals(DocValuesType.BINARY, fieldType.docValuesType());
     }
 
     public void testNullValue() throws IOException {
@@ -251,7 +252,7 @@ public void testNullValue() throws IOException {
         );
         assertEquals(new BytesRef("uri"), fields[1].binaryValue());
         assertEquals(IndexOptions.NONE, fields[1].fieldType().indexOptions());
-        assertEquals(DocValuesType.SORTED_SET, fields[1].fieldType().docValuesType());
+        assertEquals(DocValuesType.BINARY, fields[1].fieldType().docValuesType());
     }
 
     public void testDefaults() throws Exception {
@@ -386,7 +387,7 @@ private Document createDocument(WildcardFieldMapper mapper, String value) throws
         NamedAnalyzer normalizer = mapper.fieldType().normalizer();
         value = normalizeValue(normalizer, FIELD_NAME, value);
         final BytesRef binaryValue = new BytesRef(value);
-        doc.add(new SortedSetDocValuesField(FIELD_NAME, binaryValue));
+        doc.add(new BinaryDocValuesField(FIELD_NAME, binaryValue));
         return doc;
     }
 }
diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
index fc92065391fd4..cf4f2a3b1369b 100644
--- a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
@@ -123,6 +123,7 @@
 import org.opensearch.index.mapper.SemanticVersionFieldMapper;
 import org.opensearch.index.mapper.StarTreeMapper;
 import org.opensearch.index.mapper.TextFieldMapper;
+import org.opensearch.index.mapper.WildcardFieldMapper;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.index.shard.IndexShard;
@@ -1128,7 +1129,7 @@ private void writeTestDoc(MappedFieldType fieldType, String fieldName, RandomInd
             doc.add(new SortedNumericDocValuesField(fieldName, v));
 
         } else if (vst.equals(CoreValuesSourceType.BYTES)) {
-            if (typeName.equals(BinaryFieldMapper.CONTENT_TYPE)) {
+            if (typeName.equals(BinaryFieldMapper.CONTENT_TYPE) || typeName.equals(WildcardFieldMapper.CONTENT_TYPE)) {
                 doc.add(new BinaryFieldMapper.CustomBinaryDocValuesField(fieldName, new BytesRef("a").bytes));
                 json = "{ \"" + fieldName + "\" : \"a\" }";
             } else {

From b54c85ea5e954cd516dd2cc79dc979bac3b70184 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Fri, 18 Jul 2025 09:44:14 -0700
Subject: [PATCH 07/74] spotlessapply

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../org/opensearch/index/mapper/WildcardFieldMapperTests.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
index 2a3c23e86d031..08b7633eb615d 100644
--- a/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
@@ -17,7 +17,6 @@
 import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexOptions;

From 447c45d3c8e1b7b2545a9b6710b1d93842782ed3 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Fri, 18 Jul 2025 21:36:46 -0700
Subject: [PATCH 08/74] small change

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../org/opensearch/index/mapper/BinaryDocValuesFetcher.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
index 6b9662d4469f8..9a1d33f4a19e7 100644
--- a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
+++ b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
@@ -16,7 +16,7 @@
 import java.util.List;
 
 /**
- * FieldValueFetcher for binary doc values
+ * FieldValueFetcher used for binary doc values
  *
  * @opensearch.internal
  */

From a8a9e847d5c635b5b8d80293a3351de571960975 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Fri, 18 Jul 2025 21:40:21 -0700
Subject: [PATCH 09/74] disable skipping optimization by changing doc values to
 binary docs

Co-authored-by: HUSTERGS <songge.huster@gmail.com>
Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../org/opensearch/index/mapper/BinaryDocValuesFetcher.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
index 9a1d33f4a19e7..6b9662d4469f8 100644
--- a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
+++ b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
@@ -16,7 +16,7 @@
 import java.util.List;
 
 /**
- * FieldValueFetcher used for binary doc values
+ * FieldValueFetcher for binary doc values
  *
  * @opensearch.internal
  */

From 3b5a2fedf265d45cded00fd2a5745feeca80cae7 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Mon, 28 Jul 2025 13:11:42 -0700
Subject: [PATCH 10/74] skip sorting wildcard tests for before 3.2.0

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../test/search/270_wildcard_fieldtype_queries.yml             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
index 3105a9ced61da..baf4cb3a26a4c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
@@ -396,6 +396,9 @@ setup:
 
 ---
 "sort on doc value enabled wildcard":
+  - skip:
+      version: " - 3.1.99"
+      reason: "sorting on doc value enabled wildcard has bug before 3.2.0"
   - do:
       search:
         index: test

From b7313ccc89555a83fd5b11ea67d5f8d1bcb0a653 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Mon, 28 Jul 2025 14:58:05 -0700
Subject: [PATCH 11/74] skip running wildcard searches with older versions

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../rest-api-spec/test/upgraded_cluster/40_wildcard.yml        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
index 29518931a5b8b..b4dcec57f24fb 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
@@ -1,6 +1,9 @@
 # refactored from rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
 ---
 "search after upgrade":
+  - skip:
+      version: " - 3.1.99"
+      reason: "after 3.2.0 doc_values no longer use SORTED_SET"
   # "term query matches exact value"
   - do:
       search:

From 5e416a9fc702e85b9a76fe3fa81d28e5cb3dc648 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Mon, 28 Jul 2025 17:26:34 -0700
Subject: [PATCH 12/74] skip running wildcard searches with older versions

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../rest-api-spec/test/upgraded_cluster/40_wildcard.yml        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
index b4dcec57f24fb..7d023ba42bd1d 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
@@ -15,6 +15,9 @@
   - match: { hits.total.value: 1 }
   - match: { hits.hits.0._id: "5" }
 
+  - skip:
+      version: " - 3.1.99"
+      reason: "after 3.2.0 doc_values no longer use SORTED_SET"
   - do:
       search:
         index: test

From 8b5181f23e08b05a7c100c9e00808ad653123a71 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Mon, 28 Jul 2025 18:05:06 -0700
Subject: [PATCH 13/74] skip running wildcard searches with older versions

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../rest-api-spec/test/upgraded_cluster/40_wildcard.yml        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
index 7d023ba42bd1d..b4dcec57f24fb 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
@@ -15,9 +15,6 @@
   - match: { hits.total.value: 1 }
   - match: { hits.hits.0._id: "5" }
 
-  - skip:
-      version: " - 3.1.99"
-      reason: "after 3.2.0 doc_values no longer use SORTED_SET"
   - do:
       search:
         index: test

From 9084f00237d52e1b71313025dcc5ce693fd27622 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 30 Jul 2025 16:33:47 -0700
Subject: [PATCH 14/74] original wildcard taml test

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../rest-api-spec/test/upgraded_cluster/40_wildcard.yml        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
index b4dcec57f24fb..29518931a5b8b 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
@@ -1,9 +1,6 @@
 # refactored from rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
 ---
 "search after upgrade":
-  - skip:
-      version: " - 3.1.99"
-      reason: "after 3.2.0 doc_values no longer use SORTED_SET"
   # "term query matches exact value"
   - do:
       search:

From 9de80c356d96e63e8bfeee9c1b81e05a1100664a Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 30 Jul 2025 16:54:59 -0700
Subject: [PATCH 15/74] parse field for correct version

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../org/opensearch/index/mapper/WildcardFieldMapper.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
index 0dd93d25a90f2..0834b07a536c1 100644
--- a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
@@ -13,6 +13,7 @@
 import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.Term;
@@ -39,6 +40,7 @@
 import org.apache.lucene.util.automaton.CompiledAutomaton;
 import org.apache.lucene.util.automaton.Operations;
 import org.apache.lucene.util.automaton.RegExp;
+import org.opensearch.Version;
 import org.opensearch.common.lucene.BytesRefs;
 import org.opensearch.common.lucene.Lucene;
 import org.opensearch.common.lucene.search.AutomatonQueries;
@@ -219,9 +221,12 @@ protected void parseCreateField(ParseContext context) throws IOException {
         Tokenizer tokenizer = new WildcardFieldTokenizer();
         tokenizer.setReader(new StringReader(value));
         context.doc().add(new Field(fieldType().name(), tokenizer, FIELD_TYPE));
-        // context.doc().add(new StringField(fieldType().name(), value, null));
         if (fieldType().hasDocValues()) {
-            context.doc().add(new BinaryDocValuesField(fieldType().name(), binaryValue));
+            if (context.indexSettings().getIndexVersionCreated().onOrAfter(Version.V_3_2_0)) {
+                context.doc().add(new BinaryDocValuesField(fieldType().name(), binaryValue));
+            } else {
+                context.doc().add(new SortedSetDocValuesField(fieldType().name(), binaryValue));
+            }
         } else {
             if (fieldType().hasDocValues() == false) {
                 createFieldNamesField(context);

From 2a411a519b90c74c459c3a3ef3365cb1346535a5 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 30 Jul 2025 19:14:55 -0700
Subject: [PATCH 16/74] check correct version

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../index/mapper/WildcardFieldMapper.java     | 57 +++++++++++++------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
index 0834b07a536c1..2beb3f4053d61 100644
--- a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
@@ -50,6 +50,7 @@
 import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.plain.BinaryIndexFieldData;
+import org.opensearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.DocValueFormat;
 import org.opensearch.search.aggregations.support.CoreValuesSourceType;
@@ -85,6 +86,7 @@ public class WildcardFieldMapper extends ParametrizedFieldMapper {
     private final String normalizerName;
     private final boolean hasDocValues;
     private final IndexAnalyzers indexAnalyzers;
+    private static Version version;
 
     /**
      * The builder for the field mapper.
@@ -221,8 +223,9 @@ protected void parseCreateField(ParseContext context) throws IOException {
         Tokenizer tokenizer = new WildcardFieldTokenizer();
         tokenizer.setReader(new StringReader(value));
         context.doc().add(new Field(fieldType().name(), tokenizer, FIELD_TYPE));
+        this.version = context.indexSettings().getIndexVersionCreated();
         if (fieldType().hasDocValues()) {
-            if (context.indexSettings().getIndexVersionCreated().onOrAfter(Version.V_3_2_0)) {
+            if (version.onOrAfter(Version.V_3_2_0)) {
                 context.doc().add(new BinaryDocValuesField(fieldType().name(), binaryValue));
             } else {
                 context.doc().add(new SortedSetDocValuesField(fieldType().name(), binaryValue));
@@ -372,7 +375,11 @@ NamedAnalyzer normalizer() {
         @Override
         public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
             failIfNoDocValues();
-            return new BinaryIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
+            if (version.onOrAfter(Version.V_3_2_0)) {
+                return new BinaryIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
+            } else {
+                return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
+            }
         }
 
         @Override
@@ -935,20 +942,38 @@ protected void canDeriveSourceInternal() {
      */
     @Override
     protected DerivedFieldGenerator derivedFieldGenerator() {
-        return new DerivedFieldGenerator(mappedFieldType, new BinaryDocValuesFetcher(mappedFieldType, simpleName()) {
-            @Override
-            public Object convert(Object value) {
-                if (value == null) {
-                    return null;
+        if (version.onOrAfter(Version.V_3_2_0)) {
+            return new DerivedFieldGenerator(mappedFieldType, new BinaryDocValuesFetcher(mappedFieldType, simpleName()) {
+                @Override
+                public Object convert(Object value) {
+                    if (value == null) {
+                        return null;
+                    }
+                    BytesRef binaryValue = (BytesRef) value;
+                    return binaryValue.utf8ToString();
                 }
-                BytesRef binaryValue = (BytesRef) value;
-                return binaryValue.utf8ToString();
-            }
-        }, null) {
-            @Override
-            public FieldValueType getDerivedFieldPreference() {
-                return FieldValueType.DOC_VALUES;
-            }
-        };
+            }, null) {
+                @Override
+                public FieldValueType getDerivedFieldPreference() {
+                    return FieldValueType.DOC_VALUES;
+                }
+            };
+        } else {
+            return new DerivedFieldGenerator(mappedFieldType, new SortedSetDocValuesFetcher(mappedFieldType, simpleName()) {
+                @Override
+                public Object convert(Object value) {
+                    if (value == null) {
+                        return null;
+                    }
+                    BytesRef binaryValue = (BytesRef) value;
+                    return binaryValue.utf8ToString();
+                }
+            }, null) {
+                @Override
+                public FieldValueType getDerivedFieldPreference() {
+                    return FieldValueType.DOC_VALUES;
+                }
+            };
+        }
     }
 }

From 69fad280feaaf8d98d23174972c9ba01fca71180 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 31 Jul 2025 08:23:36 -0700
Subject: [PATCH 17/74] test skipping

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../rest-api-spec/test/upgraded_cluster/40_wildcard.yml        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
index 29518931a5b8b..2f0c0e6293e4f 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
@@ -1,6 +1,9 @@
 # refactored from rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
 ---
 "search after upgrade":
+  - skip:
+    version:     " - 3.3.0"
+    reason:      SORTED_SET is no longer supported after 3.2.0
   # "term query matches exact value"
   - do:
       search:

From 2c876bfed54234468086f7f8299a51a86fd51d04 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 31 Jul 2025 08:53:59 -0700
Subject: [PATCH 18/74] update wildcard mapper

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../index/mapper/WildcardFieldMapper.java     | 58 +++++--------------
 1 file changed, 16 insertions(+), 42 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
index 2beb3f4053d61..cba257f6c80e7 100644
--- a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
@@ -225,11 +225,7 @@ protected void parseCreateField(ParseContext context) throws IOException {
         context.doc().add(new Field(fieldType().name(), tokenizer, FIELD_TYPE));
         this.version = context.indexSettings().getIndexVersionCreated();
         if (fieldType().hasDocValues()) {
-            if (version.onOrAfter(Version.V_3_2_0)) {
-                context.doc().add(new BinaryDocValuesField(fieldType().name(), binaryValue));
-            } else {
-                context.doc().add(new SortedSetDocValuesField(fieldType().name(), binaryValue));
-            }
+            context.doc().add(new BinaryDocValuesField(fieldType().name(), binaryValue));
         } else {
             if (fieldType().hasDocValues() == false) {
                 createFieldNamesField(context);
@@ -375,11 +371,7 @@ NamedAnalyzer normalizer() {
         @Override
         public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
             failIfNoDocValues();
-            if (version.onOrAfter(Version.V_3_2_0)) {
-                return new BinaryIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
-            } else {
-                return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
-            }
+            return new BinaryIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
         }
 
         @Override
@@ -942,38 +934,20 @@ protected void canDeriveSourceInternal() {
      */
     @Override
     protected DerivedFieldGenerator derivedFieldGenerator() {
-        if (version.onOrAfter(Version.V_3_2_0)) {
-            return new DerivedFieldGenerator(mappedFieldType, new BinaryDocValuesFetcher(mappedFieldType, simpleName()) {
-                @Override
-                public Object convert(Object value) {
-                    if (value == null) {
-                        return null;
-                    }
-                    BytesRef binaryValue = (BytesRef) value;
-                    return binaryValue.utf8ToString();
-                }
-            }, null) {
-                @Override
-                public FieldValueType getDerivedFieldPreference() {
-                    return FieldValueType.DOC_VALUES;
+        return new DerivedFieldGenerator(mappedFieldType, new BinaryDocValuesFetcher(mappedFieldType, simpleName()) {
+            @Override
+            public Object convert(Object value) {
+                if (value == null) {
+                    return null;
                 }
-            };
-        } else {
-            return new DerivedFieldGenerator(mappedFieldType, new SortedSetDocValuesFetcher(mappedFieldType, simpleName()) {
-                @Override
-                public Object convert(Object value) {
-                    if (value == null) {
-                        return null;
-                    }
-                    BytesRef binaryValue = (BytesRef) value;
-                    return binaryValue.utf8ToString();
-                }
-            }, null) {
-                @Override
-                public FieldValueType getDerivedFieldPreference() {
-                    return FieldValueType.DOC_VALUES;
-                }
-            };
-        }
+                BytesRef binaryValue = (BytesRef) value;
+                return binaryValue.utf8ToString();
+            }
+        }, null) {
+            @Override
+            public FieldValueType getDerivedFieldPreference() {
+                return FieldValueType.DOC_VALUES;
+            }
+        };
     }
 }

From 4b22303b1470b44bc705691bcfbfbee8a2b7a294 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 31 Jul 2025 08:55:19 -0700
Subject: [PATCH 19/74] update wildcard mapper

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../org/opensearch/index/mapper/WildcardFieldMapper.java     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
index cba257f6c80e7..c1c7f2a655fc3 100644
--- a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
@@ -13,7 +13,6 @@
 import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.Term;
@@ -40,7 +39,6 @@
 import org.apache.lucene.util.automaton.CompiledAutomaton;
 import org.apache.lucene.util.automaton.Operations;
 import org.apache.lucene.util.automaton.RegExp;
-import org.opensearch.Version;
 import org.opensearch.common.lucene.BytesRefs;
 import org.opensearch.common.lucene.Lucene;
 import org.opensearch.common.lucene.search.AutomatonQueries;
@@ -50,7 +48,6 @@
 import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.plain.BinaryIndexFieldData;
-import org.opensearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.DocValueFormat;
 import org.opensearch.search.aggregations.support.CoreValuesSourceType;
@@ -86,7 +83,6 @@ public class WildcardFieldMapper extends ParametrizedFieldMapper {
     private final String normalizerName;
     private final boolean hasDocValues;
     private final IndexAnalyzers indexAnalyzers;
-    private static Version version;
 
     /**
      * The builder for the field mapper.
@@ -223,7 +219,6 @@ protected void parseCreateField(ParseContext context) throws IOException {
         Tokenizer tokenizer = new WildcardFieldTokenizer();
         tokenizer.setReader(new StringReader(value));
         context.doc().add(new Field(fieldType().name(), tokenizer, FIELD_TYPE));
-        this.version = context.indexSettings().getIndexVersionCreated();
         if (fieldType().hasDocValues()) {
             context.doc().add(new BinaryDocValuesField(fieldType().name(), binaryValue));
         } else {

From 9ddc6e443996ee2387a959275e9099a9931a4566 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 31 Jul 2025 10:33:19 -0700
Subject: [PATCH 20/74] update wildcard mapper

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../rest-api-spec/test/upgraded_cluster/40_wildcard.yml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
index 2f0c0e6293e4f..f8518fccc2f69 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
@@ -2,8 +2,8 @@
 ---
 "search after upgrade":
   - skip:
-    version:     " - 3.3.0"
-    reason:      SORTED_SET is no longer supported after 3.2.0
+      version:     " - 3.3.0"
+      reason:      SORTED_SET is no longer supported after 3.2.0
   # "term query matches exact value"
   - do:
       search:

From 19ae6c2622ee04f8f998c5d491a81604366f777d Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 31 Jul 2025 14:38:42 -0700
Subject: [PATCH 21/74] adjust version final

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../rest-api-spec/test/upgraded_cluster/40_wildcard.yml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
index f8518fccc2f69..461eb1594998b 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
@@ -2,7 +2,7 @@
 ---
 "search after upgrade":
   - skip:
-      version:     " - 3.3.0"
+      version:     " - 3.1.99"
       reason:      SORTED_SET is no longer supported after 3.2.0
   # "term query matches exact value"
   - do:

From cf505a37b58e1e1e8534ce484638d915729ae039 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Tue, 5 Aug 2025 14:14:21 -0700
Subject: [PATCH 22/74] try to disable pruning

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../test/upgraded_cluster/40_wildcard.yml     |   3 -
 ...runingSortedSetOrdinalsIndexFieldData.java | 205 ++++++++++++++++++
 .../index/mapper/BinaryDocValuesFetcher.java  |   5 +-
 .../index/mapper/WildcardFieldMapper.java     |  10 +-
 4 files changed, 212 insertions(+), 11 deletions(-)
 create mode 100644 server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java

diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
index 461eb1594998b..29518931a5b8b 100644
--- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
+++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_wildcard.yml
@@ -1,9 +1,6 @@
 # refactored from rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
 ---
 "search after upgrade":
-  - skip:
-      version:     " - 3.1.99"
-      reason:      SORTED_SET is no longer supported after 3.2.0
   # "term query matches exact value"
   - do:
       search:
diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
new file mode 100644
index 0000000000000..71bed2f01cf04
--- /dev/null
+++ b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
@@ -0,0 +1,205 @@
+package org.opensearch.index.fielddata.plain;
+
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.function.Function;
+
+import org.apache.lucene.index.IndexSorter;
+import org.apache.lucene.index.SortedSetDocValues;
+import org.apache.lucene.search.FieldComparator;
+import org.apache.lucene.search.FieldComparatorSource;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Pruning;
+import org.apache.lucene.search.SortField;
+import org.apache.lucene.search.SortedSetSelector;
+import org.apache.lucene.search.SortedSetSortField;
+import org.apache.lucene.store.DataInput;
+import org.apache.lucene.util.BytesRef;
+import org.opensearch.common.Nullable;
+import org.opensearch.core.indices.breaker.CircuitBreakerService;
+import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.IndexFieldDataCache;
+import org.opensearch.index.fielddata.ScriptDocValues;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
+import org.opensearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
+import org.opensearch.search.MultiValueMode;
+import org.opensearch.search.aggregations.support.ValuesSourceType;
+
+public class NonPruningSortedSetOrdinalsIndexFieldData extends SortedSetOrdinalsIndexFieldData {
+
+    /**
+     * Builder for non-pruning sorted set ordinals
+     *
+     * @opensearch.internal
+     */
+    public static class Builder implements IndexFieldData.Builder {
+        private final String name;
+        private final Function<SortedSetDocValues, ScriptDocValues<?>> scriptFunction;
+        private final ValuesSourceType valuesSourceType;
+
+        public Builder(String name, ValuesSourceType valuesSourceType) {
+            this(name, AbstractLeafOrdinalsFieldData.DEFAULT_SCRIPT_FUNCTION, valuesSourceType);
+        }
+
+        public Builder(String name, Function<SortedSetDocValues, ScriptDocValues<?>> scriptFunction, ValuesSourceType valuesSourceType) {
+            this.name = name;
+            this.scriptFunction = scriptFunction;
+            this.valuesSourceType = valuesSourceType;
+        }
+
+        @Override
+        public NonPruningSortedSetOrdinalsIndexFieldData build(IndexFieldDataCache cache, CircuitBreakerService breakerService) {
+            return new NonPruningSortedSetOrdinalsIndexFieldData(cache, name, valuesSourceType, breakerService, scriptFunction);
+        }
+    }
+    
+    public NonPruningSortedSetOrdinalsIndexFieldData(
+        IndexFieldDataCache cache,
+        String fieldName,
+        ValuesSourceType valuesSourceType,
+        CircuitBreakerService breakerService,
+        Function<SortedSetDocValues, ScriptDocValues<?>> scriptFunction
+    ) {
+        super(cache, fieldName, valuesSourceType, breakerService, scriptFunction);
+    }
+
+    @Override
+    public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested, boolean reverse) {
+        XFieldComparatorSource source = new BytesRefFieldComparatorSource(this, missingValue, sortMode, nested);
+        /*
+        Check if we can use a simple {@link SortedSetSortField} compatible with index sorting and
+        returns a custom sort field otherwise.
+        */
+        if (nested != null
+            || (sortMode != MultiValueMode.MAX && sortMode != MultiValueMode.MIN)
+            || (source.sortMissingLast(missingValue) == false && source.sortMissingFirst(missingValue) == false)) {
+            return new NonPruningSortField(new SortField(getFieldName(), source, reverse));
+        }
+        SortField sortField = new NonPruningSortField(new SortedSetSortField(
+            getFieldName(),
+            reverse,
+            sortMode == MultiValueMode.MAX ? SortedSetSelector.Type.MAX : SortedSetSelector.Type.MIN
+        ));
+        sortField.setMissingValue(
+            source.sortMissingLast(missingValue) ^ reverse ? SortedSetSortField.STRING_LAST : SortedSetSortField.STRING_FIRST
+        );
+        return sortField;
+    }
+
+    public static class NonPruningSortField extends SortField {
+        private final SortField delegate;
+        private NonPruningSortField(SortField sortField) {
+            super(sortField.getField(), sortField.getType());
+            this.delegate = sortField;
+        }
+
+        public static Type readType(DataInput in) throws IOException {
+            return SortField.readType(in);
+        }
+
+        @Override
+        public Object getMissingValue() {
+            return delegate.getMissingValue();
+        }
+
+        @Override
+        public void setMissingValue(Object missingValue) {
+            delegate.setMissingValue(missingValue);
+        }
+
+        @Override
+        public String getField() {
+            return delegate.getField();
+        }
+
+        @Override
+        public Type getType() {
+            return delegate.getType();
+        }
+
+        @Override
+        public boolean getReverse() {
+            return delegate.getReverse();
+        }
+
+        @Override
+        public FieldComparatorSource getComparatorSource() {
+            FieldComparatorSource source = delegate.getComparatorSource();
+            return new FieldComparatorSource() {
+                @Override
+                public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning pruning, boolean reversed) {
+                    return source.newComparator(fieldname, numHits, Pruning.NONE, reversed); // < ----------- ALWAYS DISABLE PRUNING
+                }
+            };
+        }
+
+        @Override
+        public String toString() {
+            return delegate.toString();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            return delegate.equals(o);
+        }
+
+        @Override
+        public int hashCode() {
+            return delegate.hashCode();
+        }
+
+        @Override
+        public void setBytesComparator(Comparator<BytesRef> b) {
+            delegate.setBytesComparator(b);
+        }
+
+        @Override
+        public Comparator<BytesRef> getBytesComparator() {
+            return delegate.getBytesComparator();
+        }
+
+        @Override
+        public FieldComparator<?> getComparator(int numHits, Pruning pruning) {
+            return delegate.getComparator(numHits, Pruning.NONE); // < ----------- ALWAYS DISABLE PRUNING
+        }
+
+        @Override
+        public SortField rewrite(IndexSearcher searcher) throws IOException {
+            return delegate.rewrite(searcher);
+        }
+
+        @Override
+        public boolean needsScores() {
+            return delegate.needsScores();
+        }
+
+        @Override
+        public IndexSorter getIndexSorter() {
+            return delegate.getIndexSorter();
+        }
+
+        @Deprecated
+        @Override
+        public void setOptimizeSortWithIndexedData(boolean optimizeSortWithIndexedData) {
+            delegate.setOptimizeSortWithIndexedData(optimizeSortWithIndexedData);
+        }
+
+        @Deprecated
+        @Override
+        public boolean getOptimizeSortWithIndexedData() {
+            return delegate.getOptimizeSortWithIndexedData();
+        }
+
+        @Deprecated
+        @Override
+        public void setOptimizeSortWithPoints(boolean optimizeSortWithPoints) {
+            delegate.setOptimizeSortWithPoints(optimizeSortWithPoints);
+        }
+
+        @Deprecated
+        @Override
+        public boolean getOptimizeSortWithPoints() {
+            return delegate.getOptimizeSortWithPoints();
+        }
+    }
+}
diff --git a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
index 6b9662d4469f8..b8c7eb3c8dd06 100644
--- a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
+++ b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
@@ -32,10 +32,9 @@ public List<Object> fetch(LeafReader reader, int docId) throws IOException {
         List<Object> values = new ArrayList<>();
         try {
             final BinaryDocValues binaryDocValues = reader.getBinaryDocValues(mappedFieldType.name());
-            if (binaryDocValues == null || !binaryDocValues.advanceExact(docId)) {
-                return values;
+            if (binaryDocValues != null && binaryDocValues.advanceExact(docId)) {
+                values.add(binaryDocValues.binaryValue());
             }
-            values.add(binaryDocValues.binaryValue());
         } catch (IOException e) {
             throw new IOException("Failed to read doc values for document " + docId + " in field " + mappedFieldType.name(), e);
         }
diff --git a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
index c1c7f2a655fc3..b10371f301a59 100644
--- a/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/WildcardFieldMapper.java
@@ -10,9 +10,9 @@
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.Term;
@@ -47,7 +47,7 @@
 import org.opensearch.index.analysis.IndexAnalyzers;
 import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.index.fielddata.IndexFieldData;
-import org.opensearch.index.fielddata.plain.BinaryIndexFieldData;
+import org.opensearch.index.fielddata.plain.NonPruningSortedSetOrdinalsIndexFieldData;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.DocValueFormat;
 import org.opensearch.search.aggregations.support.CoreValuesSourceType;
@@ -220,7 +220,7 @@ protected void parseCreateField(ParseContext context) throws IOException {
         tokenizer.setReader(new StringReader(value));
         context.doc().add(new Field(fieldType().name(), tokenizer, FIELD_TYPE));
         if (fieldType().hasDocValues()) {
-            context.doc().add(new BinaryDocValuesField(fieldType().name(), binaryValue));
+            context.doc().add(new SortedSetDocValuesField(fieldType().name(), binaryValue));
         } else {
             if (fieldType().hasDocValues() == false) {
                 createFieldNamesField(context);
@@ -366,7 +366,7 @@ NamedAnalyzer normalizer() {
         @Override
         public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
             failIfNoDocValues();
-            return new BinaryIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
+            return new NonPruningSortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
         }
 
         @Override
@@ -929,7 +929,7 @@ protected void canDeriveSourceInternal() {
      */
     @Override
     protected DerivedFieldGenerator derivedFieldGenerator() {
-        return new DerivedFieldGenerator(mappedFieldType, new BinaryDocValuesFetcher(mappedFieldType, simpleName()) {
+        return new DerivedFieldGenerator(mappedFieldType, new SortedSetDocValuesFetcher(mappedFieldType, simpleName()) {
             @Override
             public Object convert(Object value) {
                 if (value == null) {

From a9d940f8b1d0d54e298021bc9a67926c25c61a8d Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Tue, 5 Aug 2025 14:27:12 -0700
Subject: [PATCH 23/74] spotless and add license

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 ...runingSortedSetOrdinalsIndexFieldData.java | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
index 71bed2f01cf04..77f9d801a957e 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
@@ -1,8 +1,12 @@
-package org.opensearch.index.fielddata.plain;
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
 
-import java.io.IOException;
-import java.util.Comparator;
-import java.util.function.Function;
+package org.opensearch.index.fielddata.plain;
 
 import org.apache.lucene.index.IndexSorter;
 import org.apache.lucene.index.SortedSetDocValues;
@@ -18,13 +22,17 @@
 import org.opensearch.common.Nullable;
 import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.opensearch.index.fielddata.IndexFieldDataCache;
 import org.opensearch.index.fielddata.ScriptDocValues;
-import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.opensearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
 import org.opensearch.search.MultiValueMode;
 import org.opensearch.search.aggregations.support.ValuesSourceType;
 
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.function.Function;
+
 public class NonPruningSortedSetOrdinalsIndexFieldData extends SortedSetOrdinalsIndexFieldData {
 
     /**
@@ -52,7 +60,7 @@ public NonPruningSortedSetOrdinalsIndexFieldData build(IndexFieldDataCache cache
             return new NonPruningSortedSetOrdinalsIndexFieldData(cache, name, valuesSourceType, breakerService, scriptFunction);
         }
     }
-    
+
     public NonPruningSortedSetOrdinalsIndexFieldData(
         IndexFieldDataCache cache,
         String fieldName,
@@ -75,11 +83,13 @@ public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMod
             || (source.sortMissingLast(missingValue) == false && source.sortMissingFirst(missingValue) == false)) {
             return new NonPruningSortField(new SortField(getFieldName(), source, reverse));
         }
-        SortField sortField = new NonPruningSortField(new SortedSetSortField(
-            getFieldName(),
-            reverse,
-            sortMode == MultiValueMode.MAX ? SortedSetSelector.Type.MAX : SortedSetSelector.Type.MIN
-        ));
+        SortField sortField = new NonPruningSortField(
+            new SortedSetSortField(
+                getFieldName(),
+                reverse,
+                sortMode == MultiValueMode.MAX ? SortedSetSelector.Type.MAX : SortedSetSelector.Type.MIN
+            )
+        );
         sortField.setMissingValue(
             source.sortMissingLast(missingValue) ^ reverse ? SortedSetSortField.STRING_LAST : SortedSetSortField.STRING_FIRST
         );
@@ -88,6 +98,7 @@ public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMod
 
     public static class NonPruningSortField extends SortField {
         private final SortField delegate;
+
         private NonPruningSortField(SortField sortField) {
             super(sortField.getField(), sortField.getType());
             this.delegate = sortField;

From 9b8ed7f1a217d16d459207a6695454f72af3829c Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Tue, 5 Aug 2025 18:56:07 -0700
Subject: [PATCH 24/74] java docs and test revert

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 CHANGELOG.md                                         |  1 +
 .../NonPruningSortedSetOrdinalsIndexFieldData.java   | 12 ++++++++++++
 .../index/mapper/WildcardFieldMapperTests.java       |  8 ++++----
 .../search/aggregations/AggregatorTestCase.java      |  3 +--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7c15a4899f74..8cfb91d0ac975 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add support for Combined Fields query ([#18724](https://github.com/opensearch-project/OpenSearch/pull/18724))
 
 ### Changed
+- Disable pruning for `doc_values` for the wildcard field mapper ([#18568](https://github.com/opensearch-project/OpenSearch/pull/18568))
 - Update Subject interface to use CheckedRunnable ([#18570](https://github.com/opensearch-project/OpenSearch/issues/18570))
 - Update SecureAuxTransportSettingsProvider to distinguish between aux transport types ([#18616](https://github.com/opensearch-project/OpenSearch/pull/18616))
 - Make node duress values cacheable ([#18649](https://github.com/opensearch-project/OpenSearch/pull/18649))
diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
index 77f9d801a957e..f91121867a20a 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
@@ -26,6 +26,7 @@
 import org.opensearch.index.fielddata.IndexFieldDataCache;
 import org.opensearch.index.fielddata.ScriptDocValues;
 import org.opensearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
+import org.opensearch.index.mapper.WildcardFieldMapper;
 import org.opensearch.search.MultiValueMode;
 import org.opensearch.search.aggregations.support.ValuesSourceType;
 
@@ -33,6 +34,12 @@
 import java.util.Comparator;
 import java.util.function.Function;
 
+/**
+ * Wrapper for {@link SortedSetOrdinalsIndexFieldData} which disables pruning optimization for
+ * sorting. Used in {@link WildcardFieldMapper}.
+ *
+ * @opensearch.internal
+ */
 public class NonPruningSortedSetOrdinalsIndexFieldData extends SortedSetOrdinalsIndexFieldData {
 
     /**
@@ -96,6 +103,11 @@ public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMod
         return sortField;
     }
 
+    /**
+     * {@link SortField} extension which disables pruning in the comparator.
+     *
+     * @opensearch.internal
+     */
     public static class NonPruningSortField extends SortField {
         private final SortField delegate;
 
diff --git a/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
index 08b7633eb615d..7315c244046be 100644
--- a/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
@@ -14,9 +14,9 @@
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
+import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexOptions;
@@ -126,7 +126,7 @@ public void testEnableDocValues() throws IOException {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         assertEquals(DocValuesType.NONE, fields[0].fieldType().docValuesType());
-        assertEquals(DocValuesType.BINARY, fields[1].fieldType().docValuesType());
+        assertEquals(DocValuesType.SORTED_SET, fields[1].fieldType().docValuesType());
 
         mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "wildcard")));
         doc = mapper.parse(source(b -> b.field("field", "1234")));
@@ -214,7 +214,7 @@ public void testNormalizer() throws IOException {
         assertEquals(new BytesRef("abc"), fields[1].binaryValue());
         fieldType = fields[1].fieldType();
         assertEquals(IndexOptions.NONE, fieldType.indexOptions());
-        assertEquals(DocValuesType.BINARY, fieldType.docValuesType());
+        assertEquals(DocValuesType.SORTED_SET, fieldType.docValuesType());
     }
 
     public void testNullValue() throws IOException {
@@ -386,7 +386,7 @@ private Document createDocument(WildcardFieldMapper mapper, String value) throws
         NamedAnalyzer normalizer = mapper.fieldType().normalizer();
         value = normalizeValue(normalizer, FIELD_NAME, value);
         final BytesRef binaryValue = new BytesRef(value);
-        doc.add(new BinaryDocValuesField(FIELD_NAME, binaryValue));
+        doc.add(new SortedSetDocValuesField(FIELD_NAME, binaryValue));
         return doc;
     }
 }
diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
index cf4f2a3b1369b..fc92065391fd4 100644
--- a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
@@ -123,7 +123,6 @@
 import org.opensearch.index.mapper.SemanticVersionFieldMapper;
 import org.opensearch.index.mapper.StarTreeMapper;
 import org.opensearch.index.mapper.TextFieldMapper;
-import org.opensearch.index.mapper.WildcardFieldMapper;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.index.shard.IndexShard;
@@ -1129,7 +1128,7 @@ private void writeTestDoc(MappedFieldType fieldType, String fieldName, RandomInd
             doc.add(new SortedNumericDocValuesField(fieldName, v));
 
         } else if (vst.equals(CoreValuesSourceType.BYTES)) {
-            if (typeName.equals(BinaryFieldMapper.CONTENT_TYPE) || typeName.equals(WildcardFieldMapper.CONTENT_TYPE)) {
+            if (typeName.equals(BinaryFieldMapper.CONTENT_TYPE)) {
                 doc.add(new BinaryFieldMapper.CustomBinaryDocValuesField(fieldName, new BytesRef("a").bytes));
                 json = "{ \"" + fieldName + "\" : \"a\" }";
             } else {

From 56a94a76c97d75512b61ce8576b7d0454eae583a Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 6 Aug 2025 10:00:30 -0700
Subject: [PATCH 25/74] update lucene serialization

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 server/src/main/java/org/opensearch/common/lucene/Lucene.java  | 3 ++-
 .../org/opensearch/index/mapper/WildcardFieldMapperTests.java  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index 0dcb95ed9a9de..d4134a77f41ad 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -92,6 +92,7 @@
 import org.opensearch.index.analysis.AnalyzerScope;
 import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.plain.NonPruningSortedSetOrdinalsIndexFieldData.NonPruningSortField;
 import org.opensearch.search.sort.SortedWiderNumericSortField;
 
 import java.io.IOException;
@@ -578,7 +579,7 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             sortField = newSortField;
         }
 
-        if (sortField.getClass() != SortField.class) {
+        if (sortField.getClass() != SortField.class && sortField.getClass() != NonPruningSortField.class) {
             throw new IllegalArgumentException("Cannot serialize SortField impl [" + sortField + "]");
         }
         if (sortField.getField() == null) {
diff --git a/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
index 7315c244046be..d50cd380cd824 100644
--- a/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java
@@ -251,7 +251,7 @@ public void testNullValue() throws IOException {
         );
         assertEquals(new BytesRef("uri"), fields[1].binaryValue());
         assertEquals(IndexOptions.NONE, fields[1].fieldType().indexOptions());
-        assertEquals(DocValuesType.BINARY, fields[1].fieldType().docValuesType());
+        assertEquals(DocValuesType.SORTED_SET, fields[1].fieldType().docValuesType());
     }
 
     public void testDefaults() throws Exception {

From 59ddd2e39e8afb45c3be6211c828732978491329 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 6 Aug 2025 10:06:08 -0700
Subject: [PATCH 26/74] delete binary doc values fetcher

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../index/mapper/BinaryDocValuesFetcher.java  | 43 -------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java

diff --git a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java b/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
deleted file mode 100644
index b8c7eb3c8dd06..0000000000000
--- a/server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- */
-
-package org.opensearch.index.mapper;
-
-import org.apache.lucene.index.BinaryDocValues;
-import org.apache.lucene.index.LeafReader;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * FieldValueFetcher for binary doc values
- *
- * @opensearch.internal
- */
-public class BinaryDocValuesFetcher extends FieldValueFetcher {
-
-    public BinaryDocValuesFetcher(MappedFieldType mappedFieldType, String simpleName) {
-        super(simpleName);
-        this.mappedFieldType = mappedFieldType;
-    }
-
-    @Override
-    public List<Object> fetch(LeafReader reader, int docId) throws IOException {
-        List<Object> values = new ArrayList<>();
-        try {
-            final BinaryDocValues binaryDocValues = reader.getBinaryDocValues(mappedFieldType.name());
-            if (binaryDocValues != null && binaryDocValues.advanceExact(docId)) {
-                values.add(binaryDocValues.binaryValue());
-            }
-        } catch (IOException e) {
-            throw new IOException("Failed to read doc values for document " + docId + " in field " + mappedFieldType.name(), e);
-        }
-        return values;
-    }
-}

From 7f1df809fe74ba74677acbd4f8988d3d5a7be0af Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 7 Aug 2025 12:39:34 -0700
Subject: [PATCH 27/74] fix casting

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 server/src/main/java/org/opensearch/common/lucene/Lucene.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index d4134a77f41ad..e837e79c80dfe 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -589,8 +589,8 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             out.writeString(sortField.getField());
         }
         if (sortField.getComparatorSource() != null) {
-            IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) sortField
-                .getComparatorSource();
+            IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) (sortField
+                .getComparatorSource());
             writeSortType(out, comparatorSource.reducedType());
             writeMissingValue(out, comparatorSource.missingValue(sortField.getReverse()));
         } else {

From 908593d6258c24b6ff07beebd940cb8f02139756 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 7 Aug 2025 16:16:50 -0700
Subject: [PATCH 28/74] non pruning test coverage

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 ...gSortedSetOrdinalsIndexFieldDataTests.java | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java

diff --git a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
new file mode 100644
index 0000000000000..569ec20b74066
--- /dev/null
+++ b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
@@ -0,0 +1,63 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.index.fielddata.plain;
+
+import org.apache.lucene.search.Pruning;
+import org.apache.lucene.search.SortField;
+import org.apache.lucene.search.SortedSetSortField;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.IndexFieldDataService;
+import org.opensearch.index.fielddata.plain.NonPruningSortedSetOrdinalsIndexFieldData.NonPruningSortField;
+import org.opensearch.index.mapper.ContentPath;
+import org.opensearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.Mapper.BuilderContext;
+import org.opensearch.index.mapper.WildcardFieldMapper;
+import org.opensearch.indices.IndicesService;
+import org.opensearch.search.MultiValueMode;
+import org.opensearch.test.OpenSearchSingleNodeTestCase;
+
+import java.io.IOException;
+
+public class NonPruningSortedSetOrdinalsIndexFieldDataTests extends OpenSearchSingleNodeTestCase {
+    public void testNonPruningSortedSetOrdinalsIndexFieldData() throws IOException {
+        final IndexService indexService = createIndex("test");
+        final IndicesService indicesService = getInstanceFromNode(IndicesService.class);
+        final IndexFieldDataService ifdService = new IndexFieldDataService(
+            indexService.getIndexSettings(),
+            indicesService.getIndicesFieldDataCache(),
+            indicesService.getCircuitBreakerService(),
+            indexService.mapperService(),
+            indexService.getThreadPool()
+        );
+        final BuilderContext ctx = new BuilderContext(indexService.getIndexSettings().getSettings(), new ContentPath(1));
+        final MappedFieldType stringMapper = new WildcardFieldMapper.Builder("string").docValues(true).build(ctx).fieldType();
+        ifdService.clear();
+        IndexFieldData<?> fd = ifdService.getForField(stringMapper, "test", () -> { throw new UnsupportedOperationException(); });
+        assertTrue(fd instanceof NonPruningSortedSetOrdinalsIndexFieldData);
+        SortField field = ((NonPruningSortedSetOrdinalsIndexFieldData) fd).sortField(null, MultiValueMode.MAX, null, false);
+        assertTrue(field instanceof NonPruningSortField);
+
+        // Test all the methods of NonPruningSortField for code coverage
+
+        field.setMissingValue(SortedSetSortField.STRING_FIRST);
+        field.getMissingValue();
+        field.getField();
+        field.getType();
+        assertFalse(field.getReverse());
+        field.getComparatorSource();
+        field.toString();
+        field.hashCode();
+        field.equals(field);
+        field.getBytesComparator();
+        field.getComparator(0, Pruning.NONE);
+        field.needsScores();
+        field.getIndexSorter();
+    }
+}

From dea8109c84644924f751485ab8a2fec463bb240a Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 7 Aug 2025 17:44:22 -0700
Subject: [PATCH 29/74] non pruning test coverage

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From d8cd0bf0d15970e4d3438832a4f7f43351157cea Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Fri, 8 Aug 2025 11:22:04 -0700
Subject: [PATCH 30/74] Added more code coverage

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../NonPruningSortedSetOrdinalsIndexFieldDataTests.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
index 569ec20b74066..f76624d745f60 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
@@ -56,8 +56,13 @@ public void testNonPruningSortedSetOrdinalsIndexFieldData() throws IOException {
         field.hashCode();
         field.equals(field);
         field.getBytesComparator();
+        field.setComparator(null);
         field.getComparator(0, Pruning.NONE);
         field.needsScores();
         field.getIndexSorter();
+        field.setOptimizeSortWithIndexedData(false);
+        field.getOptimizeSortWithIndexedData();
+        field.setOptimizeSortWithPoints(false);
+        field.getOptimizeSortWithPoints();
     }
 }

From 1f5b18ff219704d65b8c46b3f8ba646ce3e82624 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Fri, 8 Aug 2025 13:42:32 -0700
Subject: [PATCH 31/74] code coverage

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
index f76624d745f60..cba89a588dc8e 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
@@ -56,7 +56,6 @@ public void testNonPruningSortedSetOrdinalsIndexFieldData() throws IOException {
         field.hashCode();
         field.equals(field);
         field.getBytesComparator();
-        field.setComparator(null);
         field.getComparator(0, Pruning.NONE);
         field.needsScores();
         field.getIndexSorter();

From 101810e55b04d84e18c415ff9b08b7fda3df21f4 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sat, 9 Aug 2025 17:54:33 -0700
Subject: [PATCH 32/74] retry

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 751e6fbf00e461e27f6e44ed22c2d996195c77d7 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sat, 9 Aug 2025 17:54:54 -0700
Subject: [PATCH 33/74] retry

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From ff70c05c4a4936a62c123999cf759f9fbf3b4c62 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sat, 9 Aug 2025 19:28:11 -0700
Subject: [PATCH 34/74] the test that failed last time is flaky as I have tried
 it out on the code without my changes

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 8023bef83f043c9682c3d7332ac7ca3017436155 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sat, 9 Aug 2025 22:01:58 -0700
Subject: [PATCH 35/74] cast parsing

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From ea824895324cbed226b11da9e1fea80b1de36f45 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 13 Aug 2025 10:55:28 -0700
Subject: [PATCH 36/74] apply suggestions

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 CHANGELOG.md                                  |   9 --
 ...runingSortedSetOrdinalsIndexFieldData.java | 124 +++++++++++++++++-
 2 files changed, 118 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6bba92c8352c..77ca94c1daec9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,15 +8,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 - Disable pruning for `doc_values` for the wildcard field mapper ([#18568](https://github.com/opensearch-project/OpenSearch/pull/18568))
-- Update Subject interface to use CheckedRunnable ([#18570](https://github.com/opensearch-project/OpenSearch/issues/18570))
-- Update SecureAuxTransportSettingsProvider to distinguish between aux transport types ([#18616](https://github.com/opensearch-project/OpenSearch/pull/18616))
-- Make node duress values cacheable ([#18649](https://github.com/opensearch-project/OpenSearch/pull/18649))
-- Change default value of remote_data_ratio, which is used in Searchable Snapshots and Writeable Warm from 0 to 5 and min allowed value to 1 ([#18767](https://github.com/opensearch-project/OpenSearch/pull/18767))
-- Making multi rate limiters in repository dynamic [#18069](https://github.com/opensearch-project/OpenSearch/pull/18069)
-- Optimize grouping for segment concurrent search by ensuring that documents within each group are as equal as possible ([#18451](https://github.com/opensearch-project/OpenSearch/pull/18451))
-- Move transport-grpc from a core plugin to a module ([#18897](https://github.com/opensearch-project/OpenSearch/pull/18897))
-- Remove `experimental` designation from transport-grpc settings ([#18915](https://github.com/opensearch-project/OpenSearch/pull/18915))
-- Rename package org.opensearch.plugin,transport.grpc to org.opensearch.transport.grpc ([#18923](https://github.com/opensearch-project/OpenSearch/pull/18923))
 
 ### Fixed
 - Fix unnecessary refreshes on update preparation failures ([#15261](https://github.com/opensearch-project/OpenSearch/issues/15261))
diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
index f91121867a20a..dfabfe9e77603 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
@@ -103,17 +103,127 @@ public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMod
         return sortField;
     }
 
+    /**
+     * {@link SortField} implementation which delegates calls to another {@link SortField}.
+     *
+     */
+    public abstract class FilteredSortField extends SortField {
+        protected final SortField delegate;
+
+        protected FilteredSortField(SortField sortField) {
+            super(sortField.getField(), sortField.getType());
+            this.delegate = sortField;
+        }
+
+        @Override
+        public Object getMissingValue() {
+            return delegate.getMissingValue();
+        }
+
+        @Override
+        public void setMissingValue(Object missingValue) {
+            delegate.setMissingValue(missingValue);
+        }
+
+        @Override
+        public String getField() {
+            return delegate.getField();
+        }
+
+        @Override
+        public Type getType() {
+            return delegate.getType();
+        }
+
+        @Override
+        public boolean getReverse() {
+            return delegate.getReverse();
+        }
+
+        @Override
+        public FieldComparatorSource getComparatorSource() {
+            return delegate.getComparatorSource();
+        }
+
+        @Override
+        public String toString() {
+            return delegate.toString();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            return delegate.equals(o);
+        }
+
+        @Override
+        public int hashCode() {
+            return delegate.hashCode();
+        }
+
+        @Override
+        public void setBytesComparator(Comparator<BytesRef> b) {
+            delegate.setBytesComparator(b);
+        }
+
+        @Override
+        public Comparator<BytesRef> getBytesComparator() {
+            return delegate.getBytesComparator();
+        }
+
+        @Override
+        public FieldComparator<?> getComparator(int numHits, Pruning pruning) {
+            return delegate.getComparator(numHits, pruning);
+        }
+
+        @Override
+        public SortField rewrite(IndexSearcher searcher) throws IOException {
+            return delegate.rewrite(searcher);
+        }
+
+        @Override
+        public boolean needsScores() {
+            return delegate.needsScores();
+        }
+
+        @Override
+        public IndexSorter getIndexSorter() {
+            return delegate.getIndexSorter();
+        }
+
+        @Deprecated
+        @Override
+        public void setOptimizeSortWithIndexedData(boolean optimizeSortWithIndexedData) {
+            delegate.setOptimizeSortWithIndexedData(optimizeSortWithIndexedData);
+        }
+
+        @Deprecated
+        @Override
+        public boolean getOptimizeSortWithIndexedData() {
+            return delegate.getOptimizeSortWithIndexedData();
+        }
+
+        @Deprecated
+        @Override
+        public void setOptimizeSortWithPoints(boolean optimizeSortWithPoints) {
+            delegate.setOptimizeSortWithPoints(optimizeSortWithPoints);
+        }
+
+        @Deprecated
+        @Override
+        public boolean getOptimizeSortWithPoints() {
+            return delegate.getOptimizeSortWithPoints();
+        }
+    }
+
     /**
      * {@link SortField} extension which disables pruning in the comparator.
      *
      * @opensearch.internal
      */
-    public static class NonPruningSortField extends SortField {
-        private final SortField delegate;
+    public final class NonPruningSortField extends FilteredSortField {
 
         private NonPruningSortField(SortField sortField) {
-            super(sortField.getField(), sortField.getType());
-            this.delegate = sortField;
+            super(sortField);
         }
 
         public static Type readType(DataInput in) throws IOException {
@@ -151,7 +261,8 @@ public FieldComparatorSource getComparatorSource() {
             return new FieldComparatorSource() {
                 @Override
                 public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning pruning, boolean reversed) {
-                    return source.newComparator(fieldname, numHits, Pruning.NONE, reversed); // < ----------- ALWAYS DISABLE PRUNING
+                    // explictly disable pruning
+                    return source.newComparator(fieldname, numHits, Pruning.NONE, reversed);
                 }
             };
         }
@@ -183,7 +294,8 @@ public Comparator<BytesRef> getBytesComparator() {
 
         @Override
         public FieldComparator<?> getComparator(int numHits, Pruning pruning) {
-            return delegate.getComparator(numHits, Pruning.NONE); // < ----------- ALWAYS DISABLE PRUNING
+            // explictly disable pruning
+            return delegate.getComparator(numHits, Pruning.NONE);
         }
 
         @Override

From 0d27c7a9f6837c6eec4d666cc042bedf1eafc0ac Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 13 Aug 2025 16:32:01 -0700
Subject: [PATCH 37/74] reduce the number of methods in NonPruningSortField

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 ...runingSortedSetOrdinalsIndexFieldData.java | 90 +------------------
 1 file changed, 1 insertion(+), 89 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
index dfabfe9e77603..2a1076125a84c 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
@@ -226,35 +226,11 @@ private NonPruningSortField(SortField sortField) {
             super(sortField);
         }
 
+        
         public static Type readType(DataInput in) throws IOException {
             return SortField.readType(in);
         }
 
-        @Override
-        public Object getMissingValue() {
-            return delegate.getMissingValue();
-        }
-
-        @Override
-        public void setMissingValue(Object missingValue) {
-            delegate.setMissingValue(missingValue);
-        }
-
-        @Override
-        public String getField() {
-            return delegate.getField();
-        }
-
-        @Override
-        public Type getType() {
-            return delegate.getType();
-        }
-
-        @Override
-        public boolean getReverse() {
-            return delegate.getReverse();
-        }
-
         @Override
         public FieldComparatorSource getComparatorSource() {
             FieldComparatorSource source = delegate.getComparatorSource();
@@ -267,74 +243,10 @@ public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning p
             };
         }
 
-        @Override
-        public String toString() {
-            return delegate.toString();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            return delegate.equals(o);
-        }
-
-        @Override
-        public int hashCode() {
-            return delegate.hashCode();
-        }
-
-        @Override
-        public void setBytesComparator(Comparator<BytesRef> b) {
-            delegate.setBytesComparator(b);
-        }
-
-        @Override
-        public Comparator<BytesRef> getBytesComparator() {
-            return delegate.getBytesComparator();
-        }
-
         @Override
         public FieldComparator<?> getComparator(int numHits, Pruning pruning) {
             // explictly disable pruning
             return delegate.getComparator(numHits, Pruning.NONE);
         }
-
-        @Override
-        public SortField rewrite(IndexSearcher searcher) throws IOException {
-            return delegate.rewrite(searcher);
-        }
-
-        @Override
-        public boolean needsScores() {
-            return delegate.needsScores();
-        }
-
-        @Override
-        public IndexSorter getIndexSorter() {
-            return delegate.getIndexSorter();
-        }
-
-        @Deprecated
-        @Override
-        public void setOptimizeSortWithIndexedData(boolean optimizeSortWithIndexedData) {
-            delegate.setOptimizeSortWithIndexedData(optimizeSortWithIndexedData);
-        }
-
-        @Deprecated
-        @Override
-        public boolean getOptimizeSortWithIndexedData() {
-            return delegate.getOptimizeSortWithIndexedData();
-        }
-
-        @Deprecated
-        @Override
-        public void setOptimizeSortWithPoints(boolean optimizeSortWithPoints) {
-            delegate.setOptimizeSortWithPoints(optimizeSortWithPoints);
-        }
-
-        @Deprecated
-        @Override
-        public boolean getOptimizeSortWithPoints() {
-            return delegate.getOptimizeSortWithPoints();
-        }
     }
 }

From e89f5bfa513092ee2ab06998a5a543045960f0e9 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 13 Aug 2025 18:40:34 -0700
Subject: [PATCH 38/74] spotless

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../plain/NonPruningSortedSetOrdinalsIndexFieldData.java         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
index 2a1076125a84c..f571d17bbe822 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
@@ -226,7 +226,6 @@ private NonPruningSortField(SortField sortField) {
             super(sortField);
         }
 
-        
         public static Type readType(DataInput in) throws IOException {
             return SortField.readType(in);
         }

From 9eeae284e25fc332b4e5e79de77b42b3ec7f497e Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 14 Aug 2025 14:26:14 -0700
Subject: [PATCH 39/74] Make sure wildcard search is only checked after 3.3.0

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../test/search/270_wildcard_fieldtype_queries.yml            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
index baf4cb3a26a4c..045f3ed3eb320 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/270_wildcard_fieldtype_queries.yml
@@ -397,8 +397,8 @@ setup:
 ---
 "sort on doc value enabled wildcard":
   - skip:
-      version: " - 3.1.99"
-      reason: "sorting on doc value enabled wildcard has bug before 3.2.0"
+      version: " - 3.2.99"
+      reason: "sorting on doc value enabled wildcard has bug before 3.3.0"
   - do:
       search:
         index: test

From 388d2f14cc79dbe0e38a52d5f85ced7037f97389 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 14 Aug 2025 19:09:40 -0700
Subject: [PATCH 40/74] rerun for nondeterministic tests

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 73fb673508d4db0a77f3c22a9f8857fbbea76c13 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 14 Aug 2025 20:48:54 -0700
Subject: [PATCH 41/74] block casting error

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../src/main/java/org/opensearch/common/lucene/Lucene.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index e837e79c80dfe..c03761a9836c2 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -91,7 +91,6 @@
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.index.analysis.AnalyzerScope;
 import org.opensearch.index.analysis.NamedAnalyzer;
-import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.plain.NonPruningSortedSetOrdinalsIndexFieldData.NonPruningSortField;
 import org.opensearch.search.sort.SortedWiderNumericSortField;
 
@@ -589,10 +588,8 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             out.writeString(sortField.getField());
         }
         if (sortField.getComparatorSource() != null) {
-            IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) (sortField
-                .getComparatorSource());
-            writeSortType(out, comparatorSource.reducedType());
-            writeMissingValue(out, comparatorSource.missingValue(sortField.getReverse()));
+            writeSortType(out, sortField.getComparatorSource().reducedType());
+            writeMissingValue(out, sortField.getComparatorSource().missingValue(sortField.getReverse()));
         } else {
             writeSortType(out, sortField.getType());
             writeMissingValue(out, sortField.getMissingValue());

From d76264f92e03e6aac28e36291c52a922132f98e2 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 14 Aug 2025 21:46:55 -0700
Subject: [PATCH 42/74] block casting error

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../main/java/org/opensearch/common/lucene/Lucene.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index c03761a9836c2..5a013947dbeb3 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -57,6 +57,7 @@
 import org.apache.lucene.index.SegmentReader;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.FieldComparatorSource;
 import org.apache.lucene.search.FieldDoc;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
@@ -91,6 +92,7 @@
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.index.analysis.AnalyzerScope;
 import org.opensearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.plain.NonPruningSortedSetOrdinalsIndexFieldData.NonPruningSortField;
 import org.opensearch.search.sort.SortedWiderNumericSortField;
 
@@ -588,8 +590,10 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             out.writeString(sortField.getField());
         }
         if (sortField.getComparatorSource() != null) {
-            writeSortType(out, sortField.getComparatorSource().reducedType());
-            writeMissingValue(out, sortField.getComparatorSource().missingValue(sortField.getReverse()));
+            FieldComparatorSource fieldComparatorSource = sortField.getComparatorSource();
+            IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) fieldComparatorSource;
+            writeSortType(out, comparatorSource.reducedType());
+            writeMissingValue(out, comparatorSource.missingValue(sortField.getReverse()));
         } else {
             writeSortType(out, sortField.getType());
             writeMissingValue(out, sortField.getMissingValue());

From 1ef8c349f8952bab8eb881ac06fdeccff1329c89 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 14 Aug 2025 23:10:47 -0700
Subject: [PATCH 43/74] add check for casting type

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 server/src/main/java/org/opensearch/common/lucene/Lucene.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index 5a013947dbeb3..e81b71152e162 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -589,7 +589,7 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             out.writeBoolean(true);
             out.writeString(sortField.getField());
         }
-        if (sortField.getComparatorSource() != null) {
+        if (sortField.getComparatorSource() != null && (sortField.getComparatorSource() instanceof IndexFieldData.XFieldComparatorSource)) {
             FieldComparatorSource fieldComparatorSource = sortField.getComparatorSource();
             IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) fieldComparatorSource;
             writeSortType(out, comparatorSource.reducedType());

From ee2c0d9e2a062cbfd0aab90d16a9bd15a54bb09c Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Fri, 15 Aug 2025 09:11:48 -0700
Subject: [PATCH 44/74] smoke tests did not run

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 4330d513b735889119cd826b4bba3a5b2fa7264c Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sat, 16 Aug 2025 10:40:47 -0700
Subject: [PATCH 45/74] rerun for smoke tests

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 57ea1ceeabc9964cd951d4cd95cb55ebac4ecfe6 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sat, 16 Aug 2025 22:13:39 -0700
Subject: [PATCH 46/74] rerun for smoke tests

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 1412294788e7bbfb755690ff607878d6e891b7a3 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sun, 17 Aug 2025 20:13:38 -0700
Subject: [PATCH 47/74] rerun for flaky detection

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 4b76d572d2d29244c437189f1dd932af00d86080 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Mon, 18 Aug 2025 09:26:50 -0700
Subject: [PATCH 48/74] rerun for flaky detection

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 05356770f72f06fa3c79b5e337d13e16049ca25f Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 27 Aug 2025 11:43:30 -0700
Subject: [PATCH 49/74] made changes based on suggestions

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../org/opensearch/common/lucene/Lucene.java  |  7 ++---
 ...gSortedSetOrdinalsIndexFieldDataTests.java | 28 ++++++++-----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index e81b71152e162..1722562ee6f67 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -57,7 +57,6 @@
 import org.apache.lucene.index.SegmentReader;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.Explanation;
-import org.apache.lucene.search.FieldComparatorSource;
 import org.apache.lucene.search.FieldDoc;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
@@ -580,7 +579,7 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             sortField = newSortField;
         }
 
-        if (sortField.getClass() != SortField.class && sortField.getClass() != NonPruningSortField.class) {
+        if (sortField.getClass() != SortField.class && (sortField instanceof NonPruningSortField)) {
             throw new IllegalArgumentException("Cannot serialize SortField impl [" + sortField + "]");
         }
         if (sortField.getField() == null) {
@@ -590,8 +589,8 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             out.writeString(sortField.getField());
         }
         if (sortField.getComparatorSource() != null && (sortField.getComparatorSource() instanceof IndexFieldData.XFieldComparatorSource)) {
-            FieldComparatorSource fieldComparatorSource = sortField.getComparatorSource();
-            IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) fieldComparatorSource;
+            IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) (sortField
+                .getComparatorSource());
             writeSortType(out, comparatorSource.reducedType());
             writeMissingValue(out, comparatorSource.missingValue(sortField.getReverse()));
         } else {
diff --git a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
index cba89a588dc8e..1816219b42fb9 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
@@ -8,6 +8,8 @@
 
 package org.opensearch.index.fielddata.plain;
 
+import org.apache.lucene.index.IndexSorter;
+import org.apache.lucene.search.FieldComparator;
 import org.apache.lucene.search.Pruning;
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.SortedSetSortField;
@@ -24,6 +26,7 @@
 import org.opensearch.test.OpenSearchSingleNodeTestCase;
 
 import java.io.IOException;
+import java.util.Comparator;
 
 public class NonPruningSortedSetOrdinalsIndexFieldDataTests extends OpenSearchSingleNodeTestCase {
     public void testNonPruningSortedSetOrdinalsIndexFieldData() throws IOException {
@@ -43,25 +46,16 @@ public void testNonPruningSortedSetOrdinalsIndexFieldData() throws IOException {
         assertTrue(fd instanceof NonPruningSortedSetOrdinalsIndexFieldData);
         SortField field = ((NonPruningSortedSetOrdinalsIndexFieldData) fd).sortField(null, MultiValueMode.MAX, null, false);
         assertTrue(field instanceof NonPruningSortField);
-
-        // Test all the methods of NonPruningSortField for code coverage
-
         field.setMissingValue(SortedSetSortField.STRING_FIRST);
-        field.getMissingValue();
-        field.getField();
-        field.getType();
-        assertFalse(field.getReverse());
-        field.getComparatorSource();
-        field.toString();
-        field.hashCode();
-        field.equals(field);
-        field.getBytesComparator();
-        field.getComparator(0, Pruning.NONE);
-        field.needsScores();
-        field.getIndexSorter();
         field.setOptimizeSortWithIndexedData(false);
-        field.getOptimizeSortWithIndexedData();
         field.setOptimizeSortWithPoints(false);
-        field.getOptimizeSortWithPoints();
+        assertEquals("<sortedset: \"string\"> missingValue=SortField.STRING_FIRST selector=MAX", field.toString());
+        assertFalse(field.equals(field));
+        assertFalse(field.getOptimizeSortWithIndexedData());
+        assertFalse(field.getOptimizeSortWithPoints());
+        assertFalse(field.needsScores());
+        assertTrue(field.getBytesComparator().equals(Comparator.naturalOrder()));
+        assertTrue(field.getComparator(0, Pruning.NONE) instanceof FieldComparator);
+        assertTrue(field.getIndexSorter() instanceof IndexSorter);
     }
 }

From 4b617fa28f9824eddc13e2bb8f598737ae617cda Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 27 Aug 2025 11:44:22 -0700
Subject: [PATCH 50/74] fix changelog order

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1786e6ffb41cb..f770b1c386474 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add a toBuilder method in EngineConfig to support easy modification of configs([#19054](https://github.com/opensearch-project/OpenSearch/pull/19054))
 
 ### Changed
-- Disable pruning for `doc_values` for the wildcard field mapper ([#18568](https://github.com/opensearch-project/OpenSearch/pull/18568))
 - Add CompletionStage variants to methods in the Client Interface and default to ActionListener impl ([#18998](https://github.com/opensearch-project/OpenSearch/pull/18998))
 - IllegalArgumentException when scroll ID references a node not found in Cluster ([#19031](https://github.com/opensearch-project/OpenSearch/pull/19031))
+- Disable pruning for `doc_values` for the wildcard field mapper ([#18568](https://github.com/opensearch-project/OpenSearch/pull/18568))
 
 ### Fixed
 - Fix unnecessary refreshes on update preparation failures ([#15261](https://github.com/opensearch-project/OpenSearch/issues/15261))

From 9a5d09a2c009ea1642c971aecd8801f6d316e37d Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 27 Aug 2025 16:04:16 -0700
Subject: [PATCH 51/74] fixed conditional

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 server/src/main/java/org/opensearch/common/lucene/Lucene.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index 1722562ee6f67..b1112f0f53f63 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -588,7 +588,8 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             out.writeBoolean(true);
             out.writeString(sortField.getField());
         }
-        if (sortField.getComparatorSource() != null && (sortField.getComparatorSource() instanceof IndexFieldData.XFieldComparatorSource)) {
+        if (sortField.getComparatorSource() != null
+            && (sortField.getComparatorSource() instanceof IndexFieldData.XFieldComparatorSource) == false) {
             IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) (sortField
                 .getComparatorSource());
             writeSortType(out, comparatorSource.reducedType());

From 8fb28604ad470481685305023d00d321b16a5ae7 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 27 Aug 2025 18:53:32 -0700
Subject: [PATCH 52/74] refactored testing for
 NonPruningSortedSetOrdinalsIndexFieldDataTests

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 ...gSortedSetOrdinalsIndexFieldDataTests.java | 50 ++++++++++++++-----
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
index 1816219b42fb9..d5d3299871c86 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java
@@ -16,7 +16,6 @@
 import org.opensearch.index.IndexService;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.IndexFieldDataService;
-import org.opensearch.index.fielddata.plain.NonPruningSortedSetOrdinalsIndexFieldData.NonPruningSortField;
 import org.opensearch.index.mapper.ContentPath;
 import org.opensearch.index.mapper.MappedFieldType;
 import org.opensearch.index.mapper.Mapper.BuilderContext;
@@ -27,35 +26,60 @@
 
 import java.io.IOException;
 import java.util.Comparator;
+import java.util.Objects;
 
 public class NonPruningSortedSetOrdinalsIndexFieldDataTests extends OpenSearchSingleNodeTestCase {
-    public void testNonPruningSortedSetOrdinalsIndexFieldData() throws IOException {
-        final IndexService indexService = createIndex("test");
-        final IndicesService indicesService = getInstanceFromNode(IndicesService.class);
-        final IndexFieldDataService ifdService = new IndexFieldDataService(
+    IndexService indexService;
+    IndicesService indicesService;
+    IndexFieldDataService ifdService;
+    BuilderContext ctx;
+    MappedFieldType stringMapper;
+    SortField field;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        indexService = createIndex("test");
+        indicesService = getInstanceFromNode(IndicesService.class);
+        ifdService = new IndexFieldDataService(
             indexService.getIndexSettings(),
             indicesService.getIndicesFieldDataCache(),
             indicesService.getCircuitBreakerService(),
             indexService.mapperService(),
             indexService.getThreadPool()
         );
-        final BuilderContext ctx = new BuilderContext(indexService.getIndexSettings().getSettings(), new ContentPath(1));
-        final MappedFieldType stringMapper = new WildcardFieldMapper.Builder("string").docValues(true).build(ctx).fieldType();
+        ctx = new BuilderContext(indexService.getIndexSettings().getSettings(), new ContentPath(1));
+        stringMapper = new WildcardFieldMapper.Builder("string").docValues(true).build(ctx).fieldType();
         ifdService.clear();
         IndexFieldData<?> fd = ifdService.getForField(stringMapper, "test", () -> { throw new UnsupportedOperationException(); });
-        assertTrue(fd instanceof NonPruningSortedSetOrdinalsIndexFieldData);
-        SortField field = ((NonPruningSortedSetOrdinalsIndexFieldData) fd).sortField(null, MultiValueMode.MAX, null, false);
-        assertTrue(field instanceof NonPruningSortField);
+        field = ((NonPruningSortedSetOrdinalsIndexFieldData) fd).sortField(null, MultiValueMode.MAX, null, false);
         field.setMissingValue(SortedSetSortField.STRING_FIRST);
         field.setOptimizeSortWithIndexedData(false);
         field.setOptimizeSortWithPoints(false);
+    }
+
+    public void testNonPruningSortedSetOrdinalsIndexFieldDataSerialization() throws IOException {
         assertEquals("<sortedset: \"string\"> missingValue=SortField.STRING_FIRST selector=MAX", field.toString());
-        assertFalse(field.equals(field));
+    }
+
+    public void testNonPruningSortedSetOrdinalsIndexFieldDataComparator() throws IOException {
+        assertTrue(field.getBytesComparator().equals(Comparator.naturalOrder()));
+        assertTrue(field.getComparator(0, Pruning.NONE) instanceof FieldComparator);
+        assertTrue(field.getIndexSorter() instanceof IndexSorter);
+    }
+
+    public void testNonPruningSortedSetOrdinalsIndexFieldDataSorting() throws IOException {
         assertFalse(field.getOptimizeSortWithIndexedData());
         assertFalse(field.getOptimizeSortWithPoints());
         assertFalse(field.needsScores());
-        assertTrue(field.getBytesComparator().equals(Comparator.naturalOrder()));
-        assertTrue(field.getComparator(0, Pruning.NONE) instanceof FieldComparator);
         assertTrue(field.getIndexSorter() instanceof IndexSorter);
     }
+
+    public void testNonPruningSortedSetOrdinalsIndexFieldDataEquality() throws IOException {
+        assertFalse(field.equals(field));
+        assertNotEquals(
+            Objects.hash(field.getField(), field.getType(), field.getReverse(), field.getComparatorSource(), field.getMissingValue()),
+            field.hashCode()
+        );
+    }
 }

From b0205c5c2553fd576ed8261ad3190c2b50974810 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 28 Aug 2025 07:54:50 -0700
Subject: [PATCH 53/74] timed out last time

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From a67685f5f3200efa5d455aff1c02e307b173f136 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 28 Aug 2025 15:19:53 -0700
Subject: [PATCH 54/74] timed out last time

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From e683b309364a556cbc8e5ed26600523b2b9bc5e0 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 28 Aug 2025 18:10:09 -0700
Subject: [PATCH 55/74] the negation actually did not go through

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 server/src/main/java/org/opensearch/common/lucene/Lucene.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index b1112f0f53f63..6d6f82732d0be 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -579,7 +579,7 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             sortField = newSortField;
         }
 
-        if (sortField.getClass() != SortField.class && (sortField instanceof NonPruningSortField)) {
+        if (sortField.getClass() != SortField.class && ((sortField instanceof NonPruningSortField) == false)) {
             throw new IllegalArgumentException("Cannot serialize SortField impl [" + sortField + "]");
         }
         if (sortField.getField() == null) {

From 1f03ed0e36cdca952c1baece4d01d5c459bdd209 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 28 Aug 2025 18:12:49 -0700
Subject: [PATCH 56/74] fix casting error

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 server/src/main/java/org/opensearch/common/lucene/Lucene.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index 6d6f82732d0be..9e5580af79c48 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -589,7 +589,7 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             out.writeString(sortField.getField());
         }
         if (sortField.getComparatorSource() != null
-            && (sortField.getComparatorSource() instanceof IndexFieldData.XFieldComparatorSource) == false) {
+            && (sortField.getComparatorSource() instanceof IndexFieldData.XFieldComparatorSource)) {
             IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) (sortField
                 .getComparatorSource());
             writeSortType(out, comparatorSource.reducedType());

From 7e11909c7adde1e9742ada78973179473f4b17b3 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Thu, 28 Aug 2025 23:23:38 -0700
Subject: [PATCH 57/74] spotless

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 server/src/main/java/org/opensearch/common/lucene/Lucene.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index 9e5580af79c48..86344aee22254 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -588,8 +588,7 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             out.writeBoolean(true);
             out.writeString(sortField.getField());
         }
-        if (sortField.getComparatorSource() != null
-            && (sortField.getComparatorSource() instanceof IndexFieldData.XFieldComparatorSource)) {
+        if (sortField.getComparatorSource() != null && (sortField.getComparatorSource() instanceof IndexFieldData.XFieldComparatorSource)) {
             IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) (sortField
                 .getComparatorSource());
             writeSortType(out, comparatorSource.reducedType());

From 87f0c93eed60f318c2ccb18a1024ea08d278a779 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Fri, 29 Aug 2025 20:23:18 -0700
Subject: [PATCH 58/74] put serializer in the right place

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../main/java/org/opensearch/common/lucene/Lucene.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index 86344aee22254..fdb02b86e2897 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -561,7 +561,7 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             SortField newSortField = new SortField(sortField.getField(), SortField.Type.DOUBLE);
             newSortField.setMissingValue(sortField.getMissingValue());
             sortField = newSortField;
-        } else if (sortField.getClass() == SortedSetSortField.class) {
+        } else if (sortField.getClass() == SortedSetSortField.class || (sortField instanceof NonPruningSortField)) {
             // for multi-valued sort field, we replace the SortedSetSortField with a simple SortField.
             // It works because the sort field is only used to merge results from different shards.
             SortField newSortField = new SortField(sortField.getField(), SortField.Type.STRING, sortField.getReverse());
@@ -579,7 +579,7 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             sortField = newSortField;
         }
 
-        if (sortField.getClass() != SortField.class && ((sortField instanceof NonPruningSortField) == false)) {
+        if (sortField.getClass() != SortField.class) {
             throw new IllegalArgumentException("Cannot serialize SortField impl [" + sortField + "]");
         }
         if (sortField.getField() == null) {
@@ -588,9 +588,9 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             out.writeBoolean(true);
             out.writeString(sortField.getField());
         }
-        if (sortField.getComparatorSource() != null && (sortField.getComparatorSource() instanceof IndexFieldData.XFieldComparatorSource)) {
-            IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) (sortField
-                .getComparatorSource());
+        if (sortField.getComparatorSource() != null) {
+            IndexFieldData.XFieldComparatorSource comparatorSource = (IndexFieldData.XFieldComparatorSource) sortField
+                .getComparatorSource();
             writeSortType(out, comparatorSource.reducedType());
             writeMissingValue(out, comparatorSource.missingValue(sortField.getReverse()));
         } else {

From aad91ce00887ffabf924af919545d621ac5a9973 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Fri, 29 Aug 2025 21:53:29 -0700
Subject: [PATCH 59/74] rerun spotless

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From d75b6a9a7b8cc6d48e1a75b66d2ad38e36b718d4 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sat, 30 Aug 2025 13:13:31 -0700
Subject: [PATCH 60/74] retry spotless

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 73d13a2b9138cb5c1a200fe11254888d7a6b3557 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sun, 31 Aug 2025 11:05:44 -0700
Subject: [PATCH 61/74] retry spotless

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 329a9e67532dc04619e72f0379c7a2d5ae995ef2 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Mon, 1 Sep 2025 10:51:45 -0700
Subject: [PATCH 62/74] retry spotless

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From f6112ac92e87501b80e0d50632fb03c3e4006dde Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Tue, 2 Sep 2025 10:45:46 -0700
Subject: [PATCH 63/74] updated serialization of NonPruningSortField

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../org/opensearch/common/lucene/Lucene.java  | 22 +++++++++++++++++--
 ...runingSortedSetOrdinalsIndexFieldData.java |  4 ++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index fdb02b86e2897..a72f789844e4c 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -561,7 +561,7 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             SortField newSortField = new SortField(sortField.getField(), SortField.Type.DOUBLE);
             newSortField.setMissingValue(sortField.getMissingValue());
             sortField = newSortField;
-        } else if (sortField.getClass() == SortedSetSortField.class || (sortField instanceof NonPruningSortField)) {
+        } else if (sortField.getClass() == SortedSetSortField.class) {
             // for multi-valued sort field, we replace the SortedSetSortField with a simple SortField.
             // It works because the sort field is only used to merge results from different shards.
             SortField newSortField = new SortField(sortField.getField(), SortField.Type.STRING, sortField.getReverse());
@@ -577,9 +577,27 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             );
             newSortField.setMissingValue(sortField.getMissingValue());
             sortField = newSortField;
+        } else if (sortField instanceof NonPruningSortField) {
+            // There are 2 cases of how NonPruningSortField wraps around its underlying sort field.
+            // Which are through the SortField class or SortedSetSortField class
+            // We will serialize the sort field based on the type of underlying sort field
+            // Here the underlying sort field is SortedSetSortField, therefore, we will follow the
+            // logic in serializing SortedSetSortField.
+            NonPruningSortField nonPruningSortField = (NonPruningSortField) sortField;
+            if (nonPruningSortField.getDelegate().getClass() == SortedSetSortField.class) {
+                SortField newSortField = new SortField(
+                    nonPruningSortField.getField(),
+                    SortField.Type.STRING,
+                    nonPruningSortField.getReverse()
+                );
+                newSortField.setMissingValue(nonPruningSortField.getMissingValue());
+                sortField = newSortField;
+            }
         }
 
-        if (sortField.getClass() != SortField.class) {
+        if (sortField.getClass() != SortField.class
+            && (((sortField instanceof NonPruningSortField)
+                && (((NonPruningSortField) sortField).getDelegate().getClass() == SortField.class)) == false)) {
             throw new IllegalArgumentException("Cannot serialize SortField impl [" + sortField + "]");
         }
         if (sortField.getField() == null) {
diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
index f571d17bbe822..b0ae25f2fc3c2 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
@@ -247,5 +247,9 @@ public FieldComparator<?> getComparator(int numHits, Pruning pruning) {
             // explictly disable pruning
             return delegate.getComparator(numHits, Pruning.NONE);
         }
+
+        public SortField getDelegate() {
+            return delegate;
+        }
     }
 }

From cdf377938676c7cba9fa6a1af5f35a8ed9236a72 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Tue, 2 Sep 2025 12:20:58 -0700
Subject: [PATCH 64/74] retry for flaky

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 505ae6ea376f9f533bcbca33952b07e2fc75d00a Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Tue, 2 Sep 2025 16:09:49 -0700
Subject: [PATCH 65/74] retry for flaky

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 3dec070d83caf8938ffaa42620c4b75a02586d98 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Tue, 2 Sep 2025 21:16:16 -0700
Subject: [PATCH 66/74] updated serialization

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 ...runingSortedSetOrdinalsIndexFieldData.java | 13 +-----
 .../opensearch/common/lucene/LuceneTests.java | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
index b0ae25f2fc3c2..fb96085dbb737 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java
@@ -81,6 +81,7 @@ public NonPruningSortedSetOrdinalsIndexFieldData(
     @Override
     public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested, boolean reverse) {
         XFieldComparatorSource source = new BytesRefFieldComparatorSource(this, missingValue, sortMode, nested);
+        source.disableSkipping();
         /*
         Check if we can use a simple {@link SortedSetSortField} compatible with index sorting and
         returns a custom sort field otherwise.
@@ -230,18 +231,6 @@ public static Type readType(DataInput in) throws IOException {
             return SortField.readType(in);
         }
 
-        @Override
-        public FieldComparatorSource getComparatorSource() {
-            FieldComparatorSource source = delegate.getComparatorSource();
-            return new FieldComparatorSource() {
-                @Override
-                public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning pruning, boolean reversed) {
-                    // explictly disable pruning
-                    return source.newComparator(fieldname, numHits, Pruning.NONE, reversed);
-                }
-            };
-        }
-
         @Override
         public FieldComparator<?> getComparator(int numHits, Pruning pruning) {
             // explictly disable pruning
diff --git a/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java b/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java
index edcb7f2475693..3e9d3b72b1db2 100644
--- a/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java
+++ b/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java
@@ -77,11 +77,13 @@
 import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
 import org.opensearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
 import org.opensearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource;
 import org.opensearch.index.fielddata.fieldcomparator.FloatValuesComparatorSource;
 import org.opensearch.index.fielddata.fieldcomparator.IntValuesComparatorSource;
 import org.opensearch.index.fielddata.fieldcomparator.LongValuesComparatorSource;
+import org.opensearch.index.fielddata.plain.NonPruningSortedSetOrdinalsIndexFieldData;
 import org.opensearch.search.MultiValueMode;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.VersionUtils;
@@ -582,6 +584,44 @@ public void testSortFieldSerialization() throws IOException {
         assertEquals(sortFieldTuple.v2(), deserialized);
     }
 
+    public void testNonpruningSortFieldSerialization() throws IOException {
+        NonPruningSortedSetOrdinalsIndexFieldData fieldData = new NonPruningSortedSetOrdinalsIndexFieldData(
+            null,
+            "field",
+            null,
+            null,
+            null
+        );
+
+        SortField nonPruningSortedSetField = fieldData.sortField(null, MultiValueMode.MAX, null, true);
+        SortField expected = new SortField(
+            nonPruningSortedSetField.getField(),
+            SortField.Type.STRING,
+            nonPruningSortedSetField.getReverse()
+        );
+        expected.setMissingValue(SortField.STRING_FIRST);
+        SortField deserialized1 = copyInstance(
+            nonPruningSortedSetField,
+            EMPTY_REGISTRY,
+            Lucene::writeSortField,
+            Lucene::readSortField,
+            VersionUtils.randomVersion(random())
+        );
+        assertEquals(expected, deserialized1);
+
+        SortField nonPruningSortField = fieldData.sortField(SortField.STRING_FIRST, MultiValueMode.SUM, null, true);
+        XFieldComparatorSource source = new BytesRefFieldComparatorSource(null, SortField.STRING_FIRST, MultiValueMode.SUM, null);
+        expected = new SortField(nonPruningSortField.getField(), source.reducedType(), nonPruningSortField.getReverse());
+        SortField deserialized2 = copyInstance(
+            nonPruningSortField,
+            EMPTY_REGISTRY,
+            Lucene::writeSortField,
+            Lucene::readSortField,
+            VersionUtils.randomVersion(random())
+        );
+        assertEquals(expected, deserialized2);
+    }
+
     public void testSortValueSerialization() throws IOException {
         Object sortValue = randomSortValue();
         Object deserialized = copyInstance(

From 5c80ab330f03e69596d36739d5ab07c9049e1294 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Tue, 2 Sep 2025 21:23:27 -0700
Subject: [PATCH 67/74] test coverage

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>
---
 .../main/java/org/opensearch/common/lucene/Lucene.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index a72f789844e4c..0de73245ab95b 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -582,7 +582,7 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
             // Which are through the SortField class or SortedSetSortField class
             // We will serialize the sort field based on the type of underlying sort field
             // Here the underlying sort field is SortedSetSortField, therefore, we will follow the
-            // logic in serializing SortedSetSortField.
+            // logic in serializing SortedSetSortField and also unwrap the SortField case.
             NonPruningSortField nonPruningSortField = (NonPruningSortField) sortField;
             if (nonPruningSortField.getDelegate().getClass() == SortedSetSortField.class) {
                 SortField newSortField = new SortField(
@@ -592,12 +592,12 @@ public static void writeSortField(StreamOutput out, SortField sortField) throws
                 );
                 newSortField.setMissingValue(nonPruningSortField.getMissingValue());
                 sortField = newSortField;
+            } else if (nonPruningSortField.getDelegate().getClass() == SortField.class) {
+                sortField = nonPruningSortField.getDelegate();
             }
         }
 
-        if (sortField.getClass() != SortField.class
-            && (((sortField instanceof NonPruningSortField)
-                && (((NonPruningSortField) sortField).getDelegate().getClass() == SortField.class)) == false)) {
+        if (sortField.getClass() != SortField.class) {
             throw new IllegalArgumentException("Cannot serialize SortField impl [" + sortField + "]");
         }
         if (sortField.getField() == null) {

From 04b2a72dd5717d9776a6c0e11017804f669914b6 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 3 Sep 2025 09:08:30 -0700
Subject: [PATCH 68/74] retry for flaky

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From c1f59b6deca6b96b20d4b5fc8e9cb8a2320a86ec Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 3 Sep 2025 11:04:25 -0700
Subject: [PATCH 69/74] retry for flaky

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 91ca440b086f6c84f4ced3901c96dbc72516306d Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 3 Sep 2025 12:34:34 -0700
Subject: [PATCH 70/74] retry for flaky

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From f033417048529c9d0578a174772f18171d498c58 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Wed, 3 Sep 2025 20:18:55 -0700
Subject: [PATCH 71/74] retry for flaky

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From e55207c3e550fdee8fa761414a70a216c9b03b50 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Fri, 5 Sep 2025 10:16:32 -0700
Subject: [PATCH 72/74] retry for flaky

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From 07eeca3ce0dc62eb4f5866fb28c7896fc0aa1f6f Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sat, 6 Sep 2025 12:30:57 -0700
Subject: [PATCH 73/74] retry for flaky

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

From c205ff4117441156c1e4c650b7f294ad4b153836 Mon Sep 17 00:00:00 2001
From: Anthony Leong <aj.leong623@gmail.com>
Date: Sat, 6 Sep 2025 17:28:22 -0700
Subject: [PATCH 74/74] retry for flaky

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>