diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index e69b88914bed4..aa90f3e450bf5 100644 --- 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 index bbbc2661506d9..44a82d6efc8cd 100644 --- 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 deleted file mode 100644 index 4919fb2d3319d..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9cbf8056d7bc1ff2712055cb2faca2e5507ec7a0 \ No newline at end of file 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 new file mode 100644 index 0000000000000..f327cbcb6f8e6 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-8.10.1.jar.sha1 @@ -0,0 +1 @@ +24932a4be7064a99126d80776718845b356abae0 \ No newline at end of file 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 deleted file mode 100644 index 0caded898b963..0000000000000 --- a/modules/legacy-geo/licenses/lucene-spatial-extras-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3341f8b28daefa1b27ad5991a4e54d9e2d3d84fb \ No newline at end of file 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 new file mode 100644 index 0000000000000..7eb235d9a1914 --- /dev/null +++ b/modules/legacy-geo/licenses/lucene-spatial-extras-8.10.1.jar.sha1 @@ -0,0 +1 @@ +7a3b6eac3e66bb1c6fb05c0cd980e5592adaf96b \ No newline at end of file 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 deleted file mode 100644 index 9d28aab459c3b..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -950dce57a182914eb8e19177e53c01d047d64a11 \ No newline at end of file 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 new file mode 100644 index 0000000000000..cd11905d4531e --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.10.1.jar.sha1 @@ -0,0 +1 @@ +a1eec256a25340ba5d432d2800f759db83eb5145 \ No newline at end of file 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 deleted file mode 100644 index 85701fb4e8141..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8365e10b1e790c6a5ccf0234a9b2cdc93f26b9ad \ No newline at end of file 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 new file mode 100644 index 0000000000000..0cee3fd1fe9cf --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.10.1.jar.sha1 @@ -0,0 +1 @@ +d9ff6329a9755bbdb7343452bf246e61ae9279d8 \ No newline at end of file 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 deleted file mode 100644 index 61328842480ac..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -db3503335b922c440d91661627d0353d28f0df40 \ No newline at end of file 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 new file mode 100644 index 0000000000000..ec8d7c98c2d6f --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.10.1.jar.sha1 @@ -0,0 +1 @@ +6e78aef6d1b709ed3e27dbc949255e078da08d41 \ No newline at end of file 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 deleted file mode 100644 index e8ef1d789b454..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -206f4b2ba379dbdac44ec79a7cecd5b7bd3e7ace \ No newline at end of file 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 new file mode 100644 index 0000000000000..14edf0533a00d --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.10.1.jar.sha1 @@ -0,0 +1 @@ +c186bf6dd0c2fa6612ba9b0d785ff2d388d32a23 \ No newline at end of file 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 deleted file mode 100644 index e24b7ac5020f3..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -74dcc516b4af025f2a71139d64569be25f4d5422 \ No newline at end of file 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 new file mode 100644 index 0000000000000..5fc06ea596458 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.10.1.jar.sha1 @@ -0,0 +1 @@ +ebda1884c24bb14ee451b98e7565c86966f8863d \ No newline at end of file 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 deleted file mode 100644 index db6ae6a7f98e1..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -22fe9414a8452613003249a051dc68919f22d1c0 \ No newline at end of file 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 new file mode 100644 index 0000000000000..bf2d58255a77e --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.10.1.jar.sha1 @@ -0,0 +1 @@ +2a4bd86c96374cdc5acaf7c0efd5127f2fd3a519 \ No newline at end of file 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 deleted file mode 100644 index 04a9517872a56..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f1450437756f9a5d4b325bc4d80a49dfc9eaa497 \ No newline at end of file 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 new file mode 100644 index 0000000000000..6076c699bb7bf --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.10.1.jar.sha1 @@ -0,0 +1 @@ +09de2e3fa72355228b2723f958dcb0ec1bc3f31a \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.10.0.jar.sha1 b/server/licenses/lucene-analyzers-common-8.10.0.jar.sha1 deleted file mode 100644 index 9c9b70e6a05dd..0000000000000 --- a/server/licenses/lucene-analyzers-common-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f61d640f55243f68c4ade4402f3d4595525b3422 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.10.1.jar.sha1 b/server/licenses/lucene-analyzers-common-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..685f94bcc6601 --- /dev/null +++ b/server/licenses/lucene-analyzers-common-8.10.1.jar.sha1 @@ -0,0 +1 @@ +23bb36a98d01100953674c56c20861b29b5a5175 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.10.0.jar.sha1 b/server/licenses/lucene-backward-codecs-8.10.0.jar.sha1 deleted file mode 100644 index 84b7574f51422..0000000000000 --- a/server/licenses/lucene-backward-codecs-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d9088124b8075cf122daf408f18a50a84d81a9b9 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.10.1.jar.sha1 b/server/licenses/lucene-backward-codecs-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..3191833511058 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-8.10.1.jar.sha1 @@ -0,0 +1 @@ +7399c32bc4ba7e37e14a9660ffd7962acf68a802 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.10.0.jar.sha1 b/server/licenses/lucene-core-8.10.0.jar.sha1 deleted file mode 100644 index 2550534a05ba8..0000000000000 --- a/server/licenses/lucene-core-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bdbacaea254827071a06973e29a6c75210b9ef4e \ No newline at end of file diff --git a/server/licenses/lucene-core-8.10.1.jar.sha1 b/server/licenses/lucene-core-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..77f85d74d6e6c --- /dev/null +++ b/server/licenses/lucene-core-8.10.1.jar.sha1 @@ -0,0 +1 @@ +deb78f6b21d29f964ab267ad59fafb58ef740101 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.10.0.jar.sha1 b/server/licenses/lucene-grouping-8.10.0.jar.sha1 deleted file mode 100644 index 8a4c441dcf26d..0000000000000 --- a/server/licenses/lucene-grouping-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ffc9343d7e3ed05887b0e9f9d1ce6ccb9ddd7767 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.10.1.jar.sha1 b/server/licenses/lucene-grouping-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..82dd3ba35b0a2 --- /dev/null +++ b/server/licenses/lucene-grouping-8.10.1.jar.sha1 @@ -0,0 +1 @@ +7b91bb886d30c67a8f980d3bdfd6b7826a62d5e7 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.10.0.jar.sha1 b/server/licenses/lucene-highlighter-8.10.0.jar.sha1 deleted file mode 100644 index 167729dc5e791..0000000000000 --- a/server/licenses/lucene-highlighter-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -030b3564a238487e7f329c4d460c648adf2b4833 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.10.1.jar.sha1 b/server/licenses/lucene-highlighter-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..901a99e05fa27 --- /dev/null +++ b/server/licenses/lucene-highlighter-8.10.1.jar.sha1 @@ -0,0 +1 @@ +ec4a2103cb300aab7e6142f1c7778dd505ecb8e2 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.10.0.jar.sha1 b/server/licenses/lucene-join-8.10.0.jar.sha1 deleted file mode 100644 index 44663fe52c1a5..0000000000000 --- a/server/licenses/lucene-join-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c6e7112b6c5b449a76f8e2b1af4d9ea422a2c00b \ No newline at end of file diff --git a/server/licenses/lucene-join-8.10.1.jar.sha1 b/server/licenses/lucene-join-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..b7165475dac4f --- /dev/null +++ b/server/licenses/lucene-join-8.10.1.jar.sha1 @@ -0,0 +1 @@ +aa368e9d11660dcfcfaab1a39dd871f05fa2b031 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.10.0.jar.sha1 b/server/licenses/lucene-memory-8.10.0.jar.sha1 deleted file mode 100644 index 56f6f41247cb6..0000000000000 --- a/server/licenses/lucene-memory-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -82b532d034a374f537af7996ea31c42cca751110 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.10.1.jar.sha1 b/server/licenses/lucene-memory-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..ace60de0396b2 --- /dev/null +++ b/server/licenses/lucene-memory-8.10.1.jar.sha1 @@ -0,0 +1 @@ +9de18bf605879647e964fd57ddf3fa6f85ca743e \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.10.0.jar.sha1 b/server/licenses/lucene-misc-8.10.0.jar.sha1 deleted file mode 100644 index 474092297f1ac..0000000000000 --- a/server/licenses/lucene-misc-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6dd05497c9c62dc8ce9c52dcccad3f90bd4f333b \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.10.1.jar.sha1 b/server/licenses/lucene-misc-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..ef9f37d080361 --- /dev/null +++ b/server/licenses/lucene-misc-8.10.1.jar.sha1 @@ -0,0 +1 @@ +e9cca86ebbe010d375388c5a17216e2d2b2e76bb \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.10.0.jar.sha1 b/server/licenses/lucene-queries-8.10.0.jar.sha1 deleted file mode 100644 index 70f82370f7ff0..0000000000000 --- a/server/licenses/lucene-queries-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a6e4dce72a115e16690dcbc339d2b8202d0e30ef \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.10.1.jar.sha1 b/server/licenses/lucene-queries-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..ee8ec29fd21f9 --- /dev/null +++ b/server/licenses/lucene-queries-8.10.1.jar.sha1 @@ -0,0 +1 @@ +21b70a0996e3408291514d99e3b03800d0bcd657 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.10.0.jar.sha1 b/server/licenses/lucene-queryparser-8.10.0.jar.sha1 deleted file mode 100644 index 1708f07c35765..0000000000000 --- a/server/licenses/lucene-queryparser-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -81aae299feb4386e36a7633db5232438ce00a97a \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.10.1.jar.sha1 b/server/licenses/lucene-queryparser-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..3175b926c47ad --- /dev/null +++ b/server/licenses/lucene-queryparser-8.10.1.jar.sha1 @@ -0,0 +1 @@ +087f52ee3f72f387b802c49a96e4a14b3b05dd21 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.10.0.jar.sha1 b/server/licenses/lucene-sandbox-8.10.0.jar.sha1 deleted file mode 100644 index d751010e89d80..0000000000000 --- a/server/licenses/lucene-sandbox-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3c7aa43adfd8c4e2921948438bba5fd3f40d1f58 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.10.1.jar.sha1 b/server/licenses/lucene-sandbox-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..5941c170b1e80 --- /dev/null +++ b/server/licenses/lucene-sandbox-8.10.1.jar.sha1 @@ -0,0 +1 @@ +82b15ef61297e6d7b0c1f6c37c502d6b77a82f1e \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.10.0.jar.sha1 b/server/licenses/lucene-spatial3d-8.10.0.jar.sha1 deleted file mode 100644 index ea68fc9d26ba3..0000000000000 --- a/server/licenses/lucene-spatial3d-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0f3217fbd637b161c76ced6ed4fe1a5906f49550 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.10.1.jar.sha1 b/server/licenses/lucene-spatial3d-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..177ceb41b4205 --- /dev/null +++ b/server/licenses/lucene-spatial3d-8.10.1.jar.sha1 @@ -0,0 +1 @@ +823a5e9d2fd3b5b668d305e0781d0e074e9f2ebb \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.10.0.jar.sha1 b/server/licenses/lucene-suggest-8.10.0.jar.sha1 deleted file mode 100644 index c0e4d6ac98729..0000000000000 --- a/server/licenses/lucene-suggest-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b8341f9a4e454d03c0ac20b6f90e1e55d8bde2ab \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.10.1.jar.sha1 b/server/licenses/lucene-suggest-8.10.1.jar.sha1 new file mode 100644 index 0000000000000..dae6bab002ef4 --- /dev/null +++ b/server/licenses/lucene-suggest-8.10.1.jar.sha1 @@ -0,0 +1 @@ +92d7e5a178d0df58e0b4d400755ac46bae3eea11 \ No newline at end of file diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index 3de80ee79d9ca..6d375cecdd63f 100644 --- 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, 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 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 index 2ad62dc20e17f..837a4cec7b8b6 100644 --- 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 index f5e0d16d7fe80..185ac990b3aa5 100644 --- 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 deleted file mode 100644 index 2550534a05ba8..0000000000000 --- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.10.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bdbacaea254827071a06973e29a6c75210b9ef4e \ No newline at end of file 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 new file mode 100644 index 0000000000000..77f85d74d6e6c --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.10.1.jar.sha1 @@ -0,0 +1 @@ +deb78f6b21d29f964ab267ad59fafb58ef740101 \ No newline at end of file