Skip to content

Commit 666bece

Browse files
Upgrade to Lucene 8.10.1 release (#79385)
This also enables sort optimization in search_after and scroll requests that was disabled in #78285
1 parent a693f98 commit 666bece

File tree

51 files changed

+28
-40
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+28
-40
lines changed

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 7.16.0
2-
lucene = 8.10.0
2+
lucene = 8.10.1
33

44
bundled_jdk_vendor = adoptium
55
bundled_jdk = 17+35

docs/Versions.asciidoc

Lines changed: 2 additions & 2 deletions

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
24932a4be7064a99126d80776718845b356abae0

modules/legacy-geo/licenses/lucene-spatial-extras-8.10.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7a3b6eac3e66bb1c6fb05c0cd980e5592adaf96b

plugins/analysis-icu/licenses/lucene-analyzers-icu-8.10.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a1eec256a25340ba5d432d2800f759db83eb5145

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.10.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d9ff6329a9755bbdb7343452bf246e61ae9279d8

plugins/analysis-nori/licenses/lucene-analyzers-nori-8.10.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6e78aef6d1b709ed3e27dbc949255e078da08d41

plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.10.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c186bf6dd0c2fa6612ba9b0d785ff2d388d32a23

plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.10.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ebda1884c24bb14ee451b98e7565c86966f8863d

plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.10.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2a4bd86c96374cdc5acaf7c0efd5127f2fd3a519

plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.10.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
09de2e3fa72355228b2723f958dcb0ec1bc3f31a

server/licenses/lucene-analyzers-common-8.10.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
23bb36a98d01100953674c56c20861b29b5a5175

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7399c32bc4ba7e37e14a9660ffd7962acf68a802

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deb78f6b21d29f964ab267ad59fafb58ef740101

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7b91bb886d30c67a8f980d3bdfd6b7826a62d5e7

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ec4a2103cb300aab7e6142f1c7778dd505ecb8e2

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
aa368e9d11660dcfcfaab1a39dd871f05fa2b031

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9de18bf605879647e964fd57ddf3fa6f85ca743e

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e9cca86ebbe010d375388c5a17216e2d2b2e76bb

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
21b70a0996e3408291514d99e3b03800d0bcd657

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
087f52ee3f72f387b802c49a96e4a14b3b05dd21

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
82b15ef61297e6d7b0c1f6c37c502d6b77a82f1e

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
823a5e9d2fd3b5b668d305e0781d0e074e9f2ebb

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
92d7e5a178d0df58e0b4d400755ac46bae3eea11

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
161161
public static final Version V_7_15_0 = new Version(7150099, org.apache.lucene.util.Version.LUCENE_8_9_0);
162162
public static final Version V_7_15_1 = new Version(7150199, org.apache.lucene.util.Version.LUCENE_8_9_0);
163163
public static final Version V_7_15_2 = new Version(7150299, org.apache.lucene.util.Version.LUCENE_8_9_0);
164-
public static final Version V_7_16_0 = new Version(7160099, org.apache.lucene.util.Version.LUCENE_8_10_0);
164+
public static final Version V_7_16_0 = new Version(7160099, org.apache.lucene.util.Version.LUCENE_8_10_1);
165165
public static final Version CURRENT = V_7_16_0;
166166

167167
private static final ImmutableOpenIntMap<Version> idToVersion;

server/src/main/java/org/elasticsearch/search/query/QueryPhase.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -286,16 +286,6 @@ private static void optimizeNumericSort(SearchContext searchContext, IndexReader
286286
// For sort optimization SortField.Type must match with the type of indexed points (Type.LONG and LongPoint)
287287
// Some fields there is no match (e.g. integer field uses SortField.Type.LONG, but indexed as IntegerPoint)
288288
if ((fieldType.typeName().equals("long") == false) && (fieldType instanceof DateFieldMapper.DateFieldType == false)) return;
289-
290-
// TODO: Enable the sort optimization with point for search_after and scroll requests when LUCENE-10119 is integrated.
291-
if (searchContext.sort() != null && searchContext.sort().sort.getSort().length == 1) {
292-
if (searchContext.searchAfter() != null) {
293-
return;
294-
}
295-
if (searchContext.scrollContext() != null && searchContext.scrollContext().lastEmittedDoc != null) {
296-
return;
297-
}
298-
}
299289
sortField.setCanUsePoints();
300290
}
301291

server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -740,12 +740,10 @@ public void testNumericSortOptimization() throws Exception {
740740
searchContext.trackTotalHitsUpTo(10);
741741
searchContext.setSize(10);
742742
QueryPhase.executeInternal(searchContext);
743-
assertFalse(searchContext.sort().sort.getSort()[0].getCanUsePoints());
744743
final TopDocs topDocs = searchContext.queryResult().topDocs().topDocs;
745744
long firstResult = (long) ((FieldDoc) topDocs.scoreDocs[0]).fields[0];
746745
assertThat(firstResult, greaterThan(afterValue));
747-
assertThat(topDocs.totalHits.value, equalTo((long)numDocs));
748-
// assertSortResults(topDocs, numDocs, false);
746+
assertSortResults(topDocs, numDocs, false);
749747
}
750748

751749
// 3. Test sort optimization on long field + date field

x-pack/plugin/sql/sql-action/licenses/lucene-core-8.10.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deb78f6b21d29f964ab267ad59fafb58ef740101

0 commit comments

Comments
 (0)