elastic · mayya-sharipova · Oct 18, 2021 · Oct 18, 2021 · Oct 18, 2021 · Oct 18, 2021
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 7.16.0
-lucene            = 8.10.0
+lucene            = 8.10.1
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17+35

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        8.10.0
-:lucene_version_path:   8_10_0
+:lucene_version:        8.10.1
+:lucene_version_path:   8_10_1
 :jdk:                   1.8.0_131
 :jdk_major:             8
 :build_flavor:          default

diff --git a/modules/lang-expression/licenses/lucene-expressions-8.10.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.10.0.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.10.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.10.1.jar.sha1
@@ -0,0 +1 @@
+24932a4be7064a99126d80776718845b356abae0
diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-8.10.0.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-8.10.0.jar.sha1
diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-8.10.1.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-8.10.1.jar.sha1
@@ -0,0 +1 @@
+7a3b6eac3e66bb1c6fb05c0cd980e5592adaf96b
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.10.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.10.0.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.10.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.10.1.jar.sha1
@@ -0,0 +1 @@
+a1eec256a25340ba5d432d2800f759db83eb5145
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.10.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.10.0.jar.sha1
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.10.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.10.1.jar.sha1
@@ -0,0 +1 @@
+d9ff6329a9755bbdb7343452bf246e61ae9279d8
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.10.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.10.0.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.10.1.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.10.1.jar.sha1
@@ -0,0 +1 @@
+6e78aef6d1b709ed3e27dbc949255e078da08d41
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.10.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.10.0.jar.sha1
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.10.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.10.1.jar.sha1
@@ -0,0 +1 @@
+c186bf6dd0c2fa6612ba9b0d785ff2d388d32a23
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.10.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.10.0.jar.sha1
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.10.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.10.1.jar.sha1
@@ -0,0 +1 @@
+ebda1884c24bb14ee451b98e7565c86966f8863d
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.10.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.10.0.jar.sha1
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.10.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.10.1.jar.sha1
@@ -0,0 +1 @@
+2a4bd86c96374cdc5acaf7c0efd5127f2fd3a519
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.10.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.10.0.jar.sha1
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.10.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.10.1.jar.sha1
@@ -0,0 +1 @@
+09de2e3fa72355228b2723f958dcb0ec1bc3f31a
diff --git a/server/licenses/lucene-analyzers-common-8.10.0.jar.sha1 b/server/licenses/lucene-analyzers-common-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-analyzers-common-8.10.1.jar.sha1 b/server/licenses/lucene-analyzers-common-8.10.1.jar.sha1
@@ -0,0 +1 @@
+23bb36a98d01100953674c56c20861b29b5a5175
diff --git a/server/licenses/lucene-backward-codecs-8.10.0.jar.sha1 b/server/licenses/lucene-backward-codecs-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-8.10.1.jar.sha1 b/server/licenses/lucene-backward-codecs-8.10.1.jar.sha1
@@ -0,0 +1 @@
+7399c32bc4ba7e37e14a9660ffd7962acf68a802
diff --git a/server/licenses/lucene-core-8.10.0.jar.sha1 b/server/licenses/lucene-core-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-core-8.10.1.jar.sha1 b/server/licenses/lucene-core-8.10.1.jar.sha1
@@ -0,0 +1 @@
+deb78f6b21d29f964ab267ad59fafb58ef740101
diff --git a/server/licenses/lucene-grouping-8.10.0.jar.sha1 b/server/licenses/lucene-grouping-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-grouping-8.10.1.jar.sha1 b/server/licenses/lucene-grouping-8.10.1.jar.sha1
@@ -0,0 +1 @@
+7b91bb886d30c67a8f980d3bdfd6b7826a62d5e7
diff --git a/server/licenses/lucene-highlighter-8.10.0.jar.sha1 b/server/licenses/lucene-highlighter-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-highlighter-8.10.1.jar.sha1 b/server/licenses/lucene-highlighter-8.10.1.jar.sha1
@@ -0,0 +1 @@
+ec4a2103cb300aab7e6142f1c7778dd505ecb8e2
diff --git a/server/licenses/lucene-join-8.10.0.jar.sha1 b/server/licenses/lucene-join-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-join-8.10.1.jar.sha1 b/server/licenses/lucene-join-8.10.1.jar.sha1
@@ -0,0 +1 @@
+aa368e9d11660dcfcfaab1a39dd871f05fa2b031
diff --git a/server/licenses/lucene-memory-8.10.0.jar.sha1 b/server/licenses/lucene-memory-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-memory-8.10.1.jar.sha1 b/server/licenses/lucene-memory-8.10.1.jar.sha1
@@ -0,0 +1 @@
+9de18bf605879647e964fd57ddf3fa6f85ca743e
diff --git a/server/licenses/lucene-misc-8.10.0.jar.sha1 b/server/licenses/lucene-misc-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-misc-8.10.1.jar.sha1 b/server/licenses/lucene-misc-8.10.1.jar.sha1
@@ -0,0 +1 @@
+e9cca86ebbe010d375388c5a17216e2d2b2e76bb
diff --git a/server/licenses/lucene-queries-8.10.0.jar.sha1 b/server/licenses/lucene-queries-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-queries-8.10.1.jar.sha1 b/server/licenses/lucene-queries-8.10.1.jar.sha1
@@ -0,0 +1 @@
+21b70a0996e3408291514d99e3b03800d0bcd657
diff --git a/server/licenses/lucene-queryparser-8.10.0.jar.sha1 b/server/licenses/lucene-queryparser-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-queryparser-8.10.1.jar.sha1 b/server/licenses/lucene-queryparser-8.10.1.jar.sha1
@@ -0,0 +1 @@
+087f52ee3f72f387b802c49a96e4a14b3b05dd21
diff --git a/server/licenses/lucene-sandbox-8.10.0.jar.sha1 b/server/licenses/lucene-sandbox-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-sandbox-8.10.1.jar.sha1 b/server/licenses/lucene-sandbox-8.10.1.jar.sha1
@@ -0,0 +1 @@
+82b15ef61297e6d7b0c1f6c37c502d6b77a82f1e
diff --git a/server/licenses/lucene-spatial3d-8.10.0.jar.sha1 b/server/licenses/lucene-spatial3d-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-8.10.1.jar.sha1 b/server/licenses/lucene-spatial3d-8.10.1.jar.sha1
@@ -0,0 +1 @@
+823a5e9d2fd3b5b668d305e0781d0e074e9f2ebb
diff --git a/server/licenses/lucene-suggest-8.10.0.jar.sha1 b/server/licenses/lucene-suggest-8.10.0.jar.sha1
diff --git a/server/licenses/lucene-suggest-8.10.1.jar.sha1 b/server/licenses/lucene-suggest-8.10.1.jar.sha1
@@ -0,0 +1 @@
+92d7e5a178d0df58e0b4d400755ac46bae3eea11
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
@@ -161,7 +161,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_7_15_0 = new Version(7150099, org.apache.lucene.util.Version.LUCENE_8_9_0);
     public static final Version V_7_15_1 = new Version(7150199, org.apache.lucene.util.Version.LUCENE_8_9_0);
     public static final Version V_7_15_2 = new Version(7150299, org.apache.lucene.util.Version.LUCENE_8_9_0);
-    public static final Version V_7_16_0 = new Version(7160099, org.apache.lucene.util.Version.LUCENE_8_10_0);
+    public static final Version V_7_16_0 = new Version(7160099, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version CURRENT = V_7_16_0;
 
     private static final ImmutableOpenIntMap<Version> idToVersion;

diff --git a/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java b/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java
@@ -286,16 +286,6 @@ private static void optimizeNumericSort(SearchContext searchContext, IndexReader
         // For sort optimization SortField.Type must match with the type of indexed points (Type.LONG and LongPoint)
         // Some fields there is no match (e.g. integer field uses SortField.Type.LONG, but indexed as IntegerPoint)
         if ((fieldType.typeName().equals("long") == false) && (fieldType instanceof DateFieldMapper.DateFieldType == false)) return;
-
-        // TODO: Enable the sort optimization with point for search_after and scroll requests when LUCENE-10119 is integrated.
-        if (searchContext.sort() != null && searchContext.sort().sort.getSort().length == 1) {
-            if (searchContext.searchAfter() != null) {
-                return;
-            }
-            if (searchContext.scrollContext() != null && searchContext.scrollContext().lastEmittedDoc != null) {
-                return;
-            }
-        }
         sortField.setCanUsePoints();
     }
 

diff --git a/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java b/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java
@@ -740,12 +740,10 @@ public void testNumericSortOptimization() throws Exception {
             searchContext.trackTotalHitsUpTo(10);
             searchContext.setSize(10);
             QueryPhase.executeInternal(searchContext);
-            assertFalse(searchContext.sort().sort.getSort()[0].getCanUsePoints());
             final TopDocs topDocs = searchContext.queryResult().topDocs().topDocs;
             long firstResult = (long) ((FieldDoc) topDocs.scoreDocs[0]).fields[0];
             assertThat(firstResult, greaterThan(afterValue));
-            assertThat(topDocs.totalHits.value, equalTo((long)numDocs));
-            // assertSortResults(topDocs, numDocs, false);
+            assertSortResults(topDocs, numDocs, false);
         }
 
         // 3. Test sort optimization on long field + date field

diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.10.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.10.0.jar.sha1
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.10.1.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.10.1.jar.sha1
@@ -0,0 +1 @@
+deb78f6b21d29f964ab267ad59fafb58ef740101