Revert "Update Apache Lucene to 9.6.0 (opensearch-project#7505) (open…

…search-project#7510)"

This reverts commit 7ed1e69.

buildSrc/version.properties

@@ -1,5 +1,5 @@
 opensearch        = 2.8.0
-lucene            = 9.6.0
+lucene            = 9.5.0
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17.0.7+7

libs/core/licenses/lucene-core-9.5.0.jar.sha1

@@ -0,0 +1 @@
+bba4ba5d30e71a5f0017e45e8469db8cff8ad102

modules/lang-expression/licenses/lucene-expressions-9.5.0.jar.sha1

@@ -0,0 +1 @@
+62f3d3630ecc14069d5c24b9693df5a2787f8202

modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldTypeTests.java

@@ -138,10 +138,7 @@ public void testPrefixQuery() {
 
         // this term should be too long to be rewriteable to a term query on the prefix field
         final String longTerm = "toolongforourprefixfieldthistermis";
-        assertThat(
-            fieldType.prefixQuery(longTerm, CONSTANT_SCORE_REWRITE, MOCK_QSC),
-            equalTo(new PrefixQuery(new Term(NAME, longTerm), CONSTANT_SCORE_REWRITE))
-        );
+        assertThat(fieldType.prefixQuery(longTerm, CONSTANT_SCORE_REWRITE, MOCK_QSC), equalTo(new PrefixQuery(new Term(NAME, longTerm))));
 
         OpenSearchException ee = expectThrows(
             OpenSearchException.class,

modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java

@@ -36,6 +36,7 @@
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.ConstantScoreQuery;
 import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermInSetQuery;
@@ -49,7 +50,9 @@
 import org.opensearch.common.compress.CompressedXContent;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.index.mapper.IdFieldMapper;
 import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.mapper.Uid;
 import org.opensearch.index.query.IdsQueryBuilder;
 import org.opensearch.index.query.InnerHitBuilder;
 import org.opensearch.index.query.InnerHitContextBuilder;
@@ -304,9 +307,16 @@ static void assertLateParsingQuery(Query query, String type, String id) throws I
         assertThat(booleanQuery.clauses().get(0).getQuery(), instanceOf(TermInSetQuery.class));
         TermInSetQuery termsQuery = (TermInSetQuery) booleanQuery.clauses().get(0).getQuery();
         Query rewrittenTermsQuery = termsQuery.rewrite(null);
-        // The query is of type MultiTermQueryConstantScoreBlendedWrapper and is sealed inside Apache Lucene,
-        // no access to inner queries without using the reflection, falling back to stringified query comparison
-        assertThat(rewrittenTermsQuery.toString(), equalTo("_id:([ff 69 64])"));
+        assertThat(rewrittenTermsQuery, instanceOf(ConstantScoreQuery.class));
+        ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) rewrittenTermsQuery;
+        assertThat(constantScoreQuery.getQuery(), instanceOf(BooleanQuery.class));
+        BooleanQuery booleanTermsQuery = (BooleanQuery) constantScoreQuery.getQuery();
+        assertThat(booleanTermsQuery.clauses().toString(), booleanTermsQuery.clauses().size(), equalTo(1));
+        assertThat(booleanTermsQuery.clauses().get(0).getOccur(), equalTo(BooleanClause.Occur.SHOULD));
+        assertThat(booleanTermsQuery.clauses().get(0).getQuery(), instanceOf(TermQuery.class));
+        TermQuery termQuery = (TermQuery) booleanTermsQuery.clauses().get(0).getQuery();
+        assertThat(termQuery.getTerm().field(), equalTo(IdFieldMapper.NAME));
+        assertThat(termQuery.getTerm().bytes(), equalTo(Uid.encodeId(id)));
         // check the type filter
         assertThat(booleanQuery.clauses().get(1).getOccur(), equalTo(BooleanClause.Occur.FILTER));
         assertEquals(new TermQuery(new Term("join_field", type)), booleanQuery.clauses().get(1).getQuery());

plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0.jar.sha1

@@ -0,0 +1 @@
+11c816250e4ff106151fd8cb69e61ead4fb4a8dd

plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0.jar.sha1

@@ -0,0 +1 @@
+4555fc64ce9d63c6c1f4983e816526f896606e9f

plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0.jar.sha1

@@ -0,0 +1 @@
+2fd55607da8adf8234169d9f4120119c05a8175c

plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0.jar.sha1

@@ -0,0 +1 @@
+c97163035f1d46249505d15fbdc427b6ae03549a

plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0.jar.sha1

@@ -0,0 +1 @@
+a08ae3e2212837c98d5e1174cf1a293a5c8c0373

plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0.jar.sha1

@@ -0,0 +1 @@
+483906d2ebad0ff910d52382c2f027b511788b58

plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0.jar.sha1

@@ -0,0 +1 @@
+cb00cd193e2f927e6357cf33e0880034571ea528

server/licenses/lucene-analysis-common-9.5.0.jar.sha1

@@ -0,0 +1 @@
+f68660102455a466f98cac0501723bed7e7c6407

server/licenses/lucene-backward-codecs-9.5.0.jar.sha1

@@ -0,0 +1 @@
+66be22239d5058b0b8a8aeba03dc047a276efafa

server/licenses/lucene-core-9.5.0.jar.sha1

@@ -0,0 +1 @@
+bba4ba5d30e71a5f0017e45e8469db8cff8ad102

server/licenses/lucene-grouping-9.5.0.jar.sha1

@@ -0,0 +1 @@
+b15fe0a55a82168c810d0447ec2e244d16d94f01

server/licenses/lucene-highlighter-9.5.0.jar.sha1

@@ -0,0 +1 @@
+8b5e3cea3370838bda1d730cf55176c24a763d2e

server/licenses/lucene-join-9.5.0.jar.sha1

@@ -0,0 +1 @@
+85a4208614a5660297effce441883687b010073b

server/licenses/lucene-memory-9.5.0.jar.sha1

@@ -0,0 +1 @@
+d632e63d08837be715046c8ccb4fb804acd3d7e4

server/licenses/lucene-misc-9.5.0.jar.sha1

@@ -0,0 +1 @@
+64773801b8ba8141f4256d22da598de40d6f3033

server/licenses/lucene-queries-9.5.0.jar.sha1

@@ -0,0 +1 @@
+ae7930fa0ea91198905d695a222ef7f09de1c2dd

server/licenses/lucene-queryparser-9.5.0.jar.sha1

@@ -0,0 +1 @@
+b3e3d9434bcfce242e242364c64eab0888d285e2

server/licenses/lucene-sandbox-9.5.0.jar.sha1

@@ -0,0 +1 @@
+408be287b0f421cf8afd655579a0cc65aba61b28

server/licenses/lucene-spatial-extras-9.5.0.jar.sha1

@@ -0,0 +1 @@
+4960c09365d20f024bf668f60d7c3b4e54f03750

server/licenses/lucene-spatial3d-9.5.0.jar.sha1

@@ -0,0 +1 @@
+01ed55dd384e654076b76d7083feee6ac3efe02b

server/licenses/lucene-suggest-9.5.0.jar.sha1

@@ -0,0 +1 @@
+195624eb3a09b3dc37cc5fa51ae2f7bd61553985

server/src/main/java/org/opensearch/Version.java

@@ -114,7 +114,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_7_0 = new Version(2070099, org.apache.lucene.util.Version.LUCENE_9_5_0);
     public static final Version V_2_7_1 = new Version(2070199, org.apache.lucene.util.Version.LUCENE_9_5_0);
 
-    public static final Version V_2_8_0 = new Version(2080099, org.apache.lucene.util.Version.LUCENE_9_6_0);
+    public static final Version V_2_8_0 = new Version(2080099, org.apache.lucene.util.Version.LUCENE_9_5_0);
     public static final Version CURRENT = V_2_8_0;
 
     public static Version readVersion(StreamInput in) throws IOException {

server/src/main/java/org/opensearch/index/mapper/BinaryFieldMapper.java

@@ -32,9 +32,7 @@
 
 package org.opensearch.index.mapper;
 
-import org.apache.lucene.document.InvertableType;
 import org.apache.lucene.document.StoredField;
-import org.apache.lucene.document.StoredValue;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.OpenSearchException;
@@ -275,15 +273,5 @@ public BytesRef binaryValue() {
             }
 
         }
-
-        @Override
-        public StoredValue storedValue() {
-            return null;
-        }
-
-        @Override
-        public InvertableType invertableType() {
-            return InvertableType.BINARY;
-        }
     }
 }

server/src/main/java/org/opensearch/index/mapper/RangeFieldMapper.java

@@ -32,8 +32,6 @@
 
 package org.opensearch.index.mapper;
 
-import org.apache.lucene.document.InvertableType;
-import org.apache.lucene.document.StoredValue;
 import org.apache.lucene.search.BoostQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.BytesRef;
@@ -668,15 +666,5 @@ public BytesRef binaryValue() {
                 throw new OpenSearchException("failed to encode ranges", e);
             }
         }
-
-        @Override
-        public StoredValue storedValue() {
-            return null;
-        }
-
-        @Override
-        public InvertableType invertableType() {
-            return InvertableType.BINARY;
-        }
     }
 }

server/src/test/java/org/opensearch/deps/lucene/VectorHighlighterTests.java

@@ -111,10 +111,7 @@ public void testVectorHighlighterPrefixQuery() throws Exception {
         FastVectorHighlighter highlighter = new FastVectorHighlighter();
 
         PrefixQuery prefixQuery = new PrefixQuery(new Term("content", "ba"));
-        assertThat(
-            prefixQuery.getRewriteMethod().getClass().getName(),
-            equalTo(PrefixQuery.CONSTANT_SCORE_BLENDED_REWRITE.getClass().getName())
-        );
+        assertThat(prefixQuery.getRewriteMethod().getClass().getName(), equalTo(PrefixQuery.CONSTANT_SCORE_REWRITE.getClass().getName()));
         String fragment = highlighter.getBestFragment(
             highlighter.getFieldQuery(prefixQuery),
             reader,
@@ -131,10 +128,7 @@ public void testVectorHighlighterPrefixQuery() throws Exception {
 
         // now check with the custom field query
         prefixQuery = new PrefixQuery(new Term("content", "ba"));
-        assertThat(
-            prefixQuery.getRewriteMethod().getClass().getName(),
-            equalTo(PrefixQuery.CONSTANT_SCORE_BLENDED_REWRITE.getClass().getName())
-        );
+        assertThat(prefixQuery.getRewriteMethod().getClass().getName(), equalTo(PrefixQuery.CONSTANT_SCORE_REWRITE.getClass().getName()));
         fragment = highlighter.getBestFragment(
             new CustomFieldQuery(prefixQuery, reader, highlighter),
             reader,

server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java

@@ -40,7 +40,6 @@
 import org.apache.logging.log4j.core.appender.AbstractAppender;
 import org.apache.logging.log4j.core.filter.RegexFilter;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.KeywordField;
 import org.apache.lucene.document.LongPoint;
 import org.apache.lucene.document.NumericDocValuesField;
 import org.apache.lucene.document.StoredField;
@@ -51,7 +50,6 @@
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.index.IndexableFieldType;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.LiveIndexWriterConfig;
@@ -123,7 +121,6 @@
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.VersionType;
 import org.opensearch.index.codec.CodecService;
-import org.opensearch.index.engine.Engine.IndexResult;
 import org.opensearch.index.fieldvisitor.FieldsVisitor;
 import org.opensearch.index.mapper.IdFieldMapper;
 import org.opensearch.index.mapper.ParseContext;
@@ -3948,28 +3945,27 @@ public void testHandleDocumentFailure() throws Exception {
                 assertNotNull(indexResult.getTranslogLocation());
                 engine.index(indexForDoc(doc2));
 
-                try (engine) {
-                    // test non document level failure is thrown
-                    if (randomBoolean()) {
-                        // simulate close by corruption
-                        throwingIndexWriter.get().setThrowFailure(null);
+                // test non document level failure is thrown
+                if (randomBoolean()) {
+                    // simulate close by corruption
+                    throwingIndexWriter.get().setThrowFailure(null);
+                    UncheckedIOException uncheckedIOException = expectThrows(UncheckedIOException.class, () -> {
                         Engine.Index index = indexForDoc(doc3);
-                        index.parsedDoc().rootDoc().add(new KeywordField("foo", "bar", org.apache.lucene.document.Field.Store.YES) {
+                        index.parsedDoc().rootDoc().add(new StoredField("foo", "bar") {
                             // this is a hack to add a failure during store document which triggers a tragic event
                             // and in turn fails the engine
                             @Override
                             public BytesRef binaryValue() {
                                 throw new UncheckedIOException(new MockDirectoryWrapper.FakeIOException());
                             }
                         });
-
-                        final IndexResult r = engine.index(index);
-                        assertThat(r.isCreated(), equalTo(false));
-                        assertThat(r.getFailure(), instanceOf(UncheckedIOException.class));
-                        assertThat(r.getFailure().getCause(), instanceOf(MockDirectoryWrapper.FakeIOException.class));
-                    }
+                        engine.index(index);
+                    });
+                    assertTrue(uncheckedIOException.getCause() instanceof MockDirectoryWrapper.FakeIOException);
+                } else {
+                    // normal close
+                    engine.close();
                 }
-
                 // now the engine is closed check we respond correctly
                 expectThrows(AlreadyClosedException.class, () -> engine.index(indexForDoc(doc1)));
                 expectThrows(AlreadyClosedException.class, () -> engine.delete(new Engine.Delete("", newUid(doc1), primaryTerm.get())));
@@ -4000,7 +3996,7 @@ public ParsedDocument newDeleteTombstoneDoc(String id) {
                         // this is a hack to add a failure during store document which triggers a tragic event
                         // and in turn fails the engine
                         @Override
-                        public IndexableFieldType fieldType() {
+                        public BytesRef binaryValue() {
                             throw tragicException;
                         }
                     });