diff --git a/buildSrc/version.properties b/buildSrc/version.properties index f2a953753a5..7e34dec9e4b 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 = 7.0.0-alpha1 -lucene = 7.0.0 +lucene = 7.1.0-snapshot-f33ed4ba12a # optional dependencies spatial4j = 0.6 diff --git a/core/licenses/lucene-analyzers-common-7.0.0.jar.sha1 b/core/licenses/lucene-analyzers-common-7.0.0.jar.sha1 deleted file mode 100644 index e630261521b..00000000000 --- a/core/licenses/lucene-analyzers-common-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -91f9e9717d7cf558927bbada26a651238cacb228 \ No newline at end of file diff --git a/core/licenses/lucene-analyzers-common-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-analyzers-common-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..6863607ab79 --- /dev/null +++ b/core/licenses/lucene-analyzers-common-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +a59ac3bdd17becc848f319fb77994060661c2c71 \ No newline at end of file diff --git a/core/licenses/lucene-backward-codecs-7.0.0.jar.sha1 b/core/licenses/lucene-backward-codecs-7.0.0.jar.sha1 deleted file mode 100644 index 68a0b9e8501..00000000000 --- a/core/licenses/lucene-backward-codecs-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3f03d0b56835bf8fc53ce78c3114a10df355985f \ No newline at end of file diff --git a/core/licenses/lucene-backward-codecs-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-backward-codecs-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..2bc2287cf2d --- /dev/null +++ b/core/licenses/lucene-backward-codecs-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +47f560086db8683b5be26911fae3721d8b0da465 \ No newline at end of file diff --git a/core/licenses/lucene-core-7.0.0.jar.sha1 b/core/licenses/lucene-core-7.0.0.jar.sha1 deleted file mode 100644 index 31b29b60fe2..00000000000 --- a/core/licenses/lucene-core-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -59a0bf5b97304ffbe577220779b4992020d49f7e \ No newline at end of file diff --git a/core/licenses/lucene-core-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-core-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..a1079a6df66 --- /dev/null +++ b/core/licenses/lucene-core-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +17bd8e886ac2e763c27a507e697f78e43103afd3 \ No newline at end of file diff --git a/core/licenses/lucene-grouping-7.0.0.jar.sha1 b/core/licenses/lucene-grouping-7.0.0.jar.sha1 deleted file mode 100644 index cb0826e73a5..00000000000 --- a/core/licenses/lucene-grouping-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -59205eb7e0d3a33ad778b60f82ca3b17e24ac6b7 \ No newline at end of file diff --git a/core/licenses/lucene-grouping-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-grouping-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..036e7d5b156 --- /dev/null +++ b/core/licenses/lucene-grouping-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +bb7d5f5f6dd0bada3991828b8687a35c90de76ca \ No newline at end of file diff --git a/core/licenses/lucene-highlighter-7.0.0.jar.sha1 b/core/licenses/lucene-highlighter-7.0.0.jar.sha1 deleted file mode 100644 index ab0a5a570d1..00000000000 --- a/core/licenses/lucene-highlighter-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ce11d6b34bd43563d5d63314088799879612692 \ No newline at end of file diff --git a/core/licenses/lucene-highlighter-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-highlighter-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..28e24b897f4 --- /dev/null +++ b/core/licenses/lucene-highlighter-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +f024368b33bfb7c1589aaf424992e474c4e3be38 \ No newline at end of file diff --git a/core/licenses/lucene-join-7.0.0.jar.sha1 b/core/licenses/lucene-join-7.0.0.jar.sha1 deleted file mode 100644 index a537f656f64..00000000000 --- a/core/licenses/lucene-join-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4706ea3c072dea6ba6540e0c8fce56fb5704fb16 \ No newline at end of file diff --git a/core/licenses/lucene-join-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-join-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..684763a1fa6 --- /dev/null +++ b/core/licenses/lucene-join-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +7b525cb2e2c8403543fefc09b972c78b86d2f0da \ No newline at end of file diff --git a/core/licenses/lucene-memory-7.0.0.jar.sha1 b/core/licenses/lucene-memory-7.0.0.jar.sha1 deleted file mode 100644 index 049af9157b2..00000000000 --- a/core/licenses/lucene-memory-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dacd0a3717857954d83b47e46d293d1909368287 \ No newline at end of file diff --git a/core/licenses/lucene-memory-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-memory-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..47d82587ef0 --- /dev/null +++ b/core/licenses/lucene-memory-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +61cc3ced15fa80d8f97affe0c8df9818eeb8af49 \ No newline at end of file diff --git a/core/licenses/lucene-misc-7.0.0.jar.sha1 b/core/licenses/lucene-misc-7.0.0.jar.sha1 deleted file mode 100644 index 6a96c204e12..00000000000 --- a/core/licenses/lucene-misc-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -788bf81b746d8c445ba8abae09083b80dc571422 \ No newline at end of file diff --git a/core/licenses/lucene-misc-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-misc-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..adfb48c3cbd --- /dev/null +++ b/core/licenses/lucene-misc-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +03a71b5875d25576c9f8992822db65fb181f4328 \ No newline at end of file diff --git a/core/licenses/lucene-queries-7.0.0.jar.sha1 b/core/licenses/lucene-queries-7.0.0.jar.sha1 deleted file mode 100644 index 28ab8d34b6a..00000000000 --- a/core/licenses/lucene-queries-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c6168c23fd1bec9b57077693361b014b44000117 \ No newline at end of file diff --git a/core/licenses/lucene-queries-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-queries-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..c1f9c01c221 --- /dev/null +++ b/core/licenses/lucene-queries-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +9c07c15b2c6f8bd3d75e0f53fff5631f012bff98 \ No newline at end of file diff --git a/core/licenses/lucene-queryparser-7.0.0.jar.sha1 b/core/licenses/lucene-queryparser-7.0.0.jar.sha1 deleted file mode 100644 index 3eb91931dd0..00000000000 --- a/core/licenses/lucene-queryparser-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4d007674d657274ada4f1fb29b87507aecdbcc5b \ No newline at end of file diff --git a/core/licenses/lucene-queryparser-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-queryparser-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..380eb788804 --- /dev/null +++ b/core/licenses/lucene-queryparser-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +e0a7815981d096d96e7dc41b1c063cd78c91132d \ No newline at end of file diff --git a/core/licenses/lucene-sandbox-7.0.0.jar.sha1 b/core/licenses/lucene-sandbox-7.0.0.jar.sha1 deleted file mode 100644 index e498ebfa2b0..00000000000 --- a/core/licenses/lucene-sandbox-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d3b84a7eccc77a28be0b7f30fa40de22d89ea028 \ No newline at end of file diff --git a/core/licenses/lucene-sandbox-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-sandbox-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..53482559399 --- /dev/null +++ b/core/licenses/lucene-sandbox-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +1ea14867a6bc545fb2e09dd1f31b48523cdbc040 \ No newline at end of file diff --git a/core/licenses/lucene-spatial-7.0.0.jar.sha1 b/core/licenses/lucene-spatial-7.0.0.jar.sha1 deleted file mode 100644 index 86d66c7f62e..00000000000 --- a/core/licenses/lucene-spatial-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d947e80f5214b293bba319a625eb6971941846ac \ No newline at end of file diff --git a/core/licenses/lucene-spatial-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-spatial-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..18afbd63493 --- /dev/null +++ b/core/licenses/lucene-spatial-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +58ce824ebc6126e37ff232c96a561a659377a873 \ No newline at end of file diff --git a/core/licenses/lucene-spatial-extras-7.0.0.jar.sha1 b/core/licenses/lucene-spatial-extras-7.0.0.jar.sha1 deleted file mode 100644 index 76101fe60c7..00000000000 --- a/core/licenses/lucene-spatial-extras-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ac15765c81ab4151e7a6c56ba544f3cb9860d183 \ No newline at end of file diff --git a/core/licenses/lucene-spatial-extras-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-spatial-extras-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..b07b6ca6d9c --- /dev/null +++ b/core/licenses/lucene-spatial-extras-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +3fcd89a8cda5ee2049c189b06b5e30258b1aa198 \ No newline at end of file diff --git a/core/licenses/lucene-spatial3d-7.0.0.jar.sha1 b/core/licenses/lucene-spatial3d-7.0.0.jar.sha1 deleted file mode 100644 index 1cd5d487210..00000000000 --- a/core/licenses/lucene-spatial3d-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5a795ee7914e396236ba04b0b00839e1fd2038c4 \ No newline at end of file diff --git a/core/licenses/lucene-spatial3d-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-spatial3d-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..a3be4c237dd --- /dev/null +++ b/core/licenses/lucene-spatial3d-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +1d1ada8fbb1b2bbbc88e9f29e28802a7b44a6665 \ No newline at end of file diff --git a/core/licenses/lucene-suggest-7.0.0.jar.sha1 b/core/licenses/lucene-suggest-7.0.0.jar.sha1 deleted file mode 100644 index 19d2dbc4339..00000000000 --- a/core/licenses/lucene-suggest-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1a17d34de6ab52050a3f33361d4ead96eb0f344c \ No newline at end of file diff --git a/core/licenses/lucene-suggest-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/core/licenses/lucene-suggest-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..e7534fc3cf7 --- /dev/null +++ b/core/licenses/lucene-suggest-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +fb7f18e6a81899e3ac95760b56bea21ebf143cf9 \ No newline at end of file diff --git a/core/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java index b75122a9488..c15c4bdfa10 100644 --- a/core/src/main/java/org/elasticsearch/Version.java +++ b/core/src/main/java/org/elasticsearch/Version.java @@ -121,7 +121,7 @@ public class Version implements Comparable { new Version(V_6_1_0_ID, org.apache.lucene.util.Version.LUCENE_7_0_0); public static final int V_7_0_0_alpha1_ID = 7000001; public static final Version V_7_0_0_alpha1 = - new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_0_0); + new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_1_0); public static final Version CURRENT = V_7_0_0_alpha1; // unreleased versions must be added to the above list with the suffix _UNRELEASED (with the exception of CURRENT) 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 b156c9bb296..597fa970a57 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java @@ -40,21 +40,17 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.SegmentCommitInfo; import org.apache.lucene.index.SegmentInfos; -import org.apache.lucene.search.Collector; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.LeafCollector; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.ScorerSupplier; -import org.apache.lucene.search.SimpleCollector; import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortedNumericSortField; import org.apache.lucene.search.SortedSetSortField; -import org.apache.lucene.search.TimeLimitingCollector; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.search.TwoPhaseIterator; @@ -66,9 +62,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.Lock; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.Counter; import org.apache.lucene.util.Version; -import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -87,7 +81,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Objects; public class Lucene { public static final String LATEST_DOC_VALUES_FORMAT = "Lucene70"; @@ -769,7 +762,7 @@ public class Lucene { return new Bits.MatchNoBits(maxDoc); } // Since we want bits, we need random-access - final Scorer scorer = scorerSupplier.get(true); // this never returns null + final Scorer scorer = scorerSupplier.get(Long.MAX_VALUE); // this never returns null final TwoPhaseIterator twoPhase = scorer.twoPhaseIterator(); final DocIdSetIterator iterator; if (twoPhase == null) { diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java index 2e714fc80a1..8a9fabc9e13 100644 --- a/core/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java +++ b/core/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.fielddata; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.MultiDocValues; +import org.apache.lucene.index.OrdinalMap; /** @@ -43,8 +43,8 @@ public interface IndexOrdinalsFieldData extends IndexFieldData.Global> scriptFunction; protected GlobalOrdinalsIndexFieldData(IndexSettings indexSettings, String fieldName, AtomicOrdinalsFieldData[] segmentAfd, - MultiDocValues.OrdinalMap ordinalMap, long memorySizeInBytes, Function> scriptFunction) { super(indexSettings); this.fieldName = fieldName; @@ -113,17 +113,17 @@ public class GlobalOrdinalsIndexFieldData extends AbstractIndexComponent impleme } @Override - public MultiDocValues.OrdinalMap getOrdinalMap() { + public OrdinalMap getOrdinalMap() { return ordinalMap; } private final class Atomic extends AbstractAtomicOrdinalsFieldData { private final AtomicOrdinalsFieldData afd; - private final MultiDocValues.OrdinalMap ordinalMap; + private final OrdinalMap ordinalMap; private final int segmentIndex; - private Atomic(AtomicOrdinalsFieldData afd, MultiDocValues.OrdinalMap ordinalMap, int segmentIndex) { + private Atomic(AtomicOrdinalsFieldData afd, OrdinalMap ordinalMap, int segmentIndex) { super(scriptFunction); this.afd = afd; this.ordinalMap = ordinalMap; diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java index 1dbd082f93b..d89c6d64d49 100644 --- a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java +++ b/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.FilteredTermsEnum; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.MultiDocValues; +import org.apache.lucene.index.OrdinalMap; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.BytesRef; @@ -53,7 +53,7 @@ public abstract class AbstractIndexOrdinalsFieldData extends AbstractIndexFieldD } @Override - public MultiDocValues.OrdinalMap getOrdinalMap() { + public OrdinalMap getOrdinalMap() { return null; } diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java index 9e6e2e994c9..0834d2479f0 100644 --- a/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java +++ b/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.fielddata.plain; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.MultiDocValues; +import org.apache.lucene.index.OrdinalMap; import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortedSetSelector; @@ -128,7 +128,7 @@ public class SortedSetDVOrdinalsIndexFieldData extends DocValuesIndexFieldData i } @Override - public MultiDocValues.OrdinalMap getOrdinalMap() { + public OrdinalMap getOrdinalMap() { return null; } } diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java b/core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java index 2fb8f6789ce..d3b1da7c937 100644 --- a/core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java +++ b/core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java @@ -25,7 +25,6 @@ import org.apache.lucene.search.Collector; import org.apache.lucene.search.ConjunctionDISI; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.LeafCollector; -import org.apache.lucene.search.Query; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.ScorerSupplier; import org.apache.lucene.search.TopDocs; @@ -126,15 +125,15 @@ public final class InnerHitsContext { if (scorerSupplier == null) { return; } - // use random access since this scorer will be consumed on a minority of documents - Scorer scorer = scorerSupplier.get(true); + // use low leadCost since this scorer will be consumed on a minority of documents + Scorer scorer = scorerSupplier.get(0); ScorerSupplier innerHitQueryScorerSupplier = innerHitQueryWeight.scorerSupplier(ctx); if (innerHitQueryScorerSupplier == null) { return; } - // use random access since this scorer will be consumed on a minority of documents - Scorer innerHitQueryScorer = innerHitQueryScorerSupplier.get(true); + // use low loadCost since this scorer will be consumed on a minority of documents + Scorer innerHitQueryScorer = innerHitQueryScorerSupplier.get(0); final LeafCollector leafCollector; try { diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java b/core/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java index 7cb50b29219..bd5fd5e23a2 100644 --- a/core/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java +++ b/core/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java @@ -54,7 +54,7 @@ public final class ProfileWeight extends Weight { if (supplier == null) { return null; } - return supplier.get(false); + return supplier.get(Long.MAX_VALUE); } @Override @@ -75,10 +75,10 @@ public final class ProfileWeight extends Weight { return new ScorerSupplier() { @Override - public Scorer get(boolean randomAccess) throws IOException { + public Scorer get(long loadCost) throws IOException { timer.start(); try { - return new ProfileScorer(weight, subQueryScorerSupplier.get(randomAccess), profile); + return new ProfileScorer(weight, subQueryScorerSupplier.get(loadCost), profile); } finally { timer.stop(); } diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy index 38c98b87427..deb9a88e4fd 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.jar}" { +grant codeBase "${codebase.lucene-core-7.1.0-snapshot-f33ed4ba12a.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.jar}" { permission java.lang.RuntimePermission "accessDeclaredMembers"; }; -grant codeBase "${codebase.lucene-misc-7.0.0.jar}" { +grant codeBase "${codebase.lucene-misc-7.1.0-snapshot-f33ed4ba12a.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 b8d868b3cfd..c5a9a2b00d3 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.jar}" { +grant codeBase "${codebase.lucene-test-framework-7.1.0-snapshot-f33ed4ba12a.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/elasticsearch/search/profile/query/QueryProfilerTests.java b/core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java index 43c6018d8f8..45825677051 100644 --- a/core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java +++ b/core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java @@ -28,7 +28,6 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.LeafCollector; @@ -242,7 +241,7 @@ public class QueryProfilerTests extends ESTestCase { return new ScorerSupplier() { @Override - public Scorer get(boolean randomAccess) throws IOException { + public Scorer get(long loadCost) throws IOException { throw new UnsupportedOperationException(); } diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index cb2741a3d0e..b6a6f91d232 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -1,7 +1,7 @@ :version: 7.0.0-alpha1 :major-version: 7.x -:lucene_version: 7.0.0 -:lucene_version_path: 7_0_0 +:lucene_version: 7.1.0-SNAPSHOT +:lucene_version_path: 7_1_0 :branch: master :jdk: 1.8.0_131 diff --git a/modules/lang-expression/licenses/lucene-expressions-7.0.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.0.0.jar.sha1 deleted file mode 100644 index a13f66c4515..00000000000 --- a/modules/lang-expression/licenses/lucene-expressions-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cba375c000fe184e45d439e61162c1111b77c907 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-7.1.0-snapshot-f33ed4ba12a.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.1.0-snapshot-f33ed4ba12a.jar.sha1 new file mode 100644 index 00000000000..3c02bb4144b --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-7.1.0-snapshot-f33ed4ba12a.jar.sha1 @@ -0,0 +1 @@ +3d20e7c480ff31a6e0a74c57770a1cfdfd56cf0c \ No newline at end of file diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java index bece1751a46..dbbb98af65a 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.join.query; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.MultiDocValues; +import org.apache.lucene.index.OrdinalMap; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; @@ -379,12 +379,12 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder