mirror of
https://github.com/elastic/elasticsearch.git
synced 2025-06-27 17:10:22 -04:00
Upgrade to Lucene 10.2.2 (#129546)
This commit upgrades to Upgrade to Lucene 10.2.2. With the release of 10.2.2, we no longer need to workaround the Lucene bug mentioned in 128671.
This commit is contained in:
Chris Hegarty
GitHub
parent
6a1a862aea
commit
1255a64832
18 changed files with 116 additions and 862 deletions
|
|
@ -21,6 +21,7 @@ import org.apache.lucene.index.IndexWriter;
|
|||
import org.apache.lucene.index.IndexWriterConfig;
|
||||
import org.apache.lucene.search.IndexOrDocValuesQuery;
|
||||
import org.apache.lucene.search.IndexSearcher;
|
||||
import org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.apache.lucene.search.Sort;
|
||||
import org.apache.lucene.search.SortField;
|
||||
|
|
@ -28,7 +29,6 @@ import org.apache.lucene.search.SortedNumericSortField;
|
|||
import org.apache.lucene.store.Directory;
|
||||
import org.apache.lucene.store.FSDirectory;
|
||||
import org.apache.lucene.util.BytesRef;
|
||||
import org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.openjdk.jmh.annotations.Benchmark;
|
||||
import org.openjdk.jmh.annotations.BenchmarkMode;
|
||||
import org.openjdk.jmh.annotations.Fork;
|
||||
|
|
@ -295,7 +295,7 @@ public class DateFieldMapperDocValuesSkipperBenchmark {
|
|||
/**
|
||||
* Runs the actual Lucene range query, optionally combining a {@link LongPoint} index query
|
||||
* with doc values ({@link SortedNumericDocValuesField}) via {@link IndexOrDocValuesQuery},
|
||||
* and then wrapping it with an {@link XIndexSortSortedNumericDocValuesRangeQuery} to utilize the index sort.
|
||||
* and then wrapping it with an {@link IndexSortSortedNumericDocValuesRangeQuery} to utilize the index sort.
|
||||
*
|
||||
* @param searcher the Lucene {@link IndexSearcher}
|
||||
* @param rangeStartTimestamp lower bound of the timestamp range
|
||||
|
|
@ -316,7 +316,7 @@ public class DateFieldMapperDocValuesSkipperBenchmark {
|
|||
)
|
||||
: SortedNumericDocValuesField.newSlowRangeQuery(TIMESTAMP_FIELD, rangeStartTimestamp, rangeEndTimestamp);
|
||||
|
||||
final Query query = new XIndexSortSortedNumericDocValuesRangeQuery(
|
||||
final Query query = new IndexSortSortedNumericDocValuesRangeQuery(
|
||||
TIMESTAMP_FIELD,
|
||||
rangeStartTimestamp,
|
||||
rangeEndTimestamp,
|
||||
|
|
|
|||
|
|
@ -61,11 +61,3 @@ org.apache.logging.log4j.message.ParameterizedMessage#<init>(java.lang.String, j
|
|||
|
||||
@defaultMessage Use WriteLoadForecaster#getForecastedWriteLoad instead
|
||||
org.elasticsearch.cluster.metadata.IndexMetadata#getForecastedWriteLoad()
|
||||
|
||||
# This is a temporary patch as there is a low level Lucene bug in certain scenarios
|
||||
# this should be fixed in the new Lucene release 10.3+
|
||||
org.apache.lucene.document.LongField#newExactQuery(java.lang.String, long) @ Use org.elasticsearch.lucene.document.NumericField#newExactLongQuery(java.lang.String, long) instead.
|
||||
org.apache.lucene.document.LongField#newRangeQuery(java.lang.String, long, long) @ Use org.elasticsearch.lucene.document.NumericField#newRangeLongQuery(java.lang.String, long, long) instead.
|
||||
org.apache.lucene.document.IntField#newExactQuery(java.lang.String, int) @ Use org.elasticsearch.lucene.document.NumericField#newExactIntQuery(java.lang.String, int) instead.
|
||||
org.apache.lucene.document.IntField#newRangeQuery(java.lang.String, int, int) @ Use org.elasticsearch.lucene.document.NumericField#newRangeIntQuery(java.lang.String, int, int) instead.
|
||||
org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery @ use org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery instead.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
elasticsearch = 9.1.0
|
||||
lucene = 10.2.1
|
||||
lucene = 10.2.2
|
||||
|
||||
bundled_jdk_vendor = openjdk
|
||||
bundled_jdk = 24+36@1f9ff9062db4449d8ca828c504ffae90
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
|
||||
include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
|
||||
|
||||
:lucene_version: 10.2.1
|
||||
:lucene_version_path: 10_2_1
|
||||
:lucene_version: 10.2.2
|
||||
:lucene_version_path: 10_2_2
|
||||
:jdk: 11.0.2
|
||||
:jdk_major: 11
|
||||
:build_type: tar
|
||||
|
|
|
|||
13
docs/changelog/129546.yaml
Normal file
13
docs/changelog/129546.yaml
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
pr: 129546
|
||||
summary: Upgrade to Lucene 10.2.2
|
||||
area: Search
|
||||
type: upgrade
|
||||
issues: []
|
||||
highlight:
|
||||
title: Upgrade to lucene 10.2.2
|
||||
body: |-
|
||||
* Reduce NeighborArray on-heap memory during HNSW graph building
|
||||
* Fix IndexSortSortedNumericDocValuesRangeQuery for integer sorting
|
||||
* ValueSource.fromDoubleValuesSource(dvs).getSortField() would throw errors when used if the DoubleValuesSource needed scores
|
||||
----
|
||||
notable: true
|
||||
|
|
@ -3083,129 +3083,129 @@
|
|||
<sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-common" version="10.2.1">
|
||||
<artifact name="lucene-analysis-common-10.2.1.jar">
|
||||
<sha256 value="73e5dfac4c64ea5af6a0e70276c4cf3216085c05de3a6547d4240145bb362a7d" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-common" version="10.2.2">
|
||||
<artifact name="lucene-analysis-common-10.2.2.jar">
|
||||
<sha256 value="4dc1acc6b5a43be0049057bc99772dd24717cf0084c7ff79c68c984f120c140b" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-icu" version="10.2.1">
|
||||
<artifact name="lucene-analysis-icu-10.2.1.jar">
|
||||
<sha256 value="2f28ed82d0d282d7eb9d3b121106357f28de96acedd6eddddc3c35022284eeea" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-icu" version="10.2.2">
|
||||
<artifact name="lucene-analysis-icu-10.2.2.jar">
|
||||
<sha256 value="7baba617b706e2fd35db5bae73117ae77837de29ebabf74204ef5d0bdbb60440" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="10.2.1">
|
||||
<artifact name="lucene-analysis-kuromoji-10.2.1.jar">
|
||||
<sha256 value="a5a378a9a93b447aa97239ce5b7ced943e9cfa6f7d21bb0a5266b7215f9242dd" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="10.2.2">
|
||||
<artifact name="lucene-analysis-kuromoji-10.2.2.jar">
|
||||
<sha256 value="26d5d03b3a123da2547e08d53cc9674eb1a13fe1a03be90e09acee30003a781f" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-morfologik" version="10.2.1">
|
||||
<artifact name="lucene-analysis-morfologik-10.2.1.jar">
|
||||
<sha256 value="c41f62101f1e2624e8705ec5f43e5c8cb169291b63d4fd4bebda9cd2f278e526" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-morfologik" version="10.2.2">
|
||||
<artifact name="lucene-analysis-morfologik-10.2.2.jar">
|
||||
<sha256 value="a219ed3645be3fb153f35ca258dafd8b7db6c76f750adf1a666f562c4d3c9b64" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-nori" version="10.2.1">
|
||||
<artifact name="lucene-analysis-nori-10.2.1.jar">
|
||||
<sha256 value="f886af74815f082fff24505dcbc355613014d156af72b0226be819e7e7c05fc6" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-nori" version="10.2.2">
|
||||
<artifact name="lucene-analysis-nori-10.2.2.jar">
|
||||
<sha256 value="977682e997f3cdd48dc192dc74204d483c967c15dc6ab57e02e2582dcc3035e7" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-phonetic" version="10.2.1">
|
||||
<artifact name="lucene-analysis-phonetic-10.2.1.jar">
|
||||
<sha256 value="be04251434312817fa21b162fc7ddf16d6c9a8647b27f9743e0166f620d26dd9" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-phonetic" version="10.2.2">
|
||||
<artifact name="lucene-analysis-phonetic-10.2.2.jar">
|
||||
<sha256 value="5393550db5fbd64bfee2076f27017f19a3993b48704943b60a48d3a37ed7b0ac" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-smartcn" version="10.2.1">
|
||||
<artifact name="lucene-analysis-smartcn-10.2.1.jar">
|
||||
<sha256 value="fa0955b422e5a3206c9edf6b047fb50a76a16fb54fcc7cc40f8436c77b002ae1" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-smartcn" version="10.2.2">
|
||||
<artifact name="lucene-analysis-smartcn-10.2.2.jar">
|
||||
<sha256 value="caa9f83dd0cef9720a94ada29bcc2a9a839608e1fb665ac9bfb8cef6cf57f5b9" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-stempel" version="10.2.1">
|
||||
<artifact name="lucene-analysis-stempel-10.2.1.jar">
|
||||
<sha256 value="5afae9ab0bc68b27e7792ca99e8e9ab5f75f9dfe7a5149fd631ad26d321c1034" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-analysis-stempel" version="10.2.2">
|
||||
<artifact name="lucene-analysis-stempel-10.2.2.jar">
|
||||
<sha256 value="5bc1cca148d22cde9c485fee5a3861e92d02405eadb3c590dcae91786c94378a" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-backward-codecs" version="10.2.1">
|
||||
<artifact name="lucene-backward-codecs-10.2.1.jar">
|
||||
<sha256 value="79be547bd387ddd0e2bb4d7be7756c4fe0b391e78b73bb13c18f71b5227c67f3" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-backward-codecs" version="10.2.2">
|
||||
<artifact name="lucene-backward-codecs-10.2.2.jar">
|
||||
<sha256 value="2abe4c2d92382805938ae5d43eca4d894c33846df01e49225ce0234d9af49a1d" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-codecs" version="10.2.1">
|
||||
<artifact name="lucene-codecs-10.2.1.jar">
|
||||
<sha256 value="8d823823879ad8920d41034b3a445e5e8a4db8c9f3ad48fec72843bb7548a4d3" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-codecs" version="10.2.2">
|
||||
<artifact name="lucene-codecs-10.2.2.jar">
|
||||
<sha256 value="c3bee894d8132d9268283e73998a02e17d71a3b730515b0597f50a615e087679" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-core" version="10.2.1">
|
||||
<artifact name="lucene-core-10.2.1.jar">
|
||||
<sha256 value="245395b58fc290c0630a0e2196afcf331bac4c74d80529d14b7b2553a8543bfd" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-core" version="10.2.2">
|
||||
<artifact name="lucene-core-10.2.2.jar">
|
||||
<sha256 value="9c219c702449a41c16ad60edc58d12f6d2f4989ef555e875e942904209e25029" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-expressions" version="10.2.1">
|
||||
<artifact name="lucene-expressions-10.2.1.jar">
|
||||
<sha256 value="1e60954153a0ff108ca7f6bbeb2dc0e41dab99a40e938657036eec341d9e27bc" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-expressions" version="10.2.2">
|
||||
<artifact name="lucene-expressions-10.2.2.jar">
|
||||
<sha256 value="b93e825f004de92a7ad792ed862387e9b8abd30fc67b044353717d067587194d" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-facet" version="10.2.1">
|
||||
<artifact name="lucene-facet-10.2.1.jar">
|
||||
<sha256 value="24bca0ba77b7283a67caae3260e286b629b0782f8f3e392934a419b2f7e8e460" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-facet" version="10.2.2">
|
||||
<artifact name="lucene-facet-10.2.2.jar">
|
||||
<sha256 value="0c47089ec9301e15bcabcf2c3dd8d3a4cdb46eec1e1d5a49f4bdba771f3123f5" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-grouping" version="10.2.1">
|
||||
<artifact name="lucene-grouping-10.2.1.jar">
|
||||
<sha256 value="42667281086556cf94d42086ca3b540d23022cca583c14462e401f1d4fa31d2e" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-grouping" version="10.2.2">
|
||||
<artifact name="lucene-grouping-10.2.2.jar">
|
||||
<sha256 value="a2d6def4857428f9fb799819d00a059727824f916d5a45029ea0d6dd7f6d27c8" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-highlighter" version="10.2.1">
|
||||
<artifact name="lucene-highlighter-10.2.1.jar">
|
||||
<sha256 value="8f1f8228944b269c7a7eb4fe24cad67c4391a2b50a82c14ade5e8d0ad609fa8b" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-highlighter" version="10.2.2">
|
||||
<artifact name="lucene-highlighter-10.2.2.jar">
|
||||
<sha256 value="c3ba585eb9dc6a159931a96fb9235d84254e244b3aaaa05b16f71811ae73a887" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-join" version="10.2.1">
|
||||
<artifact name="lucene-join-10.2.1.jar">
|
||||
<sha256 value="6c27781629f5e435a58521be3a1e8369a7300080196ea3c2e094299913b5e853" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-join" version="10.2.2">
|
||||
<artifact name="lucene-join-10.2.2.jar">
|
||||
<sha256 value="a203901be5ed1ef3540c349d73df5d813c2056f7b9b000dd2bb9217750875a3a" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-memory" version="10.2.1">
|
||||
<artifact name="lucene-memory-10.2.1.jar">
|
||||
<sha256 value="7f6b0e99cb650c4bb6a0eeb05f0799a8f039ab07921ed7b4fdd031a3e560460f" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-memory" version="10.2.2">
|
||||
<artifact name="lucene-memory-10.2.2.jar">
|
||||
<sha256 value="929aa2f96dac2cf03ca7bcfc008aaa3af5a7075b7dad67cb4774972d1ededc97" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-misc" version="10.2.1">
|
||||
<artifact name="lucene-misc-10.2.1.jar">
|
||||
<sha256 value="c727b429d5a8612572e5180a203580a13feadfeea0a109da943436cc8da1cc55" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-misc" version="10.2.2">
|
||||
<artifact name="lucene-misc-10.2.2.jar">
|
||||
<sha256 value="894e835d7b8285d5a23527df73cc78d7698b86a14cc87c088a86a7c832f86e64" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-queries" version="10.2.1">
|
||||
<artifact name="lucene-queries-10.2.1.jar">
|
||||
<sha256 value="0aff0eaa0f11f03c3dccd4f1e97db454794dd914946fe5d0669c3794673bfed0" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-queries" version="10.2.2">
|
||||
<artifact name="lucene-queries-10.2.2.jar">
|
||||
<sha256 value="7a3c9b59164d5c494c5243dd86814f34c7721f613401d4c7e30cc80c88afe733" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-queryparser" version="10.2.1">
|
||||
<artifact name="lucene-queryparser-10.2.1.jar">
|
||||
<sha256 value="9f394d20f8420608e104b7a645f6b76c22ceb0b655476a9365a5746f3a2272be" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-queryparser" version="10.2.2">
|
||||
<artifact name="lucene-queryparser-10.2.2.jar">
|
||||
<sha256 value="010e1478b6649a5f62aa411a512519cf1f849b6bc48961fd117c73a8dc591c67" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-sandbox" version="10.2.1">
|
||||
<artifact name="lucene-sandbox-10.2.1.jar">
|
||||
<sha256 value="b8feeb751e66694ea3b0e9e6df6340749b92127c281c8e6be5a408bcd710da04" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-sandbox" version="10.2.2">
|
||||
<artifact name="lucene-sandbox-10.2.2.jar">
|
||||
<sha256 value="27eb0da8367fcc81663ff760fc98a1606ed45ac043eb32c7f575815b6e56b2f5" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-spatial-extras" version="10.2.1">
|
||||
<artifact name="lucene-spatial-extras-10.2.1.jar">
|
||||
<sha256 value="8c7ff3f251c765872e07fb2c2b6b8eb28d87bb5b34ba33fad5516b4d3b52dd5d" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-spatial-extras" version="10.2.2">
|
||||
<artifact name="lucene-spatial-extras-10.2.2.jar">
|
||||
<sha256 value="06996ef7d2bd05f98743ff5413c37008ee56da9e26b60bb622abfa125b7dfda1" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-spatial3d" version="10.2.1">
|
||||
<artifact name="lucene-spatial3d-10.2.1.jar">
|
||||
<sha256 value="70147dcbed711961bc18ada6ff957ff853a7d2d50496f7754d80041bf0d96eb4" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-spatial3d" version="10.2.2">
|
||||
<artifact name="lucene-spatial3d-10.2.2.jar">
|
||||
<sha256 value="f5c94bbbc9b6d2c5f7d0e053fe4fe49304c1ccf51cdbdb27c25730837675d819" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-suggest" version="10.2.1">
|
||||
<artifact name="lucene-suggest-10.2.1.jar">
|
||||
<sha256 value="879e00b16f0c2ba13307784b5e1c35e5d6c6671a419f0f9140d3f595c1d6ef80" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-suggest" version="10.2.2">
|
||||
<artifact name="lucene-suggest-10.2.2.jar">
|
||||
<sha256 value="8019b895f247c07de828cc44f7dc584a9fad45bebdcce8a8cefcfea9b5a3c859" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.lucene" name="lucene-test-framework" version="10.2.1">
|
||||
<artifact name="lucene-test-framework-10.2.1.jar">
|
||||
<sha256 value="0c1dfd96bc2b505e221de7b58c954aa04803e7004de390189a7db6ab5cf91eac" origin="Generated by Gradle"/>
|
||||
<component group="org.apache.lucene" name="lucene-test-framework" version="10.2.2">
|
||||
<artifact name="lucene-test-framework-10.2.2.jar">
|
||||
<sha256 value="0681d876cbcf5a6050514edf70c09652d30134bef0cdeb2db90cc807fc71918a" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.maven" name="maven-api-meta" version="4.0.0-alpha-9">
|
||||
|
|
|
|||
|
|
@ -480,7 +480,6 @@ module org.elasticsearch.server {
|
|||
exports org.elasticsearch.plugins.internal.rewriter to org.elasticsearch.inference;
|
||||
exports org.elasticsearch.lucene.util.automaton;
|
||||
exports org.elasticsearch.index.codec.perfield;
|
||||
exports org.elasticsearch.lucene.search;
|
||||
exports org.elasticsearch.index.codec.vectors to org.elasticsearch.test.knn;
|
||||
exports org.elasticsearch.index.codec.vectors.es818 to org.elasticsearch.test.knn;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -173,6 +173,7 @@ public class IndexVersions {
|
|||
public static final IndexVersion SEQ_NO_WITHOUT_POINTS = def(9_027_0_00, Version.LUCENE_10_2_1);
|
||||
public static final IndexVersion INDEX_INT_SORT_INT_TYPE = def(9_028_0_00, Version.LUCENE_10_2_1);
|
||||
public static final IndexVersion MAPPER_TEXT_MATCH_ONLY_MULTI_FIELDS_DEFAULT_NOT_STORED = def(9_029_0_00, Version.LUCENE_10_2_1);
|
||||
public static final IndexVersion UPGRADE_TO_LUCENE_10_2_2 = def(9_030_0_00, Version.LUCENE_10_2_2);
|
||||
|
||||
/*
|
||||
* STOP! READ THIS FIRST! No, really,
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import org.apache.lucene.index.LeafReaderContext;
|
|||
import org.apache.lucene.index.PointValues;
|
||||
import org.apache.lucene.index.SortedNumericDocValues;
|
||||
import org.apache.lucene.search.IndexOrDocValuesQuery;
|
||||
import org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.elasticsearch.ElasticsearchParseException;
|
||||
import org.elasticsearch.common.geo.ShapeRelation;
|
||||
|
|
@ -49,7 +50,6 @@ import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData;
|
|||
import org.elasticsearch.index.query.DateRangeIncludingNowQuery;
|
||||
import org.elasticsearch.index.query.QueryRewriteContext;
|
||||
import org.elasticsearch.index.query.SearchExecutionContext;
|
||||
import org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.elasticsearch.script.DateFieldScript;
|
||||
import org.elasticsearch.script.Script;
|
||||
import org.elasticsearch.script.ScriptCompiler;
|
||||
|
|
@ -754,7 +754,7 @@ public final class DateFieldMapper extends FieldMapper {
|
|||
query = SortedNumericDocValuesField.newSlowRangeQuery(name(), l, u);
|
||||
}
|
||||
if (hasDocValues() && context.indexSortedOnField(name())) {
|
||||
query = new XIndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
|
||||
query = new IndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
|
||||
}
|
||||
return query;
|
||||
});
|
||||
|
|
@ -868,7 +868,7 @@ public final class DateFieldMapper extends FieldMapper {
|
|||
query = SortedNumericDocValuesField.newSlowRangeQuery(name(), l, u);
|
||||
}
|
||||
if (hasDocValues() && context.indexSortedOnField(name())) {
|
||||
query = new XIndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
|
||||
query = new IndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
|
||||
}
|
||||
return query;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import org.apache.lucene.index.IndexableField;
|
|||
import org.apache.lucene.index.LeafReaderContext;
|
||||
import org.apache.lucene.sandbox.document.HalfFloatPoint;
|
||||
import org.apache.lucene.search.IndexOrDocValuesQuery;
|
||||
import org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.apache.lucene.search.MatchNoDocsQuery;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.apache.lucene.util.BytesRef;
|
||||
|
|
@ -46,7 +47,6 @@ import org.elasticsearch.index.fielddata.plain.SortedDoublesIndexFieldData;
|
|||
import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData;
|
||||
import org.elasticsearch.index.mapper.TimeSeriesParams.MetricType;
|
||||
import org.elasticsearch.index.query.SearchExecutionContext;
|
||||
import org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.elasticsearch.script.DoubleFieldScript;
|
||||
import org.elasticsearch.script.LongFieldScript;
|
||||
import org.elasticsearch.script.Script;
|
||||
|
|
@ -1211,7 +1211,7 @@ public class NumberFieldMapper extends FieldMapper {
|
|||
query = SortedNumericDocValuesField.newSlowRangeQuery(field, l, u);
|
||||
}
|
||||
if (hasDocValues && context.indexSortedOnField(field)) {
|
||||
query = new XIndexSortSortedNumericDocValuesRangeQuery(field, l, u, query);
|
||||
query = new IndexSortSortedNumericDocValuesRangeQuery(field, l, u, query);
|
||||
}
|
||||
return query;
|
||||
}
|
||||
|
|
@ -1367,7 +1367,7 @@ public class NumberFieldMapper extends FieldMapper {
|
|||
query = SortedNumericDocValuesField.newSlowRangeQuery(field, l, u);
|
||||
}
|
||||
if (hasDocValues && context.indexSortedOnField(field)) {
|
||||
query = new XIndexSortSortedNumericDocValuesRangeQuery(field, l, u, query);
|
||||
query = new IndexSortSortedNumericDocValuesRangeQuery(field, l, u, query);
|
||||
}
|
||||
return query;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
/*
|
||||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
||||
* or more contributor license agreements. Licensed under the "Elastic License
|
||||
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
|
||||
* Public License v 1"; you may not use this file except in compliance with, at
|
||||
* your election, the "Elastic License 2.0", the "GNU Affero General Public
|
||||
* License v3.0 only", or the "Server Side Public License, v 1".
|
||||
*/
|
||||
|
||||
package org.elasticsearch.lucene.document;
|
||||
|
||||
import org.apache.lucene.document.IntPoint;
|
||||
import org.apache.lucene.document.LongPoint;
|
||||
import org.apache.lucene.document.SortedNumericDocValuesField;
|
||||
import org.apache.lucene.search.IndexOrDocValuesQuery;
|
||||
import org.apache.lucene.search.PointRangeQuery;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery;
|
||||
|
||||
public final class NumericField {
|
||||
|
||||
private NumericField() {
|
||||
// Utility class, no instantiation
|
||||
}
|
||||
|
||||
public static Query newExactLongQuery(String field, long value) {
|
||||
return newRangeLongQuery(field, value, value);
|
||||
}
|
||||
|
||||
public static Query newRangeLongQuery(String field, long lowerValue, long upperValue) {
|
||||
PointRangeQuery.checkArgs(field, lowerValue, upperValue);
|
||||
Query fallbackQuery = new IndexOrDocValuesQuery(
|
||||
LongPoint.newRangeQuery(field, lowerValue, upperValue),
|
||||
SortedNumericDocValuesField.newSlowRangeQuery(field, lowerValue, upperValue)
|
||||
);
|
||||
return new XIndexSortSortedNumericDocValuesRangeQuery(field, lowerValue, upperValue, fallbackQuery);
|
||||
}
|
||||
|
||||
public static Query newExactIntQuery(String field, int value) {
|
||||
return newRangeIntQuery(field, value, value);
|
||||
}
|
||||
|
||||
public static Query newRangeIntQuery(String field, int lowerValue, int upperValue) {
|
||||
PointRangeQuery.checkArgs(field, lowerValue, upperValue);
|
||||
Query fallbackQuery = new IndexOrDocValuesQuery(
|
||||
IntPoint.newRangeQuery(field, lowerValue, upperValue),
|
||||
SortedNumericDocValuesField.newSlowRangeQuery(field, lowerValue, upperValue)
|
||||
);
|
||||
return new XIndexSortSortedNumericDocValuesRangeQuery(field, lowerValue, upperValue, fallbackQuery);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,699 +0,0 @@
|
|||
/*
|
||||
* @notice
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* Modifications copyright (C) 2025 Elasticsearch B.V.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.lucene.search;
|
||||
|
||||
import org.apache.lucene.document.IntPoint;
|
||||
import org.apache.lucene.document.LongPoint;
|
||||
import org.apache.lucene.index.DocValues;
|
||||
import org.apache.lucene.index.LeafReader;
|
||||
import org.apache.lucene.index.LeafReaderContext;
|
||||
import org.apache.lucene.index.NumericDocValues;
|
||||
import org.apache.lucene.index.PointValues;
|
||||
import org.apache.lucene.index.PointValues.IntersectVisitor;
|
||||
import org.apache.lucene.index.PointValues.PointTree;
|
||||
import org.apache.lucene.index.PointValues.Relation;
|
||||
import org.apache.lucene.index.SortedNumericDocValues;
|
||||
import org.apache.lucene.search.ConstantScoreScorer;
|
||||
import org.apache.lucene.search.ConstantScoreWeight;
|
||||
import org.apache.lucene.search.DocIdSetIterator;
|
||||
import org.apache.lucene.search.FieldComparator;
|
||||
import org.apache.lucene.search.FieldExistsQuery;
|
||||
import org.apache.lucene.search.IndexSearcher;
|
||||
import org.apache.lucene.search.LeafFieldComparator;
|
||||
import org.apache.lucene.search.MatchAllDocsQuery;
|
||||
import org.apache.lucene.search.Pruning;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.apache.lucene.search.QueryVisitor;
|
||||
import org.apache.lucene.search.ScoreMode;
|
||||
import org.apache.lucene.search.Scorer;
|
||||
import org.apache.lucene.search.ScorerSupplier;
|
||||
import org.apache.lucene.search.Sort;
|
||||
import org.apache.lucene.search.SortField;
|
||||
import org.apache.lucene.search.SortField.Type;
|
||||
import org.apache.lucene.search.SortedNumericSortField;
|
||||
import org.apache.lucene.search.Weight;
|
||||
import org.apache.lucene.util.ArrayUtil;
|
||||
import org.apache.lucene.util.ArrayUtil.ByteArrayComparator;
|
||||
import org.apache.lucene.util.Version;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.Deque;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* copied from Lucene
|
||||
*/
|
||||
public class XIndexSortSortedNumericDocValuesRangeQuery extends Query {
|
||||
|
||||
private final String field;
|
||||
private final long lowerValue;
|
||||
private final long upperValue;
|
||||
private final Query fallbackQuery;
|
||||
|
||||
/**
|
||||
* Creates a new {@link XIndexSortSortedNumericDocValuesRangeQuery}.
|
||||
*
|
||||
* @param field The field name.
|
||||
* @param lowerValue The lower end of the range (inclusive).
|
||||
* @param upperValue The upper end of the range (exclusive).
|
||||
* @param fallbackQuery A query to fall back to if the optimization cannot be applied.
|
||||
*/
|
||||
public XIndexSortSortedNumericDocValuesRangeQuery(String field, long lowerValue, long upperValue, Query fallbackQuery) {
|
||||
// we should only have this while the apache Lucene version is 10.2 or earlier
|
||||
assert Version.LATEST.major == 10 && Version.LATEST.minor <= 2
|
||||
: "This query should only be used with Lucene 10.2 or earlier, but got version: " + Version.LATEST;
|
||||
this.field = Objects.requireNonNull(field);
|
||||
this.lowerValue = lowerValue;
|
||||
this.upperValue = upperValue;
|
||||
this.fallbackQuery = fallbackQuery;
|
||||
}
|
||||
|
||||
public Query getFallbackQuery() {
|
||||
return fallbackQuery;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
XIndexSortSortedNumericDocValuesRangeQuery that = (XIndexSortSortedNumericDocValuesRangeQuery) o;
|
||||
return lowerValue == that.lowerValue
|
||||
&& upperValue == that.upperValue
|
||||
&& Objects.equals(field, that.field)
|
||||
&& Objects.equals(fallbackQuery, that.fallbackQuery);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(field, lowerValue, upperValue, fallbackQuery);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(QueryVisitor visitor) {
|
||||
if (visitor.acceptField(field)) {
|
||||
visitor.visitLeaf(this);
|
||||
fallbackQuery.visit(visitor);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(String field) {
|
||||
StringBuilder b = new StringBuilder();
|
||||
if (this.field.equals(field) == false) {
|
||||
b.append(this.field).append(":");
|
||||
}
|
||||
return b.append("[").append(lowerValue).append(" TO ").append(upperValue).append("]").toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Query rewrite(IndexSearcher indexSearcher) throws IOException {
|
||||
if (lowerValue == Long.MIN_VALUE && upperValue == Long.MAX_VALUE) {
|
||||
return new FieldExistsQuery(field);
|
||||
}
|
||||
|
||||
Query rewrittenFallback = fallbackQuery.rewrite(indexSearcher);
|
||||
if (rewrittenFallback.getClass() == MatchAllDocsQuery.class) {
|
||||
return new MatchAllDocsQuery();
|
||||
}
|
||||
if (rewrittenFallback == fallbackQuery) {
|
||||
return this;
|
||||
} else {
|
||||
return new XIndexSortSortedNumericDocValuesRangeQuery(field, lowerValue, upperValue, rewrittenFallback);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost) throws IOException {
|
||||
Weight fallbackWeight = fallbackQuery.createWeight(searcher, scoreMode, boost);
|
||||
|
||||
return new ConstantScoreWeight(this, boost) {
|
||||
|
||||
@Override
|
||||
public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOException {
|
||||
IteratorAndCount itAndCount = getDocIdSetIteratorOrNull(context);
|
||||
if (itAndCount != null) {
|
||||
DocIdSetIterator disi = itAndCount.it;
|
||||
return new ScorerSupplier() {
|
||||
@Override
|
||||
public Scorer get(long leadCost) throws IOException {
|
||||
return new ConstantScoreScorer(score(), scoreMode, disi);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long cost() {
|
||||
return disi.cost();
|
||||
}
|
||||
};
|
||||
}
|
||||
return fallbackWeight.scorerSupplier(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCacheable(LeafReaderContext ctx) {
|
||||
// Both queries should always return the same values, so we can just check
|
||||
// if the fallback query is cacheable.
|
||||
return fallbackWeight.isCacheable(ctx);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int count(LeafReaderContext context) throws IOException {
|
||||
if (context.reader().hasDeletions() == false) {
|
||||
if (lowerValue > upperValue) {
|
||||
return 0;
|
||||
}
|
||||
IteratorAndCount itAndCount = null;
|
||||
LeafReader reader = context.reader();
|
||||
|
||||
// first use bkd optimization if possible
|
||||
SortedNumericDocValues sortedNumericValues = DocValues.getSortedNumeric(reader, field);
|
||||
NumericDocValues numericValues = DocValues.unwrapSingleton(sortedNumericValues);
|
||||
PointValues pointValues = reader.getPointValues(field);
|
||||
if (pointValues != null && pointValues.getDocCount() == reader.maxDoc()) {
|
||||
itAndCount = getDocIdSetIteratorOrNullFromBkd(context, numericValues);
|
||||
}
|
||||
if (itAndCount != null && itAndCount.count != -1) {
|
||||
return itAndCount.count;
|
||||
}
|
||||
|
||||
// use index sort optimization if possible
|
||||
Sort indexSort = reader.getMetaData().sort();
|
||||
if (indexSort != null && indexSort.getSort().length > 0 && indexSort.getSort()[0].getField().equals(field)) {
|
||||
final SortField sortField = indexSort.getSort()[0];
|
||||
final SortField.Type sortFieldType = getSortFieldType(sortField);
|
||||
// The index sort optimization is only supported for Type.INT and Type.LONG
|
||||
if (sortFieldType == Type.INT || sortFieldType == Type.LONG) {
|
||||
Object missingValue = sortField.getMissingValue();
|
||||
// This is the fix
|
||||
final long missingLongValue = missingValue == null ? 0L : ((Number) missingValue).longValue();
|
||||
// all documents have docValues or missing value falls outside the range
|
||||
if ((pointValues != null && pointValues.getDocCount() == reader.maxDoc())
|
||||
|| (missingLongValue < lowerValue || missingLongValue > upperValue)) {
|
||||
itAndCount = getDocIdSetIterator(sortField, sortFieldType, context, numericValues);
|
||||
}
|
||||
if (itAndCount != null && itAndCount.count != -1) {
|
||||
return itAndCount.count;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return fallbackWeight.count(context);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static class ValueAndDoc {
|
||||
byte[] value;
|
||||
int docID;
|
||||
boolean done;
|
||||
}
|
||||
|
||||
/**
|
||||
* Move to the minimum leaf node that has at least one value that is greater than (or equal to if
|
||||
* {@code allowEqual}) {@code value}, and return the next greater value on this block. Upon
|
||||
* returning, the {@code pointTree} must be on the leaf node where the value was found.
|
||||
*/
|
||||
private static ValueAndDoc findNextValue(
|
||||
PointTree pointTree,
|
||||
byte[] value,
|
||||
boolean allowEqual,
|
||||
ByteArrayComparator comparator,
|
||||
boolean lastDoc
|
||||
) throws IOException {
|
||||
int cmp = comparator.compare(pointTree.getMaxPackedValue(), 0, value, 0);
|
||||
if (cmp < 0 || (cmp == 0 && allowEqual == false)) {
|
||||
return null;
|
||||
}
|
||||
if (pointTree.moveToChild() == false) {
|
||||
ValueAndDoc vd = new ValueAndDoc();
|
||||
pointTree.visitDocValues(new IntersectVisitor() {
|
||||
|
||||
@Override
|
||||
public void visit(int docID, byte[] packedValue) throws IOException {
|
||||
if (vd.value == null) {
|
||||
int cmp = comparator.compare(packedValue, 0, value, 0);
|
||||
if (cmp > 0 || (cmp == 0 && allowEqual)) {
|
||||
vd.value = packedValue.clone();
|
||||
vd.docID = docID;
|
||||
}
|
||||
} else if (lastDoc && vd.done == false) {
|
||||
int cmp = comparator.compare(packedValue, 0, vd.value, 0);
|
||||
assert cmp >= 0;
|
||||
if (cmp > 0) {
|
||||
vd.done = true;
|
||||
} else {
|
||||
vd.docID = docID;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(int docID) throws IOException {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Relation compare(byte[] minPackedValue, byte[] maxPackedValue) {
|
||||
return Relation.CELL_CROSSES_QUERY;
|
||||
}
|
||||
});
|
||||
if (vd.value != null) {
|
||||
return vd;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// Recurse
|
||||
do {
|
||||
ValueAndDoc vd = findNextValue(pointTree, value, allowEqual, comparator, lastDoc);
|
||||
if (vd != null) {
|
||||
return vd;
|
||||
}
|
||||
} while (pointTree.moveToSibling());
|
||||
|
||||
boolean moved = pointTree.moveToParent();
|
||||
assert moved;
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the next value that is greater than (or equal to if {@code allowEqual}) and return either
|
||||
* its first doc ID or last doc ID depending on {@code lastDoc}. This method returns -1 if there
|
||||
* is no greater value in the dataset.
|
||||
*/
|
||||
private static int nextDoc(PointTree pointTree, byte[] value, boolean allowEqual, ByteArrayComparator comparator, boolean lastDoc)
|
||||
throws IOException {
|
||||
ValueAndDoc vd = findNextValue(pointTree, value, allowEqual, comparator, lastDoc);
|
||||
if (vd == null) {
|
||||
return -1;
|
||||
}
|
||||
if (lastDoc == false || vd.done) {
|
||||
return vd.docID;
|
||||
}
|
||||
|
||||
// We found the next value, now we need the last doc ID.
|
||||
int doc = lastDoc(pointTree, vd.value, comparator);
|
||||
if (doc == -1) {
|
||||
// vd.docID was actually the last doc ID
|
||||
return vd.docID;
|
||||
} else {
|
||||
return doc;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Compute the last doc ID that matches the given value and is stored on a leaf node that compares
|
||||
* greater than the current leaf node that the provided {@link PointTree} is positioned on. This
|
||||
* returns -1 if no other leaf node contains the provided {@code value}.
|
||||
*/
|
||||
private static int lastDoc(PointTree pointTree, byte[] value, ByteArrayComparator comparator) throws IOException {
|
||||
// Create a stack of nodes that may contain value that we'll use to search for the last leaf
|
||||
// node that contains `value`.
|
||||
// While the logic looks a bit complicated due to the fact that the PointTree API doesn't allow
|
||||
// moving back to previous siblings, this effectively performs a binary search.
|
||||
Deque<PointTree> stack = new ArrayDeque<>();
|
||||
|
||||
outer: while (true) {
|
||||
|
||||
// Move to the next node
|
||||
while (pointTree.moveToSibling() == false) {
|
||||
if (pointTree.moveToParent() == false) {
|
||||
// No next node
|
||||
break outer;
|
||||
}
|
||||
}
|
||||
|
||||
int cmp = comparator.compare(pointTree.getMinPackedValue(), 0, value, 0);
|
||||
if (cmp > 0) {
|
||||
// This node doesn't have `value`, so next nodes can't either
|
||||
break;
|
||||
}
|
||||
|
||||
stack.push(pointTree.clone());
|
||||
}
|
||||
|
||||
while (stack.isEmpty() == false) {
|
||||
PointTree next = stack.pop();
|
||||
if (next.moveToChild() == false) {
|
||||
int[] lastDoc = { -1 };
|
||||
next.visitDocValues(new IntersectVisitor() {
|
||||
|
||||
@Override
|
||||
public void visit(int docID) throws IOException {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(int docID, byte[] packedValue) throws IOException {
|
||||
int cmp = comparator.compare(value, 0, packedValue, 0);
|
||||
if (cmp == 0) {
|
||||
lastDoc[0] = docID;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Relation compare(byte[] minPackedValue, byte[] maxPackedValue) {
|
||||
return Relation.CELL_CROSSES_QUERY;
|
||||
}
|
||||
});
|
||||
if (lastDoc[0] != -1) {
|
||||
return lastDoc[0];
|
||||
}
|
||||
} else {
|
||||
do {
|
||||
int cmp = comparator.compare(next.getMinPackedValue(), 0, value, 0);
|
||||
if (cmp > 0) {
|
||||
// This node doesn't have `value`, so next nodes can't either
|
||||
break;
|
||||
}
|
||||
stack.push(next.clone());
|
||||
} while (next.moveToSibling());
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
private boolean matchNone(PointValues points, byte[] queryLowerPoint, byte[] queryUpperPoint) throws IOException {
|
||||
assert points.getNumDimensions() == 1;
|
||||
final ByteArrayComparator comparator = ArrayUtil.getUnsignedComparator(points.getBytesPerDimension());
|
||||
return comparator.compare(points.getMinPackedValue(), 0, queryUpperPoint, 0) > 0
|
||||
|| comparator.compare(points.getMaxPackedValue(), 0, queryLowerPoint, 0) < 0;
|
||||
}
|
||||
|
||||
private boolean matchAll(PointValues points, byte[] queryLowerPoint, byte[] queryUpperPoint) throws IOException {
|
||||
assert points.getNumDimensions() == 1;
|
||||
final ByteArrayComparator comparator = ArrayUtil.getUnsignedComparator(points.getBytesPerDimension());
|
||||
return comparator.compare(points.getMinPackedValue(), 0, queryLowerPoint, 0) >= 0
|
||||
&& comparator.compare(points.getMaxPackedValue(), 0, queryUpperPoint, 0) <= 0;
|
||||
}
|
||||
|
||||
private IteratorAndCount getDocIdSetIteratorOrNullFromBkd(LeafReaderContext context, DocIdSetIterator delegate) throws IOException {
|
||||
Sort indexSort = context.reader().getMetaData().sort();
|
||||
if (indexSort == null || indexSort.getSort().length == 0 || indexSort.getSort()[0].getField().equals(field) == false) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final boolean reverse = indexSort.getSort()[0].getReverse();
|
||||
|
||||
PointValues points = context.reader().getPointValues(field);
|
||||
if (points == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (points.getNumDimensions() != 1) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (points.getBytesPerDimension() != Long.BYTES && points.getBytesPerDimension() != Integer.BYTES) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (points.size() != points.getDocCount()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
assert lowerValue <= upperValue;
|
||||
byte[] queryLowerPoint;
|
||||
byte[] queryUpperPoint;
|
||||
if (points.getBytesPerDimension() == Integer.BYTES) {
|
||||
queryLowerPoint = IntPoint.pack((int) lowerValue).bytes;
|
||||
queryUpperPoint = IntPoint.pack((int) upperValue).bytes;
|
||||
} else {
|
||||
queryLowerPoint = LongPoint.pack(lowerValue).bytes;
|
||||
queryUpperPoint = LongPoint.pack(upperValue).bytes;
|
||||
}
|
||||
if (matchNone(points, queryLowerPoint, queryUpperPoint)) {
|
||||
return IteratorAndCount.empty();
|
||||
}
|
||||
if (matchAll(points, queryLowerPoint, queryUpperPoint)) {
|
||||
int maxDoc = context.reader().maxDoc();
|
||||
if (points.getDocCount() == maxDoc) {
|
||||
return IteratorAndCount.all(maxDoc);
|
||||
} else {
|
||||
return IteratorAndCount.sparseRange(0, maxDoc, delegate);
|
||||
}
|
||||
}
|
||||
|
||||
int minDocId, maxDocId;
|
||||
final ByteArrayComparator comparator = ArrayUtil.getUnsignedComparator(points.getBytesPerDimension());
|
||||
|
||||
if (reverse) {
|
||||
minDocId = nextDoc(points.getPointTree(), queryUpperPoint, false, comparator, true) + 1;
|
||||
} else {
|
||||
minDocId = nextDoc(points.getPointTree(), queryLowerPoint, true, comparator, false);
|
||||
if (minDocId == -1) {
|
||||
// No matches
|
||||
return IteratorAndCount.empty();
|
||||
}
|
||||
}
|
||||
|
||||
if (reverse) {
|
||||
maxDocId = nextDoc(points.getPointTree(), queryLowerPoint, true, comparator, true) + 1;
|
||||
if (maxDocId == 0) {
|
||||
// No matches
|
||||
return IteratorAndCount.empty();
|
||||
}
|
||||
} else {
|
||||
maxDocId = nextDoc(points.getPointTree(), queryUpperPoint, false, comparator, false);
|
||||
if (maxDocId == -1) {
|
||||
maxDocId = context.reader().maxDoc();
|
||||
}
|
||||
}
|
||||
|
||||
if (minDocId == maxDocId) {
|
||||
return IteratorAndCount.empty();
|
||||
}
|
||||
|
||||
if ((points.getDocCount() == context.reader().maxDoc())) {
|
||||
return IteratorAndCount.denseRange(minDocId, maxDocId);
|
||||
} else {
|
||||
return IteratorAndCount.sparseRange(minDocId, maxDocId, delegate);
|
||||
}
|
||||
}
|
||||
|
||||
private IteratorAndCount getDocIdSetIteratorOrNull(LeafReaderContext context) throws IOException {
|
||||
if (lowerValue > upperValue) {
|
||||
return IteratorAndCount.empty();
|
||||
}
|
||||
|
||||
SortedNumericDocValues sortedNumericValues = DocValues.getSortedNumeric(context.reader(), field);
|
||||
NumericDocValues numericValues = DocValues.unwrapSingleton(sortedNumericValues);
|
||||
if (numericValues != null) {
|
||||
IteratorAndCount itAndCount = getDocIdSetIteratorOrNullFromBkd(context, numericValues);
|
||||
if (itAndCount != null) {
|
||||
return itAndCount;
|
||||
}
|
||||
Sort indexSort = context.reader().getMetaData().sort();
|
||||
if (indexSort != null && indexSort.getSort().length > 0 && indexSort.getSort()[0].getField().equals(field)) {
|
||||
|
||||
final SortField sortField = indexSort.getSort()[0];
|
||||
final SortField.Type sortFieldType = getSortFieldType(sortField);
|
||||
// The index sort optimization is only supported for Type.INT and Type.LONG
|
||||
if (sortFieldType == Type.INT || sortFieldType == Type.LONG) {
|
||||
return getDocIdSetIterator(sortField, sortFieldType, context, numericValues);
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Computes the document IDs that lie within the range [lowerValue, upperValue] by performing
|
||||
* binary search on the field's doc values.
|
||||
*
|
||||
* <p>Because doc values only allow forward iteration, we need to reload the field comparator
|
||||
* every time the binary search accesses an earlier element.
|
||||
*
|
||||
* <p>We must also account for missing values when performing the binary search. For this reason,
|
||||
* we load the {@link FieldComparator} instead of checking the docvalues directly. The returned
|
||||
* {@link DocIdSetIterator} makes sure to wrap the original docvalues to skip over documents with
|
||||
* no value.
|
||||
*/
|
||||
private IteratorAndCount getDocIdSetIterator(
|
||||
SortField sortField,
|
||||
SortField.Type sortFieldType,
|
||||
LeafReaderContext context,
|
||||
DocIdSetIterator delegate
|
||||
) throws IOException {
|
||||
long lower = sortField.getReverse() ? upperValue : lowerValue;
|
||||
long upper = sortField.getReverse() ? lowerValue : upperValue;
|
||||
int maxDoc = context.reader().maxDoc();
|
||||
|
||||
// Perform a binary search to find the first document with value >= lower.
|
||||
ValueComparator comparator = loadComparator(sortField, sortFieldType, lower, context);
|
||||
int low = 0;
|
||||
int high = maxDoc - 1;
|
||||
|
||||
while (low <= high) {
|
||||
int mid = (low + high) >>> 1;
|
||||
if (comparator.compare(mid) <= 0) {
|
||||
high = mid - 1;
|
||||
comparator = loadComparator(sortField, sortFieldType, lower, context);
|
||||
} else {
|
||||
low = mid + 1;
|
||||
}
|
||||
}
|
||||
int firstDocIdInclusive = high + 1;
|
||||
|
||||
// Perform a binary search to find the first document with value > upper.
|
||||
// Since we know that upper >= lower, we can initialize the lower bound
|
||||
// of the binary search to the result of the previous search.
|
||||
comparator = loadComparator(sortField, sortFieldType, upper, context);
|
||||
low = firstDocIdInclusive;
|
||||
high = maxDoc - 1;
|
||||
|
||||
while (low <= high) {
|
||||
int mid = (low + high) >>> 1;
|
||||
if (comparator.compare(mid) < 0) {
|
||||
high = mid - 1;
|
||||
comparator = loadComparator(sortField, sortFieldType, upper, context);
|
||||
} else {
|
||||
low = mid + 1;
|
||||
}
|
||||
}
|
||||
|
||||
int lastDocIdExclusive = high + 1;
|
||||
|
||||
if (firstDocIdInclusive == lastDocIdExclusive) {
|
||||
return IteratorAndCount.empty();
|
||||
}
|
||||
|
||||
Object missingValue = sortField.getMissingValue();
|
||||
LeafReader reader = context.reader();
|
||||
PointValues pointValues = reader.getPointValues(field);
|
||||
// this is the fix
|
||||
final long missingLongValue = missingValue == null ? 0L : ((Number) missingValue).longValue();
|
||||
// all documents have docValues or missing value falls outside the range
|
||||
if ((pointValues != null && pointValues.getDocCount() == reader.maxDoc())
|
||||
|| (missingLongValue < lowerValue || missingLongValue > upperValue)) {
|
||||
return IteratorAndCount.denseRange(firstDocIdInclusive, lastDocIdExclusive);
|
||||
} else {
|
||||
return IteratorAndCount.sparseRange(firstDocIdInclusive, lastDocIdExclusive, delegate);
|
||||
}
|
||||
}
|
||||
|
||||
/** Compares the given document's value with a stored reference value. */
|
||||
private interface ValueComparator {
|
||||
int compare(int docID) throws IOException;
|
||||
}
|
||||
|
||||
private static ValueComparator loadComparator(SortField sortField, SortField.Type type, long topValue, LeafReaderContext context)
|
||||
throws IOException {
|
||||
@SuppressWarnings("unchecked")
|
||||
FieldComparator<Number> fieldComparator = (FieldComparator<Number>) sortField.getComparator(1, Pruning.NONE);
|
||||
if (type == Type.INT) {
|
||||
fieldComparator.setTopValue((int) topValue);
|
||||
} else {
|
||||
// Since we support only Type.INT and Type.LONG, assuming LONG for all other cases
|
||||
fieldComparator.setTopValue(topValue);
|
||||
}
|
||||
|
||||
LeafFieldComparator leafFieldComparator = fieldComparator.getLeafComparator(context);
|
||||
int direction = sortField.getReverse() ? -1 : 1;
|
||||
|
||||
return doc -> {
|
||||
int value = leafFieldComparator.compareTop(doc);
|
||||
return direction * value;
|
||||
};
|
||||
}
|
||||
|
||||
private static SortField.Type getSortFieldType(SortField sortField) {
|
||||
// We expect the sortField to be SortedNumericSortField
|
||||
if (sortField instanceof SortedNumericSortField) {
|
||||
return ((SortedNumericSortField) sortField).getNumericType();
|
||||
} else {
|
||||
return sortField.getType();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides a {@code DocIdSetIterator} along with an accurate count of documents provided by the
|
||||
* iterator (or {@code -1} if an accurate count is unknown).
|
||||
*/
|
||||
private record IteratorAndCount(DocIdSetIterator it, int count) {
|
||||
|
||||
static IteratorAndCount empty() {
|
||||
return new IteratorAndCount(DocIdSetIterator.empty(), 0);
|
||||
}
|
||||
|
||||
static IteratorAndCount all(int maxDoc) {
|
||||
return new IteratorAndCount(DocIdSetIterator.all(maxDoc), maxDoc);
|
||||
}
|
||||
|
||||
static IteratorAndCount denseRange(int minDoc, int maxDoc) {
|
||||
return new IteratorAndCount(DocIdSetIterator.range(minDoc, maxDoc), maxDoc - minDoc);
|
||||
}
|
||||
|
||||
static IteratorAndCount sparseRange(int minDoc, int maxDoc, DocIdSetIterator delegate) {
|
||||
return new IteratorAndCount(new BoundedDocIdSetIterator(minDoc, maxDoc, delegate), -1);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* A doc ID set iterator that wraps a delegate iterator and only returns doc IDs in the range
|
||||
* [firstDocInclusive, lastDoc).
|
||||
*/
|
||||
private static class BoundedDocIdSetIterator extends DocIdSetIterator {
|
||||
private final int firstDoc;
|
||||
private final int lastDoc;
|
||||
private final DocIdSetIterator delegate;
|
||||
|
||||
private int docID = -1;
|
||||
|
||||
BoundedDocIdSetIterator(int firstDoc, int lastDoc, DocIdSetIterator delegate) {
|
||||
assert delegate != null;
|
||||
this.firstDoc = firstDoc;
|
||||
this.lastDoc = lastDoc;
|
||||
this.delegate = delegate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int docID() {
|
||||
return docID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int nextDoc() throws IOException {
|
||||
return advance(docID + 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int advance(int target) throws IOException {
|
||||
if (target < firstDoc) {
|
||||
target = firstDoc;
|
||||
}
|
||||
|
||||
int result = delegate.advance(target);
|
||||
if (result < lastDoc) {
|
||||
docID = result;
|
||||
} else {
|
||||
docID = NO_MORE_DOCS;
|
||||
}
|
||||
return docID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long cost() {
|
||||
return Math.min(delegate.cost(), lastDoc - firstDoc);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -17,6 +17,7 @@ import org.apache.lucene.search.ConstantScoreQuery;
|
|||
import org.apache.lucene.search.DocIdSetIterator;
|
||||
import org.apache.lucene.search.IndexOrDocValuesQuery;
|
||||
import org.apache.lucene.search.IndexSearcher;
|
||||
import org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.apache.lucene.search.LeafCollector;
|
||||
import org.apache.lucene.search.MatchNoDocsQuery;
|
||||
import org.apache.lucene.search.PointRangeQuery;
|
||||
|
|
@ -27,7 +28,6 @@ import org.apache.lucene.search.ScorerSupplier;
|
|||
import org.apache.lucene.search.Weight;
|
||||
import org.apache.lucene.util.Bits;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
import org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.elasticsearch.search.aggregations.Aggregator;
|
||||
import org.elasticsearch.xcontent.XContentBuilder;
|
||||
|
||||
|
|
@ -160,8 +160,8 @@ public class QueryToFilterAdapter {
|
|||
query = ((ConstantScoreQuery) query).getQuery();
|
||||
continue;
|
||||
}
|
||||
if (query instanceof XIndexSortSortedNumericDocValuesRangeQuery) {
|
||||
query = ((XIndexSortSortedNumericDocValuesRangeQuery) query).getFallbackQuery();
|
||||
if (query instanceof IndexSortSortedNumericDocValuesRangeQuery) {
|
||||
query = ((IndexSortSortedNumericDocValuesRangeQuery) query).getFallbackQuery();
|
||||
continue;
|
||||
}
|
||||
if (query instanceof IndexOrDocValuesQuery) {
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import org.apache.lucene.index.MultiReader;
|
|||
import org.apache.lucene.index.SortedNumericDocValues;
|
||||
import org.apache.lucene.search.DocIdSetIterator;
|
||||
import org.apache.lucene.search.IndexOrDocValuesQuery;
|
||||
import org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.apache.lucene.store.Directory;
|
||||
import org.elasticsearch.ElasticsearchParseException;
|
||||
|
|
@ -41,7 +42,6 @@ import org.elasticsearch.index.query.DateRangeIncludingNowQuery;
|
|||
import org.elasticsearch.index.query.QueryRewriteContext;
|
||||
import org.elasticsearch.index.query.SearchExecutionContext;
|
||||
import org.elasticsearch.index.query.SearchExecutionContextHelper;
|
||||
import org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.elasticsearch.script.field.DateNanosDocValuesField;
|
||||
import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
|
||||
|
||||
|
|
@ -509,7 +509,7 @@ public class DateFieldTypeTests extends FieldTypeTestCase {
|
|||
|
||||
Query pointQuery = LongPoint.newRangeQuery("field", instant1, instant2);
|
||||
Query dvQuery = SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2);
|
||||
Query expected = new XIndexSortSortedNumericDocValuesRangeQuery(
|
||||
Query expected = new IndexSortSortedNumericDocValuesRangeQuery(
|
||||
"field",
|
||||
instant1,
|
||||
instant2,
|
||||
|
|
@ -518,7 +518,7 @@ public class DateFieldTypeTests extends FieldTypeTestCase {
|
|||
assertEquals(expected, ft.rangeQuery(date1, date2, true, true, null, null, null, context));
|
||||
|
||||
ft = new DateFieldType("field", false);
|
||||
expected = new XIndexSortSortedNumericDocValuesRangeQuery("field", instant1, instant2, dvQuery);
|
||||
expected = new IndexSortSortedNumericDocValuesRangeQuery("field", instant1, instant2, dvQuery);
|
||||
assertEquals(expected, ft.rangeQuery(date1, date2, true, true, null, null, null, context));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexWriterConfig;
|
|||
import org.apache.lucene.sandbox.document.HalfFloatPoint;
|
||||
import org.apache.lucene.search.IndexOrDocValuesQuery;
|
||||
import org.apache.lucene.search.IndexSearcher;
|
||||
import org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.apache.lucene.search.MatchNoDocsQuery;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.apache.lucene.search.Sort;
|
||||
|
|
@ -44,7 +45,6 @@ import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType;
|
|||
import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType;
|
||||
import org.elasticsearch.index.query.SearchExecutionContext;
|
||||
import org.elasticsearch.index.query.SearchExecutionContextHelper;
|
||||
import org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.elasticsearch.script.ScriptCompiler;
|
||||
import org.elasticsearch.search.MultiValueMode;
|
||||
import org.elasticsearch.xcontent.XContentBuilder;
|
||||
|
|
@ -756,8 +756,8 @@ public class NumberFieldTypeTests extends FieldTypeTestCase {
|
|||
context,
|
||||
isIndexed
|
||||
);
|
||||
assertThat(query, instanceOf(XIndexSortSortedNumericDocValuesRangeQuery.class));
|
||||
Query fallbackQuery = ((XIndexSortSortedNumericDocValuesRangeQuery) query).getFallbackQuery();
|
||||
assertThat(query, instanceOf(IndexSortSortedNumericDocValuesRangeQuery.class));
|
||||
Query fallbackQuery = ((IndexSortSortedNumericDocValuesRangeQuery) query).getFallbackQuery();
|
||||
|
||||
if (isIndexed) {
|
||||
assertThat(fallbackQuery, instanceOf(IndexOrDocValuesQuery.class));
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import org.apache.lucene.search.BoostQuery;
|
|||
import org.apache.lucene.search.DisjunctionMaxQuery;
|
||||
import org.apache.lucene.search.FuzzyQuery;
|
||||
import org.apache.lucene.search.IndexOrDocValuesQuery;
|
||||
import org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.apache.lucene.search.MatchAllDocsQuery;
|
||||
import org.apache.lucene.search.MatchNoDocsQuery;
|
||||
import org.apache.lucene.search.PhraseQuery;
|
||||
|
|
@ -28,7 +29,6 @@ import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery;
|
|||
import org.elasticsearch.common.unit.Fuzziness;
|
||||
import org.elasticsearch.core.Strings;
|
||||
import org.elasticsearch.index.query.MultiMatchQueryBuilder.Type;
|
||||
import org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.elasticsearch.test.AbstractQueryTestCase;
|
||||
import org.hamcrest.Matchers;
|
||||
|
||||
|
|
@ -172,7 +172,7 @@ public class MultiMatchQueryBuilderTests extends AbstractQueryTestCase<MultiMatc
|
|||
instanceOf(PointRangeQuery.class),
|
||||
instanceOf(IndexOrDocValuesQuery.class),
|
||||
instanceOf(PrefixQuery.class),
|
||||
instanceOf(XIndexSortSortedNumericDocValuesRangeQuery.class)
|
||||
instanceOf(IndexSortSortedNumericDocValuesRangeQuery.class)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ package org.elasticsearch.compute.lucene;
|
|||
|
||||
import org.apache.lucene.document.DoubleDocValuesField;
|
||||
import org.apache.lucene.document.FloatDocValuesField;
|
||||
import org.apache.lucene.document.LongField;
|
||||
import org.apache.lucene.document.LongPoint;
|
||||
import org.apache.lucene.document.NumericDocValuesField;
|
||||
import org.apache.lucene.document.SortedDocValuesField;
|
||||
|
|
@ -51,7 +52,6 @@ import org.elasticsearch.index.mapper.MappedFieldType;
|
|||
import org.elasticsearch.index.mapper.NumberFieldMapper;
|
||||
import org.elasticsearch.index.mapper.RoutingPathFields;
|
||||
import org.elasticsearch.index.mapper.TimeSeriesIdFieldMapper;
|
||||
import org.elasticsearch.lucene.document.NumericField;
|
||||
import org.hamcrest.Matcher;
|
||||
import org.junit.After;
|
||||
|
||||
|
|
@ -300,7 +300,7 @@ public class TimeSeriesSourceOperatorTests extends AnyOperatorTestCase {
|
|||
}
|
||||
try (var reader = writer.getReader()) {
|
||||
var ctx = new LuceneSourceOperatorTests.MockShardContext(reader, 0);
|
||||
Query query = randomFrom(NumericField.newRangeLongQuery("@timestamp", 0, t0), new MatchNoDocsQuery());
|
||||
Query query = randomFrom(LongField.newRangeQuery("@timestamp", 0, t0), new MatchNoDocsQuery());
|
||||
var timeSeriesFactory = TimeSeriesSourceOperatorFactory.create(
|
||||
Integer.MAX_VALUE,
|
||||
randomIntBetween(1, 1024),
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import org.apache.lucene.document.LongPoint;
|
|||
import org.apache.lucene.document.SortedNumericDocValuesField;
|
||||
import org.apache.lucene.document.StoredField;
|
||||
import org.apache.lucene.search.IndexOrDocValuesQuery;
|
||||
import org.apache.lucene.search.IndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.apache.lucene.search.MatchNoDocsQuery;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.apache.lucene.util.BytesRef;
|
||||
|
|
@ -47,7 +48,6 @@ import org.elasticsearch.index.mapper.TimeSeriesParams;
|
|||
import org.elasticsearch.index.mapper.TimeSeriesParams.MetricType;
|
||||
import org.elasticsearch.index.mapper.ValueFetcher;
|
||||
import org.elasticsearch.index.query.SearchExecutionContext;
|
||||
import org.elasticsearch.lucene.search.XIndexSortSortedNumericDocValuesRangeQuery;
|
||||
import org.elasticsearch.search.DocValueFormat;
|
||||
import org.elasticsearch.search.aggregations.support.TimeSeriesValuesSourceType;
|
||||
import org.elasticsearch.search.aggregations.support.ValuesSourceType;
|
||||
|
|
@ -364,7 +364,7 @@ public class UnsignedLongFieldMapper extends FieldMapper {
|
|||
Query dvQuery = SortedNumericDocValuesField.newSlowRangeQuery(name(), l, u);
|
||||
query = new IndexOrDocValuesQuery(query, dvQuery);
|
||||
if (context.indexSortedOnField(name())) {
|
||||
query = new XIndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
|
||||
query = new IndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
|
||||
}
|
||||
}
|
||||
return query;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue