diff options
| author | Adrien Grand <jpountz@gmail.com> | 2017-06-22 12:35:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-22 12:35:33 +0200 |
| commit | 44e9c0b9473ffa8ce536953ed886988c7bffc95f (patch) | |
| tree | 5666f433b35ada8375dee3c47255d891162e2076 | |
| parent | a9775690858e2272f0f00f917ae1d7c25753909b (diff) | |
Upgrade to lucene-7.0.0-snapshot-ad2cb77. (#25349)
Most notable changes:
- better update concurrency: LUCENE-7868
- TopDocs.totalHits is now a long: LUCENE-7872
- QueryBuilder does not remove the boolean query around multi-term synonyms:
LUCENE-7878
- removal of Fields: LUCENE-7500
For the `TopDocs.totalHits` change, this PR relies on the fact that the encoding
of vInts and vLongs are compatible: you can write and read with any of them as
long as the value can be represented by a positive int.
71 files changed, 144 insertions, 143 deletions
diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 79eb967d34..33568e6bd4 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,6 +1,6 @@ # When updating elasticsearch, please update 'rest' version in core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy elasticsearch = 6.0.0-alpha3 -lucene = 7.0.0-snapshot-92b1783 +lucene = 7.0.0-snapshot-ad2cb77 # optional dependencies spatial4j = 0.6 diff --git a/core/licenses/lucene-analyzers-common-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-analyzers-common-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index e5e1508d04..0000000000 --- a/core/licenses/lucene-analyzers-common-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5bf8d8b7d885e25c343c187d1849580e21ef3fce
\ No newline at end of file diff --git a/core/licenses/lucene-analyzers-common-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-analyzers-common-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..6d1791e8e4 --- /dev/null +++ b/core/licenses/lucene-analyzers-common-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +00d3260223eac0405a82eeeb8439de0e5eb5f888
\ No newline at end of file diff --git a/core/licenses/lucene-backward-codecs-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-backward-codecs-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 7c5e91e955..0000000000 --- a/core/licenses/lucene-backward-codecs-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9696b87e27ea949fabc62606833ab63e6e5473b9
\ No newline at end of file diff --git a/core/licenses/lucene-backward-codecs-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-backward-codecs-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..d20323f264 --- /dev/null +++ b/core/licenses/lucene-backward-codecs-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +3a698989219afd9150738899bc849075c102881b
\ No newline at end of file diff --git a/core/licenses/lucene-core-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-core-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index f63e911d77..0000000000 --- a/core/licenses/lucene-core-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d65b95dc24ce104e4d815b31f7159c5f6e97831d
\ No newline at end of file diff --git a/core/licenses/lucene-core-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-core-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..fbb658a70c --- /dev/null +++ b/core/licenses/lucene-core-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +bb636d31949418943454dbe2d72b9b66cd743f9f
\ No newline at end of file diff --git a/core/licenses/lucene-grouping-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-grouping-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index def2dcc5b9..0000000000 --- a/core/licenses/lucene-grouping-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3afa0db63adea8ee78b958cc85c5a6cb7750a5aa
\ No newline at end of file diff --git a/core/licenses/lucene-grouping-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-grouping-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..dac32fca81 --- /dev/null +++ b/core/licenses/lucene-grouping-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +720252d786273edcc48b2ae7b380bc229fe8930c
\ No newline at end of file diff --git a/core/licenses/lucene-highlighter-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-highlighter-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 1c0713b30e..0000000000 --- a/core/licenses/lucene-highlighter-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -586db5fba5b84d4955e349c3ca77b7df67498a24
\ No newline at end of file diff --git a/core/licenses/lucene-highlighter-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-highlighter-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..83753439b0 --- /dev/null +++ b/core/licenses/lucene-highlighter-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +735178c26f3eb361c30657beeec9e57bd5548d58
\ No newline at end of file diff --git a/core/licenses/lucene-join-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-join-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 5c02cc7188..0000000000 --- a/core/licenses/lucene-join-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8fc234d4474eaa400f5f964e18e9b179d87d86f0
\ No newline at end of file diff --git a/core/licenses/lucene-join-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-join-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..68c8dbc549 --- /dev/null +++ b/core/licenses/lucene-join-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +de5e5cd9b00be4d005d0e51c74084be6c07b0bbd
\ No newline at end of file diff --git a/core/licenses/lucene-memory-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-memory-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 3ef2c1af86..0000000000 --- a/core/licenses/lucene-memory-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3c70558114d053c025d04347b13bd10317c1db69
\ No newline at end of file diff --git a/core/licenses/lucene-memory-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-memory-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..61fcd225c2 --- /dev/null +++ b/core/licenses/lucene-memory-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +796ca5e5a9af3cc21f50156fa7e614338ec15ceb
\ No newline at end of file diff --git a/core/licenses/lucene-misc-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-misc-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 2c8e774917..0000000000 --- a/core/licenses/lucene-misc-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bf80c278e4c1c22b6e1382fc88ed016969596b61
\ No newline at end of file diff --git a/core/licenses/lucene-misc-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-misc-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..df88e725a2 --- /dev/null +++ b/core/licenses/lucene-misc-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +7ba802083c4c97a07d9487c2b26ee39e4f8e3c7e
\ No newline at end of file diff --git a/core/licenses/lucene-queries-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-queries-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index a42cfebc12..0000000000 --- a/core/licenses/lucene-queries-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fb2313a800903b991d21704ebcdce5f07a602259
\ No newline at end of file diff --git a/core/licenses/lucene-queries-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-queries-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..55de2e60d3 --- /dev/null +++ b/core/licenses/lucene-queries-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +d66adfdb3f330b726420db5f8db21b17a0d9991d
\ No newline at end of file diff --git a/core/licenses/lucene-queryparser-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-queryparser-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index ed2de8592f..0000000000 --- a/core/licenses/lucene-queryparser-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -24d1843ffaf4fddbd41c636274a9a8288ccdf964
\ No newline at end of file diff --git a/core/licenses/lucene-queryparser-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-queryparser-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..f77ac55a05 --- /dev/null +++ b/core/licenses/lucene-queryparser-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +569c6362cb87858fc282fd786ba0fda0c44f0a8b
\ No newline at end of file diff --git a/core/licenses/lucene-sandbox-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-sandbox-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 9154d12f67..0000000000 --- a/core/licenses/lucene-sandbox-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6413231d34b23fcbca9fd17ea6c980b594e420ff
\ No newline at end of file diff --git a/core/licenses/lucene-sandbox-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-sandbox-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..b242c76627 --- /dev/null +++ b/core/licenses/lucene-sandbox-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +0ba62e91082910b1057027b8912395da670105d0
\ No newline at end of file diff --git a/core/licenses/lucene-spatial-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-spatial-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 9339869aa2..0000000000 --- a/core/licenses/lucene-spatial-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -634187ab976bcde9905b4167ad273d3db6372a20
\ No newline at end of file diff --git a/core/licenses/lucene-spatial-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-spatial-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..124c8c5a3d --- /dev/null +++ b/core/licenses/lucene-spatial-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +968e678dc4a236bbc8e4c2eb66f5702ea48aae10
\ No newline at end of file diff --git a/core/licenses/lucene-spatial-extras-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-spatial-extras-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index cd47c4d22b..0000000000 --- a/core/licenses/lucene-spatial-extras-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c65576991cd1d9a75e6ee4e4a81e3d20bd160239
\ No newline at end of file diff --git a/core/licenses/lucene-spatial-extras-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-spatial-extras-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..6ebe92a6ab --- /dev/null +++ b/core/licenses/lucene-spatial-extras-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +579670cc27104fdbd627959b7982a99eab1d16d1
\ No newline at end of file diff --git a/core/licenses/lucene-spatial3d-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-spatial3d-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index a1f175b65d..0000000000 --- a/core/licenses/lucene-spatial3d-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -85c7a9adc02245b7a19e5cffed83cc20043cda83
\ No newline at end of file diff --git a/core/licenses/lucene-spatial3d-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-spatial3d-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..cf9ba1ac90 --- /dev/null +++ b/core/licenses/lucene-spatial3d-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +53f3fc06ed3357dc75d7b050172520aa86d41010
\ No newline at end of file diff --git a/core/licenses/lucene-suggest-7.0.0-snapshot-92b1783.jar.sha1 b/core/licenses/lucene-suggest-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 2f59468ce2..0000000000 --- a/core/licenses/lucene-suggest-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ca7464c4b7900d7d514335d98c391851dcd84ce
\ No newline at end of file diff --git a/core/licenses/lucene-suggest-7.0.0-snapshot-ad2cb77.jar.sha1 b/core/licenses/lucene-suggest-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..dcab47e967 --- /dev/null +++ b/core/licenses/lucene-suggest-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +5281aa095f4f46580ea2008ffd040733096d0246
\ No newline at end of file diff --git a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java index 52550f1ba6..10adf530b1 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java @@ -272,7 +272,7 @@ public class Lucene { public static TopDocs readTopDocs(StreamInput in) throws IOException { byte type = in.readByte(); if (type == 0) { - int totalHits = in.readVInt(); + long totalHits = in.readVLong(); float maxScore = in.readFloat(); ScoreDoc[] scoreDocs = new ScoreDoc[in.readVInt()]; @@ -281,7 +281,7 @@ public class Lucene { } return new TopDocs(totalHits, scoreDocs, maxScore); } else if (type == 1) { - int totalHits = in.readVInt(); + long totalHits = in.readVLong(); float maxScore = in.readFloat(); SortField[] fields = new SortField[in.readVInt()]; @@ -385,7 +385,7 @@ public class Lucene { out.writeByte((byte) 2); CollapseTopFieldDocs collapseDocs = (CollapseTopFieldDocs) topDocs; - out.writeVInt(topDocs.totalHits); + out.writeVLong(topDocs.totalHits); out.writeFloat(topDocs.getMaxScore()); out.writeString(collapseDocs.field); @@ -405,7 +405,7 @@ public class Lucene { out.writeByte((byte) 1); TopFieldDocs topFieldDocs = (TopFieldDocs) topDocs; - out.writeVInt(topDocs.totalHits); + out.writeVLong(topDocs.totalHits); out.writeFloat(topDocs.getMaxScore()); out.writeVInt(topFieldDocs.fields.length); @@ -419,7 +419,7 @@ public class Lucene { } } else { out.writeByte((byte) 0); - out.writeVInt(topDocs.totalHits); + out.writeVLong(topDocs.totalHits); out.writeFloat(topDocs.getMaxScore()); out.writeVInt(topDocs.scoreDocs.length); diff --git a/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java b/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java index ae3d978928..2b37c338c9 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java @@ -19,7 +19,6 @@ package org.elasticsearch.common.lucene.uid; * under the License. */ -import org.apache.lucene.index.Fields; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; @@ -67,8 +66,7 @@ final class PerThreadIDVersionAndSeqNoLookup { */ PerThreadIDVersionAndSeqNoLookup(LeafReader reader, String uidField) throws IOException { this.uidField = uidField; - Fields fields = reader.fields(); - Terms terms = fields.terms(uidField); + Terms terms = reader.terms(uidField); if (terms == null) { throw new IllegalArgumentException("reader misses the [" + uidField + "] field"); } diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java index eab98040bb..fa126d6813 100644 --- a/core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java +++ b/core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java @@ -180,8 +180,7 @@ public class PagedBytesIndexFieldData extends AbstractIndexOrdinalsFieldData { LeafReader reader = context.reader(); Terms terms = reader.terms(getFieldName()); - Fields fields = reader.fields(); - final Terms fieldTerms = fields.terms(getFieldName()); + final Terms fieldTerms = reader.terms(getFieldName()); if (fieldTerms instanceof FieldReader) { final Stats stats = ((FieldReader) fieldTerms).getStats(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java index d1986f2dd2..e2cb84f03a 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java @@ -191,7 +191,7 @@ public class InternalTopHits extends InternalAggregation implements TopHits { protected int doHashCode() { int hashCode = from; hashCode = 31 * hashCode + size; - hashCode = 31 * hashCode + topDocs.totalHits; + hashCode = 31 * hashCode + Long.hashCode(topDocs.totalHits); for (int d = 0; d < topDocs.scoreDocs.length; d++) { ScoreDoc doc = topDocs.scoreDocs[d]; hashCode = 31 * hashCode + doc.doc; diff --git a/core/src/main/java/org/elasticsearch/search/internal/ScrollContext.java b/core/src/main/java/org/elasticsearch/search/internal/ScrollContext.java index 163dbcc73d..75d48d5d63 100644 --- a/core/src/main/java/org/elasticsearch/search/internal/ScrollContext.java +++ b/core/src/main/java/org/elasticsearch/search/internal/ScrollContext.java @@ -30,7 +30,7 @@ public final class ScrollContext { private Map<String, Object> context = null; - public int totalHits = -1; + public long totalHits = -1; public float maxScore; public ScoreDoc lastEmittedDoc; public Scroll scroll; diff --git a/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java b/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java index f071c62f12..8549f42040 100644 --- a/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java +++ b/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java @@ -56,7 +56,7 @@ public final class QuerySearchResult extends SearchPhaseResult { private ProfileShardResult profileShardResults; private boolean hasProfileResults; private boolean hasScoreDocs; - private int totalHits; + private long totalHits; private float maxScore; public QuerySearchResult() { @@ -317,7 +317,7 @@ public final class QuerySearchResult extends SearchPhaseResult { out.writeOptionalWriteable(profileShardResults); } - public int getTotalHits() { + public long getTotalHits() { return totalHits; } diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java index 8b5761a7e9..c9b8356362 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java @@ -20,7 +20,8 @@ package org.elasticsearch.search.suggest.completion; import com.carrotsearch.hppc.ObjectLongHashMap; -import org.apache.lucene.index.Fields; + +import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; @@ -49,14 +50,13 @@ public class CompletionFieldStats { for (LeafReaderContext atomicReaderContext : indexReader.leaves()) { LeafReader atomicReader = atomicReaderContext.reader(); try { - Fields fields = atomicReader.fields(); - for (String fieldName : fields) { - Terms terms = fields.terms(fieldName); + for (FieldInfo info : atomicReader.getFieldInfos()) { + Terms terms = atomicReader.terms(info.name); if (terms instanceof CompletionTerms) { // TODO: currently we load up the suggester for reporting its size long fstSize = ((CompletionTerms) terms).suggester().ramBytesUsed(); - if (fieldNamePatterns != null && fieldNamePatterns.length > 0 && Regex.simpleMatch(fieldNamePatterns, fieldName)) { - completionFields.addTo(fieldName, fstSize); + if (fieldNamePatterns != null && fieldNamePatterns.length > 0 && Regex.simpleMatch(fieldNamePatterns, info.name)) { + completionFields.addTo(info.name, fstSize); } sizeInBytes += fstSize; } diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy index 722a928f56..8496eaa529 100644 --- a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy +++ b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy @@ -31,7 +31,7 @@ grant codeBase "${codebase.securesm-1.1.jar}" { //// Very special jar permissions: //// These are dangerous permissions that we don't want to grant to everything. -grant codeBase "${codebase.lucene-core-7.0.0-snapshot-92b1783.jar}" { +grant codeBase "${codebase.lucene-core-7.0.0-snapshot-ad2cb77.jar}" { // needed to allow MMapDirectory's "unmap hack" (die unmap hack, die) // java 8 package permission java.lang.RuntimePermission "accessClassInPackage.sun.misc"; @@ -42,7 +42,7 @@ grant codeBase "${codebase.lucene-core-7.0.0-snapshot-92b1783.jar}" { permission java.lang.RuntimePermission "accessDeclaredMembers"; }; -grant codeBase "${codebase.lucene-misc-7.0.0-snapshot-92b1783.jar}" { +grant codeBase "${codebase.lucene-misc-7.0.0-snapshot-ad2cb77.jar}" { // needed to allow shard shrinking to use hard-links if possible via lucenes HardlinkCopyDirectoryWrapper permission java.nio.file.LinkPermission "hard"; }; diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy index 4f10cf6edb..5e40e47b9f 100644 --- a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy +++ b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy @@ -33,7 +33,7 @@ grant codeBase "${codebase.securemock-1.2.jar}" { permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; }; -grant codeBase "${codebase.lucene-test-framework-7.0.0-snapshot-92b1783.jar}" { +grant codeBase "${codebase.lucene-test-framework-7.0.0-snapshot-ad2cb77.jar}" { // needed by RamUsageTester permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; // needed for testing hardlinks in StoreRecoveryTests since we install MockFS diff --git a/core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java b/core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java index eec611146a..27544448e0 100644 --- a/core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java +++ b/core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java @@ -75,7 +75,7 @@ public class CustomUnifiedHighlighterTests extends ESTestCase { IndexSearcher searcher = newSearcher(reader); iw.close(); TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), 1, Sort.INDEXORDER); - assertThat(topDocs.totalHits, equalTo(1)); + assertThat(topDocs.totalHits, equalTo(1L)); String rawValue = Strings.arrayToDelimitedString(inputs, String.valueOf(MULTIVAL_SEP_CHAR)); CustomUnifiedHighlighter highlighter = new CustomUnifiedHighlighter(searcher, analyzer, new CustomPassageFormatter("<b>", "</b>", new DefaultEncoder()), locale, breakIterator, rawValue, diff --git a/core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java b/core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java index ff8b25c796..d067b813d1 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java @@ -81,7 +81,7 @@ public class SimpleAllTests extends ESTestCase { Query query = new AllTermQuery(new Term("_all", "else")); TopDocs docs = searcher.search(query, 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(0)); assertExplanationScore(searcher, query, docs.scoreDocs[0]); assertThat(docs.scoreDocs[1].doc, equalTo(1)); @@ -89,7 +89,7 @@ public class SimpleAllTests extends ESTestCase { query = new AllTermQuery(new Term("_all", "something")); docs = searcher.search(query, 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(0)); assertExplanationScore(searcher, query, docs.scoreDocs[0]); assertThat(docs.scoreDocs[1].doc, equalTo(1)); @@ -123,7 +123,7 @@ public class SimpleAllTests extends ESTestCase { // this one is boosted. so the second doc is more relevant Query query = new AllTermQuery(new Term("_all", "else")); TopDocs docs = searcher.search(query, 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(1)); assertExplanationScore(searcher, query, docs.scoreDocs[0]); assertThat(docs.scoreDocs[1].doc, equalTo(0)); @@ -131,7 +131,7 @@ public class SimpleAllTests extends ESTestCase { query = new AllTermQuery(new Term("_all", "something")); docs = searcher.search(query, 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(0)); assertExplanationScore(searcher, query, docs.scoreDocs[0]); assertThat(docs.scoreDocs[1].doc, equalTo(1)); @@ -192,22 +192,22 @@ public class SimpleAllTests extends ESTestCase { IndexSearcher searcher = new IndexSearcher(reader); TopDocs docs = searcher.search(new AllTermQuery(new Term("_all", "else")), 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(0)); assertThat(docs.scoreDocs[1].doc, equalTo(1)); docs = searcher.search(new AllTermQuery(new Term("_all", "koo")), 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(0)); assertThat(docs.scoreDocs[1].doc, equalTo(1)); docs = searcher.search(new AllTermQuery(new Term("_all", "something")), 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(0)); assertThat(docs.scoreDocs[1].doc, equalTo(1)); docs = searcher.search(new AllTermQuery(new Term("_all", "moo")), 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(0)); assertThat(docs.scoreDocs[1].doc, equalTo(1)); @@ -237,22 +237,22 @@ public class SimpleAllTests extends ESTestCase { IndexSearcher searcher = new IndexSearcher(reader); TopDocs docs = searcher.search(new AllTermQuery(new Term("_all", "else")), 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(1)); assertThat(docs.scoreDocs[1].doc, equalTo(0)); docs = searcher.search(new AllTermQuery(new Term("_all", "koo")), 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(1)); assertThat(docs.scoreDocs[1].doc, equalTo(0)); docs = searcher.search(new AllTermQuery(new Term("_all", "something")), 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(0)); assertThat(docs.scoreDocs[1].doc, equalTo(1)); docs = searcher.search(new AllTermQuery(new Term("_all", "moo")), 10); - assertThat(docs.totalHits, equalTo(2)); + assertThat(docs.totalHits, equalTo(2L)); assertThat(docs.scoreDocs[0].doc, equalTo(0)); assertThat(docs.scoreDocs[1].doc, equalTo(1)); @@ -273,7 +273,7 @@ public class SimpleAllTests extends ESTestCase { IndexSearcher searcher = new IndexSearcher(reader); TopDocs docs = searcher.search(new MatchAllDocsQuery(), 10); - assertThat(docs.totalHits, equalTo(1)); + assertThat(docs.totalHits, equalTo(1L)); assertThat(docs.scoreDocs[0].doc, equalTo(0)); } } diff --git a/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java b/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java index 5e02da294c..0475c324f0 100644 --- a/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java +++ b/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java @@ -62,7 +62,7 @@ public class VectorHighlighterTests extends ESTestCase { IndexSearcher searcher = new IndexSearcher(reader); TopDocs topDocs = searcher.search(new TermQuery(new Term("_id", "1")), 1); - assertThat(topDocs.totalHits, equalTo(1)); + assertThat(topDocs.totalHits, equalTo(1L)); FastVectorHighlighter highlighter = new FastVectorHighlighter(); String fragment = highlighter.getBestFragment(highlighter.getFieldQuery(new TermQuery(new Term("content", "bad"))), @@ -88,7 +88,7 @@ public class VectorHighlighterTests extends ESTestCase { IndexSearcher searcher = new IndexSearcher(reader); TopDocs topDocs = searcher.search(new TermQuery(new Term("_id", "1")), 1); - assertThat(topDocs.totalHits, equalTo(1)); + assertThat(topDocs.totalHits, equalTo(1L)); FastVectorHighlighter highlighter = new FastVectorHighlighter(); @@ -129,7 +129,7 @@ public class VectorHighlighterTests extends ESTestCase { IndexSearcher searcher = new IndexSearcher(reader); TopDocs topDocs = searcher.search(new TermQuery(new Term("_id", "1")), 1); - assertThat(topDocs.totalHits, equalTo(1)); + assertThat(topDocs.totalHits, equalTo(1L)); FastVectorHighlighter highlighter = new FastVectorHighlighter(); String fragment = highlighter.getBestFragment(highlighter.getFieldQuery(new TermQuery(new Term("content", "bad"))), @@ -150,7 +150,7 @@ public class VectorHighlighterTests extends ESTestCase { IndexSearcher searcher = new IndexSearcher(reader); TopDocs topDocs = searcher.search(new TermQuery(new Term("_id", "1")), 1); - assertThat(topDocs.totalHits, equalTo(1)); + assertThat(topDocs.totalHits, equalTo(1L)); FastVectorHighlighter highlighter = new FastVectorHighlighter(); String fragment = highlighter.getBestFragment(highlighter.getFieldQuery(new TermQuery(new Term("content", "bad"))), diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 6cd9328558..a955f01991 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -1963,7 +1963,7 @@ public class InternalEngineTests extends ESTestCase { final String formattedMessage = event.getMessage().getFormattedMessage(); if (event.getLevel() == Level.TRACE && event.getMarker().getName().contains("[index][0] ")) { if (event.getLoggerName().endsWith(".IW") && - formattedMessage.contains("IW: apply all deletes during flush")) { + formattedMessage.contains("IW: now apply all deletes")) { sawIndexWriterMessage = true; } if (event.getLoggerName().endsWith(".IFD")) { @@ -2535,7 +2535,7 @@ public class InternalEngineTests extends ESTestCase { engine = new InternalEngine(copy(engine.config(), EngineConfig.OpenMode.OPEN_INDEX_CREATE_TRANSLOG)); try (Engine.Searcher searcher = engine.acquireSearcher("test")) { TopDocs topDocs = searcher.searcher().search(new MatchAllDocsQuery(), randomIntBetween(numDocs, numDocs + 10)); - assertThat(topDocs.totalHits, equalTo(0)); + assertThat(topDocs.totalHits, equalTo(0L)); } } @@ -2626,7 +2626,7 @@ public class InternalEngineTests extends ESTestCase { engine.refresh("test"); try (Engine.Searcher searcher = engine.acquireSearcher("test")) { TopDocs topDocs = searcher.searcher().search(new MatchAllDocsQuery(), randomIntBetween(numDocs, numDocs + numExtraDocs)); - assertThat(topDocs.totalHits, equalTo(numDocs + numExtraDocs)); + assertThat(topDocs.totalHits, equalTo((long) numDocs + numExtraDocs)); } } IOUtils.close(store, directory); @@ -2694,14 +2694,14 @@ public class InternalEngineTests extends ESTestCase { assertThat(result.getVersion(), equalTo(2L)); try (Engine.Searcher searcher = engine.acquireSearcher("test")) { TopDocs topDocs = searcher.searcher().search(new MatchAllDocsQuery(), numDocs + 1); - assertThat(topDocs.totalHits, equalTo(numDocs + 1)); + assertThat(topDocs.totalHits, equalTo(numDocs + 1L)); } engine.close(); engine = createEngine(store, primaryTranslogDir); try (Engine.Searcher searcher = engine.acquireSearcher("test")) { TopDocs topDocs = searcher.searcher().search(new MatchAllDocsQuery(), numDocs + 1); - assertThat(topDocs.totalHits, equalTo(numDocs + 1)); + assertThat(topDocs.totalHits, equalTo(numDocs + 1L)); } parser = (TranslogHandler) engine.config().getTranslogRecoveryRunner(); assertEquals(flush ? 1 : 2, parser.appliedOperations.get()); @@ -2714,7 +2714,7 @@ public class InternalEngineTests extends ESTestCase { } try (Engine.Searcher searcher = engine.acquireSearcher("test")) { TopDocs topDocs = searcher.searcher().search(new MatchAllDocsQuery(), numDocs); - assertThat(topDocs.totalHits, equalTo(numDocs)); + assertThat(topDocs.totalHits, equalTo((long) numDocs)); } } diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java index c22114e28a..df6328feab 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java @@ -114,7 +114,7 @@ public abstract class AbstractFieldDataImplTestCase extends AbstractFieldDataTes SortField sortField = indexFieldData.sortField(null, MultiValueMode.MIN, null, false); topDocs = searcher.search(new MatchAllDocsQuery(), 10, new Sort(sortField)); - assertThat(topDocs.totalHits, equalTo(3)); + assertThat(topDocs.totalHits, equalTo(3L)); assertThat(topDocs.scoreDocs[0].doc, equalTo(1)); assertThat(toString(((FieldDoc) topDocs.scoreDocs[0]).fields[0]), equalTo(one())); assertThat(topDocs.scoreDocs[1].doc, equalTo(0)); @@ -125,7 +125,7 @@ public abstract class AbstractFieldDataImplTestCase extends AbstractFieldDataTes sortField = indexFieldData.sortField(null, MultiValueMode.MAX, null, true); topDocs = searcher.search(new MatchAllDocsQuery(), 10, new Sort(sortField)); - assertThat(topDocs.totalHits, equalTo(3)); + assertThat(topDocs.totalHits, equalTo(3L)); assertThat(topDocs.scoreDocs[0].doc, equalTo(2)); assertThat(topDocs.scoreDocs[1].doc, equalTo(0)); assertThat(topDocs.scoreDocs[2].doc, equalTo(1)); @@ -191,7 +191,7 @@ public abstract class AbstractFieldDataImplTestCase extends AbstractFieldDataTes IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(writer)); SortField sortField = indexFieldData.sortField(null, MultiValueMode.MIN, null, false); TopFieldDocs topDocs = searcher.search(new MatchAllDocsQuery(), 10, new Sort(sortField)); - assertThat(topDocs.totalHits, equalTo(3)); + assertThat(topDocs.totalHits, equalTo(3L)); assertThat(topDocs.scoreDocs.length, equalTo(3)); assertThat(topDocs.scoreDocs[0].doc, equalTo(1)); assertThat(topDocs.scoreDocs[1].doc, equalTo(0)); @@ -199,7 +199,7 @@ public abstract class AbstractFieldDataImplTestCase extends AbstractFieldDataTes ; sortField = indexFieldData.sortField(null, MultiValueMode.MAX, null, true); topDocs = searcher.search(new MatchAllDocsQuery(), 10, new Sort(sortField)); - assertThat(topDocs.totalHits, equalTo(3)); + assertThat(topDocs.totalHits, equalTo(3L)); assertThat(topDocs.scoreDocs.length, equalTo(3)); assertThat(topDocs.scoreDocs[0].doc, equalTo(0)); assertThat(topDocs.scoreDocs[1].doc, equalTo(2)); @@ -258,7 +258,7 @@ public abstract class AbstractFieldDataImplTestCase extends AbstractFieldDataTes indexFieldData.sortField(null, MultiValueMode.MIN, null, false); TopFieldDocs topDocs = searcher.search(new MatchAllDocsQuery(), 10, new Sort(sortField)); - assertThat(topDocs.totalHits, equalTo(8)); + assertThat(topDocs.totalHits, equalTo(8L)); assertThat(topDocs.scoreDocs.length, equalTo(8)); assertThat(topDocs.scoreDocs[0].doc, equalTo(7)); assertThat(((BytesRef) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).utf8ToString(), equalTo("!08")); @@ -280,7 +280,7 @@ public abstract class AbstractFieldDataImplTestCase extends AbstractFieldDataTes sortField = indexFieldData.sortField(null, MultiValueMode.MAX, null, true); topDocs = searcher.search(new MatchAllDocsQuery(), 10, new Sort(sortField)); - assertThat(topDocs.totalHits, equalTo(8)); + assertThat(topDocs.totalHits, equalTo(8L)); assertThat(topDocs.scoreDocs.length, equalTo(8)); assertThat(topDocs.scoreDocs[0].doc, equalTo(6)); assertThat(((BytesRef) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).utf8ToString(), equalTo("10")); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java b/core/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java index 2acd6b5c98..3f2dc28610 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java @@ -70,25 +70,25 @@ public class DoubleIndexingDocTests extends ESSingleNodeTestCase { IndexSearcher searcher = new IndexSearcher(reader); TopDocs topDocs = searcher.search(mapper.mappers().smartNameFieldMapper("field1").fieldType().termQuery("value1", context), 10); - assertThat(topDocs.totalHits, equalTo(2)); + assertThat(topDocs.totalHits, equalTo(2L)); topDocs = searcher.search(mapper.mappers().smartNameFieldMapper("field2").fieldType().termQuery("1", context), 10); - assertThat(topDocs.totalHits, equalTo(2)); + assertThat(topDocs.totalHits, equalTo(2L)); topDocs = searcher.search(mapper.mappers().smartNameFieldMapper("field3").fieldType().termQuery("1.1", context), 10); - assertThat(topDocs.totalHits, equalTo(2)); + assertThat(topDocs.totalHits, equalTo(2L)); topDocs = searcher.search(mapper.mappers().smartNameFieldMapper("field4").fieldType().termQuery("2010-01-01", context), 10); - assertThat(topDocs.totalHits, equalTo(2)); + assertThat(topDocs.totalHits, equalTo(2L)); topDocs = searcher.search(mapper.mappers().smartNameFieldMapper("field5").fieldType().termQuery("1", context), 10); - assertThat(topDocs.totalHits, equalTo(2)); + assertThat(topDocs.totalHits, equalTo(2L)); topDocs = searcher.search(mapper.mappers().smartNameFieldMapper("field5").fieldType().termQuery("2", context), 10); - assertThat(topDocs.totalHits, equalTo(2)); + assertThat(topDocs.totalHits, equalTo(2L)); topDocs = searcher.search(mapper.mappers().smartNameFieldMapper("field5").fieldType().termQuery("3", context), 10); - assertThat(topDocs.totalHits, equalTo(2)); + assertThat(topDocs.totalHits, equalTo(2L)); writer.close(); reader.close(); dir.close(); diff --git a/core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java index ca3850c411..038eadeff7 100644 --- a/core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java @@ -62,7 +62,6 @@ import org.joda.time.DateTimeZone; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -401,12 +400,18 @@ public class QueryStringQueryBuilderTests extends AbstractQueryTestCase<QueryStr // simple multi-term Query query = queryParser.parse("guinea pig"); + Query guineaPig = new BooleanQuery.Builder() + .add(new TermQuery(new Term(STRING_FIELD_NAME, "guinea")), Occur.MUST) + .add(new TermQuery(new Term(STRING_FIELD_NAME, "pig")), Occur.MUST) + .build(); + TermQuery cavy = new TermQuery(new Term(STRING_FIELD_NAME, "cavy")); + Query expectedQuery = new BooleanQuery.Builder() .add(new BooleanQuery.Builder() - .add(new TermQuery(new Term(STRING_FIELD_NAME, "guinea")), Occur.MUST) - .add(new TermQuery(new Term(STRING_FIELD_NAME, "pig")), Occur.MUST).build(), defaultOp) - .add(new TermQuery(new Term(STRING_FIELD_NAME, "cavy")), defaultOp) - .build(); + .add(guineaPig, Occur.SHOULD) + .add(cavy, Occur.SHOULD) + .build(), + defaultOp).build(); assertThat(query, Matchers.equalTo(expectedQuery)); // simple with additional tokens @@ -414,11 +419,8 @@ public class QueryStringQueryBuilderTests extends AbstractQueryTestCase<QueryStr expectedQuery = new BooleanQuery.Builder() .add(new TermQuery(new Term(STRING_FIELD_NAME, "that")), defaultOp) .add(new BooleanQuery.Builder() - .add(new BooleanQuery.Builder() - .add(new BooleanClause(new TermQuery(new Term(STRING_FIELD_NAME, "guinea")), Occur.MUST)) - .add(new BooleanClause(new TermQuery(new Term(STRING_FIELD_NAME, "pig")), Occur.MUST)) - .build(), Occur.SHOULD) - .add(new TermQuery(new Term(STRING_FIELD_NAME, "cavy")), Occur.SHOULD).build(), defaultOp) + .add(guineaPig, Occur.SHOULD) + .add(cavy, Occur.SHOULD).build(), defaultOp) .add(new TermQuery(new Term(STRING_FIELD_NAME, "smells")), defaultOp) .build(); assertThat(query, Matchers.equalTo(expectedQuery)); @@ -429,10 +431,9 @@ public class QueryStringQueryBuilderTests extends AbstractQueryTestCase<QueryStr .add(new TermQuery(new Term(STRING_FIELD_NAME, "that")), Occur.MUST) .add(new BooleanQuery.Builder() .add(new BooleanQuery.Builder() - .add(new TermQuery(new Term(STRING_FIELD_NAME, "guinea")), Occur.MUST) - .add(new TermQuery(new Term(STRING_FIELD_NAME, "pig")), Occur.MUST) - .build(), defaultOp) - .add(new TermQuery(new Term(STRING_FIELD_NAME, "cavy")), defaultOp) + .add(guineaPig, Occur.SHOULD) + .add(cavy, Occur.SHOULD) + .build(), defaultOp) .build(), Occur.MUST_NOT) .add(new TermQuery(new Term(STRING_FIELD_NAME, "smells")), Occur.MUST) .build(); diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java b/core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java index 4d73ce48a2..d4dc71388a 100644 --- a/core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java +++ b/core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java @@ -226,7 +226,7 @@ public abstract class AbstractNumberNestedSortingTestCase extends AbstractFieldD Sort sort = new Sort(new SortField("field2", nestedComparatorSource)); TopFieldDocs topDocs = searcher.search(query, 5, sort); - assertThat(topDocs.totalHits, equalTo(7)); + assertThat(topDocs.totalHits, equalTo(7L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(11)); assertThat(((Number) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).intValue(), equalTo(7)); @@ -241,7 +241,7 @@ public abstract class AbstractNumberNestedSortingTestCase extends AbstractFieldD sort = new Sort(new SortField("field2", nestedComparatorSource, true)); topDocs = searcher.search(query, 5, sort); - assertThat(topDocs.totalHits, equalTo(7)); + assertThat(topDocs.totalHits, equalTo(7L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(28)); assertThat(((Number) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).intValue(), equalTo(13)); @@ -263,7 +263,7 @@ public abstract class AbstractNumberNestedSortingTestCase extends AbstractFieldD ); sort = new Sort(new SortField("field2", nestedComparatorSource, true)); topDocs = searcher.search(query, 5, sort); - assertThat(topDocs.totalHits, equalTo(6)); + assertThat(topDocs.totalHits, equalTo(6L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(23)); assertThat(((Number) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).intValue(), equalTo(12)); @@ -278,7 +278,7 @@ public abstract class AbstractNumberNestedSortingTestCase extends AbstractFieldD sort = new Sort(new SortField("field2", nestedComparatorSource)); topDocs = searcher.search(query, 5, sort); - assertThat(topDocs.totalHits, equalTo(6)); + assertThat(topDocs.totalHits, equalTo(6L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(15)); assertThat(((Number) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).intValue(), equalTo(3)); @@ -294,7 +294,7 @@ public abstract class AbstractNumberNestedSortingTestCase extends AbstractFieldD nestedComparatorSource = createFieldComparator("field2", sortMode, 127, createNested(searcher, parentFilter, childFilter)); sort = new Sort(new SortField("field2", nestedComparatorSource, true)); topDocs = searcher.search(new TermQuery(new Term("__type", "parent")), 5, sort); - assertThat(topDocs.totalHits, equalTo(8)); + assertThat(topDocs.totalHits, equalTo(8L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(19)); assertThat(((Number) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).intValue(), equalTo(127)); @@ -310,7 +310,7 @@ public abstract class AbstractNumberNestedSortingTestCase extends AbstractFieldD nestedComparatorSource = createFieldComparator("field2", sortMode, -127, createNested(searcher, parentFilter, childFilter)); sort = new Sort(new SortField("field2", nestedComparatorSource)); topDocs = searcher.search(new TermQuery(new Term("__type", "parent")), 5, sort); - assertThat(topDocs.totalHits, equalTo(8)); + assertThat(topDocs.totalHits, equalTo(8L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(19)); assertThat(((Number) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).intValue(), equalTo(-127)); @@ -336,7 +336,7 @@ public abstract class AbstractNumberNestedSortingTestCase extends AbstractFieldD Query query = new ToParentBlockJoinQuery(new ConstantScoreQuery(childFilter), new QueryBitSetProducer(parentFilter), ScoreMode.None); Sort sort = new Sort(new SortField("field2", nestedComparatorSource)); TopDocs topDocs = searcher.search(query, 5, sort); - assertThat(topDocs.totalHits, equalTo(7)); + assertThat(topDocs.totalHits, equalTo(7L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(11)); assertThat(((Number) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).intValue(), equalTo(2)); diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java b/core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java index 1dc982270f..c643ea6cee 100644 --- a/core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java @@ -69,7 +69,7 @@ public class DoubleNestedSortingTests extends AbstractNumberNestedSortingTestCas Query query = new ToParentBlockJoinQuery(new ConstantScoreQuery(childFilter), new QueryBitSetProducer(parentFilter), ScoreMode.None); Sort sort = new Sort(new SortField("field2", nestedComparatorSource)); TopDocs topDocs = searcher.search(query, 5, sort); - assertThat(topDocs.totalHits, equalTo(7)); + assertThat(topDocs.totalHits, equalTo(7L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(11)); assertThat(((Number) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).intValue(), equalTo(2)); diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java b/core/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java index 4262b95909..13d0e83e37 100644 --- a/core/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java @@ -68,7 +68,7 @@ public class FloatNestedSortingTests extends DoubleNestedSortingTests { Query query = new ToParentBlockJoinQuery(new ConstantScoreQuery(childFilter), new QueryBitSetProducer(parentFilter), ScoreMode.None); Sort sort = new Sort(new SortField("field2", nestedComparatorSource)); TopDocs topDocs = searcher.search(query, 5, sort); - assertThat(topDocs.totalHits, equalTo(7)); + assertThat(topDocs.totalHits, equalTo(7L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(11)); assertThat(((Number) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).intValue(), equalTo(2)); diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java b/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java index c9c48a9f96..823ccf91d3 100644 --- a/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java @@ -285,7 +285,7 @@ public class NestedSortingTests extends AbstractFieldDataTestCase { Sort sort = new Sort(new SortField("field2", nestedComparatorSource)); TopFieldDocs topDocs = searcher.search(query, 5, sort); - assertThat(topDocs.totalHits, equalTo(7)); + assertThat(topDocs.totalHits, equalTo(7L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(3)); assertThat(((BytesRef) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).utf8ToString(), equalTo("a")); @@ -302,7 +302,7 @@ public class NestedSortingTests extends AbstractFieldDataTestCase { nestedComparatorSource = new BytesRefFieldComparatorSource(indexFieldData, null, sortMode, createNested(searcher, parentFilter, childFilter)); sort = new Sort(new SortField("field2", nestedComparatorSource, true)); topDocs = searcher.search(query, 5, sort); - assertThat(topDocs.totalHits, equalTo(7)); + assertThat(topDocs.totalHits, equalTo(7L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(28)); assertThat(((BytesRef) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).utf8ToString(), equalTo("o")); @@ -328,7 +328,7 @@ public class NestedSortingTests extends AbstractFieldDataTestCase { ); sort = new Sort(new SortField("field2", nestedComparatorSource, true)); topDocs = searcher.search(query, 5, sort); - assertThat(topDocs.totalHits, equalTo(6)); + assertThat(topDocs.totalHits, equalTo(6L)); assertThat(topDocs.scoreDocs.length, equalTo(5)); assertThat(topDocs.scoreDocs[0].doc, equalTo(23)); assertThat(((BytesRef) ((FieldDoc) topDocs.scoreDocs[0]).fields[0]).utf8ToString(), equalTo("m")); diff --git a/core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java b/core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java index b05c6dff04..016406c612 100644 --- a/core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java +++ b/core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java @@ -217,18 +217,18 @@ public class QueryPhaseTests extends ESTestCase { context.setSize(10); QueryPhase.execute(context, contextSearcher, null); - assertThat(context.queryResult().topDocs().totalHits, equalTo(numDocs)); + assertThat(context.queryResult().topDocs().totalHits, equalTo((long) numDocs)); assertTrue(collected.get()); assertNull(context.queryResult().terminatedEarly()); assertThat(context.terminateAfter(), equalTo(0)); - assertThat(context.queryResult().getTotalHits(), equalTo(numDocs)); + assertThat(context.queryResult().getTotalHits(), equalTo((long) numDocs)); QueryPhase.execute(context, contextSearcher, null); - assertThat(context.queryResult().topDocs().totalHits, equalTo(numDocs)); + assertThat(context.queryResult().topDocs().totalHits, equalTo((long) numDocs)); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); assertThat(context.terminateAfter(), equalTo(10)); - assertThat(context.queryResult().getTotalHits(), equalTo(numDocs)); + assertThat(context.queryResult().getTotalHits(), equalTo((long) numDocs)); assertThat(context.queryResult().topDocs().scoreDocs[0].doc, greaterThanOrEqualTo(10)); reader.close(); dir.close(); @@ -270,14 +270,14 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, null); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, equalTo(1)); + assertThat(context.queryResult().topDocs().totalHits, equalTo(1L)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(1)); context.setSize(0); QueryPhase.execute(context, contextSearcher, null); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, equalTo(1)); + assertThat(context.queryResult().topDocs().totalHits, equalTo(1L)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(0)); } @@ -286,7 +286,7 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, null); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, equalTo(1)); + assertThat(context.queryResult().topDocs().totalHits, equalTo(1L)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(1)); } { @@ -300,7 +300,7 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, null); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, equalTo(1)); + assertThat(context.queryResult().topDocs().totalHits, equalTo(1L)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(1)); context.setSize(0); @@ -309,7 +309,7 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, null); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, equalTo(1)); + assertThat(context.queryResult().topDocs().totalHits, equalTo(1L)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(0)); } { @@ -320,7 +320,7 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, null); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, equalTo(1)); + assertThat(context.queryResult().topDocs().totalHits, equalTo(1L)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(1)); } { @@ -331,7 +331,7 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, null); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, equalTo(1)); + assertThat(context.queryResult().topDocs().totalHits, equalTo(1L)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(0)); assertThat(collector.getTotalHits(), equalTo(1)); } @@ -377,7 +377,7 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, sort); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, equalTo(numDocs)); + assertThat(context.queryResult().topDocs().totalHits, equalTo((long) numDocs)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(1)); assertThat(context.queryResult().topDocs().scoreDocs[0], instanceOf(FieldDoc.class)); FieldDoc fieldDoc = (FieldDoc) context.queryResult().topDocs().scoreDocs[0]; @@ -390,7 +390,7 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, sort); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, equalTo(numDocs - 1)); + assertThat(context.queryResult().topDocs().totalHits, equalTo(numDocs - 1L)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(1)); assertThat(context.queryResult().topDocs().scoreDocs[0], instanceOf(FieldDoc.class)); assertThat(fieldDoc.fields[0], anyOf(equalTo(1), equalTo(2))); @@ -402,7 +402,7 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, sort); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, equalTo(numDocs)); + assertThat(context.queryResult().topDocs().totalHits, equalTo((long) numDocs)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(1)); assertThat(context.queryResult().topDocs().scoreDocs[0], instanceOf(FieldDoc.class)); assertThat(fieldDoc.fields[0], anyOf(equalTo(1), equalTo(2))); @@ -416,7 +416,7 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, sort); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, lessThan(numDocs)); + assertThat(context.queryResult().topDocs().totalHits, lessThan((long) numDocs)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(1)); assertThat(context.queryResult().topDocs().scoreDocs[0], instanceOf(FieldDoc.class)); assertThat(fieldDoc.fields[0], anyOf(equalTo(1), equalTo(2))); @@ -427,7 +427,7 @@ public class QueryPhaseTests extends ESTestCase { QueryPhase.execute(context, contextSearcher, sort); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); - assertThat(context.queryResult().topDocs().totalHits, lessThan(numDocs)); + assertThat(context.queryResult().topDocs().totalHits, lessThan((long) numDocs)); assertThat(context.queryResult().topDocs().scoreDocs.length, equalTo(1)); assertThat(context.queryResult().topDocs().scoreDocs[0], instanceOf(FieldDoc.class)); assertThat(fieldDoc.fields[0], anyOf(equalTo(1), equalTo(2))); @@ -475,20 +475,20 @@ public class QueryPhaseTests extends ESTestCase { }; QueryPhase.execute(context, contextSearcher, sort); - assertThat(context.queryResult().topDocs().totalHits, equalTo(numDocs)); + assertThat(context.queryResult().topDocs().totalHits, equalTo((long) numDocs)); assertTrue(collected.get()); assertNull(context.queryResult().terminatedEarly()); assertThat(context.terminateAfter(), equalTo(0)); - assertThat(context.queryResult().getTotalHits(), equalTo(numDocs)); + assertThat(context.queryResult().getTotalHits(), equalTo((long) numDocs)); int sizeMinus1 = context.queryResult().topDocs().scoreDocs.length - 1; FieldDoc lastDoc = (FieldDoc) context.queryResult().topDocs().scoreDocs[sizeMinus1]; QueryPhase.execute(context, contextSearcher, sort); - assertThat(context.queryResult().topDocs().totalHits, equalTo(numDocs)); + assertThat(context.queryResult().topDocs().totalHits, equalTo((long) numDocs)); assertTrue(collected.get()); assertTrue(context.queryResult().terminatedEarly()); assertThat(context.terminateAfter(), equalTo(0)); - assertThat(context.queryResult().getTotalHits(), equalTo(numDocs)); + assertThat(context.queryResult().getTotalHits(), equalTo((long) numDocs)); FieldDoc firstDoc = (FieldDoc) context.queryResult().topDocs().scoreDocs[0]; for (int i = 0; i < sort.getSort().length; i++) { @SuppressWarnings("unchecked") diff --git a/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-92b1783.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 671513e5ac..0000000000 --- a/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bcd4b2c3308a284f4d93400a47cb324a3c729aed
\ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-ad2cb77.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..19cb0afb1c --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +6286fec3656b8e8153d33488094d92a134f77e3d
\ No newline at end of file diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java index 926536d65e..8ce0162266 100644 --- a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java +++ b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java @@ -20,7 +20,7 @@ package org.elasticsearch.percolator; import org.apache.lucene.document.Field; import org.apache.lucene.index.DocValuesType; -import org.apache.lucene.index.Fields; +import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexableField; @@ -196,14 +196,13 @@ public class PercolatorFieldMapper extends FieldMapper { Query createCandidateQuery(IndexReader indexReader) throws IOException { List<BytesRef> extractedTerms = new ArrayList<>(); LeafReader reader = indexReader.leaves().get(0).reader(); - Fields fields = reader.fields(); - for (String field : fields) { - Terms terms = fields.terms(field); + for (FieldInfo info : reader.getFieldInfos()) { + Terms terms = reader.terms(info.name); if (terms == null) { continue; } - BytesRef fieldBr = new BytesRef(field); + BytesRef fieldBr = new BytesRef(info.name); TermsEnum tenum = terms.iterator(); for (BytesRef term = tenum.next(); term != null; term = tenum.next()) { BytesRefBuilder builder = new BytesRefBuilder(); diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryTests.java index 439ca21777..c76ac14cff 100644 --- a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryTests.java +++ b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryTests.java @@ -119,7 +119,7 @@ public class PercolateQueryTests extends ESTestCase { Query query = new ConstantScoreQuery(new PercolateQuery(queryStore, new BytesArray("a"), new TermQuery(new Term("select", "a")), percolateSearcher, new MatchNoDocsQuery(""))); TopDocs topDocs = shardSearcher.search(query, 10); - assertThat(topDocs.totalHits, equalTo(1)); + assertThat(topDocs.totalHits, equalTo(1L)); assertThat(topDocs.scoreDocs.length, equalTo(1)); assertThat(topDocs.scoreDocs[0].doc, equalTo(0)); Explanation explanation = shardSearcher.explain(query, 0); @@ -129,7 +129,7 @@ public class PercolateQueryTests extends ESTestCase { query = new ConstantScoreQuery(new PercolateQuery(queryStore, new BytesArray("b"), new TermQuery(new Term("select", "b")), percolateSearcher, new MatchNoDocsQuery(""))); topDocs = shardSearcher.search(query, 10); - assertThat(topDocs.totalHits, equalTo(3)); + assertThat(topDocs.totalHits, equalTo(3L)); assertThat(topDocs.scoreDocs.length, equalTo(3)); assertThat(topDocs.scoreDocs[0].doc, equalTo(1)); explanation = shardSearcher.explain(query, 1); @@ -149,12 +149,12 @@ public class PercolateQueryTests extends ESTestCase { query = new ConstantScoreQuery(new PercolateQuery(queryStore, new BytesArray("c"), new MatchAllDocsQuery(), percolateSearcher, new MatchAllDocsQuery())); topDocs = shardSearcher.search(query, 10); - assertThat(topDocs.totalHits, equalTo(4)); + assertThat(topDocs.totalHits, equalTo(4L)); query = new PercolateQuery(queryStore, new BytesArray("{}"), new TermQuery(new Term("select", "b")), percolateSearcher, new MatchNoDocsQuery("")); topDocs = shardSearcher.search(query, 10); - assertThat(topDocs.totalHits, equalTo(3)); + assertThat(topDocs.totalHits, equalTo(3L)); assertThat(topDocs.scoreDocs.length, equalTo(3)); assertThat(topDocs.scoreDocs[0].doc, equalTo(3)); explanation = shardSearcher.explain(query, 3); diff --git a/plugins/analysis-icu/bin/licenses/icu4j-59.1.jar.sha1 b/plugins/analysis-icu/bin/licenses/icu4j-59.1.jar.sha1 new file mode 100644 index 0000000000..5401f914f5 --- /dev/null +++ b/plugins/analysis-icu/bin/licenses/icu4j-59.1.jar.sha1 @@ -0,0 +1 @@ +6f06e820cf4c8968bbbaae66ae0b33f6a256b57f
\ No newline at end of file diff --git a/plugins/analysis-icu/bin/licenses/lucene-analyzers-icu-7.0.0-snapshot-ad2cb77.jar.sha1 b/plugins/analysis-icu/bin/licenses/lucene-analyzers-icu-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..0c08e240db --- /dev/null +++ b/plugins/analysis-icu/bin/licenses/lucene-analyzers-icu-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +f90e2fe9e8ff1be65a800e719d2a25cd0a09cced
\ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-92b1783.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 2fb8c48b97..0000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4e74b475f888a6b488fa1f30362f2a537330d911
\ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-ad2cb77.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..0c08e240db --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +f90e2fe9e8ff1be65a800e719d2a25cd0a09cced
\ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-92b1783.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 44a4e31bd6..0000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d51c247bd2a0e053db07eaec25464eae2f7f4360
\ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-ad2cb77.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..ebb4d22be2 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +345ac08f374992ba70a4785c2cba5ec64b1f1cf5
\ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-92b1783.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 8640a7ed4a..0000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b01fe0b5d64e2c6dbeba51bfcc38c20b86f7f71a
\ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-ad2cb77.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..8afd76e971 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +c50fc14d093c4ad9fbc8d6e457d855034e59456e
\ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-92b1783.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 49ea47c271..0000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c38eb6f68ca095314568176f8d183b284f1fcc17
\ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-ad2cb77.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..be99459c88 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +cc4e86b04a8654885d69e849513219aaa7358435
\ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-92b1783.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 26547efd25..0000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e9f595188eb3d977e242ab02692c1845c69efdaf
\ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-ad2cb77.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..cadf7aa13c --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +b5ac4f79ef4b531e64ca19b22fc704cbd1618e6c
\ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-92b1783.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-92b1783.jar.sha1 deleted file mode 100644 index 4267c1c7e4..0000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-92b1783.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dab621b2c6b28c322a90668c2d43d14a354997ae
\ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-ad2cb77.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-ad2cb77.jar.sha1 new file mode 100644 index 0000000000..847893a98d --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-ad2cb77.jar.sha1 @@ -0,0 +1 @@ +8a6fc7317cbebed963c5ee6ce48f7f62fbba3883
\ No newline at end of file diff --git a/test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java b/test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java index 314f1b5285..1d89fc981f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java +++ b/test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java @@ -81,12 +81,14 @@ public class ThrowingLeafReaderWrapper extends FilterLeafReader { this.thrower = thrower; } - @Override - public Fields fields() throws IOException { - Fields fields = super.fields(); - thrower.maybeThrow(Flags.Fields); - return fields == null ? null : new ThrowingFields(fields, thrower); + public Terms terms(String field) throws IOException { + Terms terms = super.terms(field); + if (thrower.wrapTerms(field)) { + thrower.maybeThrow(Flags.Terms); + return terms == null ? null : new ThrowingTerms(terms, thrower); + } + return terms; } @Override |