diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index d63ff1c3cda3..d2f15edb732f 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,5 +1,5 @@ elasticsearch = 8.2.0 -lucene = 9.1.0-snapshot-1336263051c +lucene = 9.1.0-snapshot-9497524cc2d bundled_jdk_vendor = adoptium bundled_jdk = 17.0.2+8 diff --git a/modules/lang-expression/licenses/lucene-expressions-9.1.0-snapshot-1336263051c.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.1.0-snapshot-1336263051c.jar.sha1 deleted file mode 100644 index 8ebc1580cc2b..000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-9.1.0-snapshot-1336263051c.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d7d416323284b166af4eb020987f4abdd9433344 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-9.1.0-snapshot-9497524cc2d.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.1.0-snapshot-9497524cc2d.jar.sha1 new file mode 100644 index 000000000000..07aaa7e512b5 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-9.1.0-snapshot-9497524cc2d.jar.sha1 @@ -0,0 +1 @@ +fb9c3a9c5e21880bc9add56283f1a78be6000021 \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.1.0-snapshot-1336263051c.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.1.0-snapshot-1336263051c.jar.sha1 deleted file mode 100644 index 8a0a2a31a411..000000000000 --- a/modules/legacy-geo/licenses/lucene-spatial-extras-9.1.0-snapshot-1336263051c.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2bc7d3e319fd7d7e4f43ab1f559a0efc4881545d \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.1.0-snapshot-9497524cc2d.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.1.0-snapshot-9497524cc2d.jar.sha1 new file mode 100644 index 000000000000..3d672886420c --- /dev/null +++ b/modules/legacy-geo/licenses/lucene-spatial-extras-9.1.0-snapshot-9497524cc2d.jar.sha1 @@ -0,0 +1 @@ +c50b37f391320adb572fbd3109953d36eddffb88 \ No newline at end of file diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java index 0ec4c0c79c3e..d877db6a7ff3 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java @@ -22,6 +22,7 @@ import org.elasticsearch.Version; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; +import org.elasticsearch.common.lucene.search.NoRewriteMatchNoDocsQuery; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.index.fielddata.IndexOrdinalsFieldData; import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; @@ -425,7 +426,7 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder indexer.indexShape(polygon)); - assertEquals("Unable to Tessellate shape. Possible malformed shape detected.", e.getMessage()); + assertEquals("at least three non-collinear points required", e.getMessage()); } private XContentBuilder polygon(Boolean orientation, double... val) throws IOException { diff --git a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java index bd50e1a8ba56..4e416b3f5dfd 100644 --- a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java +++ b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java @@ -12,7 +12,6 @@ import com.carrotsearch.hppc.IntArrayList; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.FilterDirectoryReader; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.search.ConstantScoreQuery; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.AlreadyClosedException; import org.elasticsearch.ElasticsearchException; @@ -42,7 +41,6 @@ import org.elasticsearch.cluster.routing.TestShardRouting; import org.elasticsearch.common.Strings; import org.elasticsearch.common.UUIDs; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.AbstractRefCounted; import org.elasticsearch.core.TimeValue; @@ -1138,10 +1136,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { mapping.endObject().endObject(); createIndex("test", Settings.EMPTY, mapping); - withAggregationContext( - "test", - context -> assertThat(context.query(), equalTo(new ConstantScoreQuery(Queries.newNonNestedFilter()))) - ); + withAggregationContext("test", context -> assertThat(context.query(), equalTo(new MatchAllDocsQuery()))); } /** diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java index 8abd4f748ae9..8a516c5c9c99 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java @@ -1296,6 +1296,8 @@ public class FiltersAggregatorTests extends AggregatorTestCase { for (int i = 0; i < 10; i++) { iw.addDocument(buildDocWithField.apply(i)); } + // Create a document without the field to prever DocValueFieldExists from being rewritten to MatchAll + iw.addDocument(List.of()); }, (InternalFilters result, Class impl, Map> debug) -> { assertThat(result.getBuckets(), hasSize(1)); assertThat(result.getBucketByKey("q1").getDocCount(), equalTo(10L)); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/frozen/RewriteCachingDirectoryReader.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/frozen/RewriteCachingDirectoryReader.java index 1364e3045336..a3f081882b09 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/frozen/RewriteCachingDirectoryReader.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/frozen/RewriteCachingDirectoryReader.java @@ -217,7 +217,7 @@ final class RewriteCachingDirectoryReader extends DirectoryReader { } @Override - public TopDocs searchNearestVectors(String field, float[] target, int k, Bits acceptDocs) throws IOException { + public TopDocs searchNearestVectors(String field, float[] target, int k, Bits acceptDocs, int visitedLimit) throws IOException { throw new UnsupportedOperationException(); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java index 1c482a1228fc..38e4fd274060 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java @@ -283,8 +283,8 @@ public final class FieldSubsetReader extends SequentialStoredFieldsLeafReader { } @Override - public TopDocs searchNearestVectors(String field, float[] target, int k, Bits acceptDocs) throws IOException { - return hasField(field) ? super.searchNearestVectors(field, target, k, acceptDocs) : null; + public TopDocs searchNearestVectors(String field, float[] target, int k, Bits acceptDocs, int visitedLimit) throws IOException { + return hasField(field) ? super.searchNearestVectors(field, target, k, acceptDocs, visitedLimit) : null; } // we share core cache keys (for e.g. fielddata) diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java index a5250d0b74e5..a7bf7b8e4f02 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java @@ -203,13 +203,13 @@ public class FieldSubsetReaderTests extends ESTestCase { assertEquals(0, vectorValues.nextDoc()); assertNotNull(vectorValues.binaryValue()); - TopDocs topDocs = leafReader.searchNearestVectors("fieldA", new float[] { 1.0f, 1.0f, 1.0f }, 5, null); + TopDocs topDocs = leafReader.searchNearestVectors("fieldA", new float[] { 1.0f, 1.0f, 1.0f }, 5, null, Integer.MAX_VALUE); assertNotNull(topDocs); assertEquals(1, topDocs.scoreDocs.length); // Check that we can't see fieldB assertNull(leafReader.getVectorValues("fieldB")); - assertNull(leafReader.searchNearestVectors("fieldB", new float[] { 1.0f, 1.0f, 1.0f }, 5, null)); + assertNull(leafReader.searchNearestVectors("fieldB", new float[] { 1.0f, 1.0f, 1.0f }, 5, null, Integer.MAX_VALUE)); TestUtil.checkReader(ir); IOUtils.close(ir, iw, dir); diff --git a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.1.0-snapshot-1336263051c.jar.sha1 b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.1.0-snapshot-1336263051c.jar.sha1 deleted file mode 100644 index 2d63162a68df..000000000000 --- a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.1.0-snapshot-1336263051c.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0a60981b470cb004c8a1fa6264d7714fa7ba6acb \ No newline at end of file diff --git a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.1.0-snapshot-9497524cc2d.jar.sha1 b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.1.0-snapshot-9497524cc2d.jar.sha1 new file mode 100644 index 000000000000..2e184e74cfb9 --- /dev/null +++ b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.1.0-snapshot-9497524cc2d.jar.sha1 @@ -0,0 +1 @@ +5e3f60736f5fa8e665c906326b659d4246c15c49 \ No newline at end of file