upgrade to Lucene 7.1.0 snapshot version

This commit is contained in:
Martijn van Groningen 2017-09-28 16:30:44 +02:00
parent 9c95e91471
commit dca787ed8a
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
61 changed files with 60 additions and 67 deletions

View File

@ -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

View File

@ -1 +0,0 @@
91f9e9717d7cf558927bbada26a651238cacb228

View File

@ -0,0 +1 @@
a59ac3bdd17becc848f319fb77994060661c2c71

View File

@ -1 +0,0 @@
3f03d0b56835bf8fc53ce78c3114a10df355985f

View File

@ -0,0 +1 @@
47f560086db8683b5be26911fae3721d8b0da465

View File

@ -1 +0,0 @@
59a0bf5b97304ffbe577220779b4992020d49f7e

View File

@ -0,0 +1 @@
17bd8e886ac2e763c27a507e697f78e43103afd3

View File

@ -1 +0,0 @@
59205eb7e0d3a33ad778b60f82ca3b17e24ac6b7

View File

@ -0,0 +1 @@
bb7d5f5f6dd0bada3991828b8687a35c90de76ca

View File

@ -1 +0,0 @@
7ce11d6b34bd43563d5d63314088799879612692

View File

@ -0,0 +1 @@
f024368b33bfb7c1589aaf424992e474c4e3be38

View File

@ -1 +0,0 @@
4706ea3c072dea6ba6540e0c8fce56fb5704fb16

View File

@ -0,0 +1 @@
7b525cb2e2c8403543fefc09b972c78b86d2f0da

View File

@ -1 +0,0 @@
dacd0a3717857954d83b47e46d293d1909368287

View File

@ -0,0 +1 @@
61cc3ced15fa80d8f97affe0c8df9818eeb8af49

View File

@ -1 +0,0 @@
788bf81b746d8c445ba8abae09083b80dc571422

View File

@ -0,0 +1 @@
03a71b5875d25576c9f8992822db65fb181f4328

View File

@ -1 +0,0 @@
c6168c23fd1bec9b57077693361b014b44000117

View File

@ -0,0 +1 @@
9c07c15b2c6f8bd3d75e0f53fff5631f012bff98

View File

@ -1 +0,0 @@
4d007674d657274ada4f1fb29b87507aecdbcc5b

View File

@ -0,0 +1 @@
e0a7815981d096d96e7dc41b1c063cd78c91132d

View File

@ -1 +0,0 @@
d3b84a7eccc77a28be0b7f30fa40de22d89ea028

View File

@ -0,0 +1 @@
1ea14867a6bc545fb2e09dd1f31b48523cdbc040

View File

@ -1 +0,0 @@
d947e80f5214b293bba319a625eb6971941846ac

View File

@ -0,0 +1 @@
58ce824ebc6126e37ff232c96a561a659377a873

View File

@ -1 +0,0 @@
ac15765c81ab4151e7a6c56ba544f3cb9860d183

View File

@ -0,0 +1 @@
3fcd89a8cda5ee2049c189b06b5e30258b1aa198

View File

@ -1 +0,0 @@
5a795ee7914e396236ba04b0b00839e1fd2038c4

View File

@ -0,0 +1 @@
1d1ada8fbb1b2bbbc88e9f29e28802a7b44a6665

View File

@ -1 +0,0 @@
1a17d34de6ab52050a3f33361d4ead96eb0f344c

View File

@ -0,0 +1 @@
fb7f18e6a81899e3ac95760b56bea21ebf143cf9

View File

@ -121,7 +121,7 @@ public class Version implements Comparable<Version> {
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)

View File

@ -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) {

View File

@ -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<AtomicOrdi
IndexOrdinalsFieldData localGlobalDirect(DirectoryReader indexReader) throws Exception;
/**
* Returns the underlying {@link MultiDocValues.OrdinalMap} for this fielddata
* Returns the underlying {@link OrdinalMap} for this fielddata
* or null if global ordinals are not needed (constant value or single segment).
*/
MultiDocValues.OrdinalMap getOrdinalMap();
OrdinalMap getOrdinalMap();
}

View File

@ -19,7 +19,7 @@
package org.elasticsearch.index.fielddata.ordinals;
import org.apache.lucene.index.MultiDocValues.OrdinalMap;
import org.apache.lucene.index.OrdinalMap;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LongValues;

View File

@ -22,7 +22,7 @@ package org.elasticsearch.index.fielddata.ordinals;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiDocValues.OrdinalMap;
import org.apache.lucene.index.OrdinalMap;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.packed.PackedInts;

View File

@ -20,7 +20,7 @@ package org.elasticsearch.index.fielddata.ordinals;
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.util.Accountable;
@ -47,13 +47,13 @@ public class GlobalOrdinalsIndexFieldData extends AbstractIndexComponent impleme
private final String fieldName;
private final long memorySizeInBytes;
private final MultiDocValues.OrdinalMap ordinalMap;
private final OrdinalMap ordinalMap;
private final Atomic[] atomicReaders;
private final Function<SortedSetDocValues, ScriptDocValues<?>> scriptFunction;
protected GlobalOrdinalsIndexFieldData(IndexSettings indexSettings, String fieldName, AtomicOrdinalsFieldData[] segmentAfd,
MultiDocValues.OrdinalMap ordinalMap, long memorySizeInBytes, Function<SortedSetDocValues,
OrdinalMap ordinalMap, long memorySizeInBytes, Function<SortedSetDocValues,
ScriptDocValues<?>> 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;

View File

@ -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;
}

View File

@ -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;
}
}

View File

@ -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 {

View File

@ -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();
}

View File

@ -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";
};

View File

@ -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

View File

@ -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();
}

View File

@ -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

View File

@ -1 +0,0 @@
cba375c000fe184e45d439e61162c1111b77c907

View File

@ -0,0 +1 @@
3d20e7c480ff31a6e0a74c57770a1cfdfd56cf0c

View File

@ -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<HasChildQueryBuil
/**
* A query that rewrites into another query using
* {@link JoinUtil#createJoinQuery(String, Query, Query, IndexSearcher, ScoreMode, MultiDocValues.OrdinalMap, int, int)}
* {@link JoinUtil#createJoinQuery(String, Query, Query, IndexSearcher, ScoreMode, OrdinalMap, int, int)}
* that executes the actual join.
*
* This query is exclusively used by the {@link HasChildQueryBuilder} and {@link HasParentQueryBuilder} to get access
* to the {@link DirectoryReader} used by the current search in order to retrieve the {@link MultiDocValues.OrdinalMap}.
* The {@link MultiDocValues.OrdinalMap} is required by {@link JoinUtil} to execute the join.
* to the {@link DirectoryReader} used by the current search in order to retrieve the {@link OrdinalMap}.
* The {@link OrdinalMap} is required by {@link JoinUtil} to execute the join.
*/
// TODO: Find a way to remove this query and let doToQuery(...) just return the query from JoinUtil.createJoinQuery(...)
public static final class LateParsingQuery extends Query {
@ -422,7 +422,7 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder<HasChildQueryBuil
indexSearcher.setQueryCache(null);
indexSearcher.setSimilarity(similarity);
IndexOrdinalsFieldData indexParentChildFieldData = fieldDataJoin.loadGlobal((DirectoryReader) reader);
MultiDocValues.OrdinalMap ordinalMap = indexParentChildFieldData.getOrdinalMap();
OrdinalMap ordinalMap = indexParentChildFieldData.getOrdinalMap();
return JoinUtil.createJoinQuery(joinField, innerQuery, toQuery, indexSearcher, scoreMode,
ordinalMap, minChildren, maxChildren);
} else {

View File

@ -1 +0,0 @@
37868189327b684f6df10cc29bde626d5de4cd9e

View File

@ -0,0 +1 @@
0677be4595aecb88e8052e309dfd2e5909107a24

View File

@ -1 +0,0 @@
c0bdeeaa5228b20f128082da209012131521398c

View File

@ -0,0 +1 @@
8fdf628e764891f3753d6aa6a4bd81a60543b249

View File

@ -1 +0,0 @@
57b98e4d0565dacfa8e4aa998fd2577ee00c5748

View File

@ -0,0 +1 @@
1c23328881752f6590a463cb2a06acb1d952214d

View File

@ -1 +0,0 @@
f5a4d545012f8feb66358e39f44d2f59d708ff95

View File

@ -0,0 +1 @@
1e5db24f38cb9fff03942123dcbdf4e46fc3760e

View File

@ -1 +0,0 @@
50c9bf11eae81b3ed3de91300714070d51301db0

View File

@ -0,0 +1 @@
2f3b84a76adf611b942c3e1ebce35686ce0e077d

View File

@ -1 +0,0 @@
9ed6e0fde67713e7002cc481d6c398e6ce3e536f

View File

@ -0,0 +1 @@
c33e9c9a609ac7e6cb5d3695b42d4fddded47ae0

View File

@ -191,6 +191,8 @@ public abstract class AnalysisFactoryTestCase extends ESTestCase {
.put("flattengraph", MovedToAnalysisCommon.class)
// TODO: these tokenfilters are not yet exposed: useful?
.put("bengalinormalization", Void.class)
.put("bengalistem", Void.class)
// suggest stop
.put("suggeststop", Void.class)