Upgrade to Lucene 6.4.1. (#22978)
This commit is contained in:
Adrien Grand
GitHub
parent
9201ee82f6
commit
c8496fc4f4
|
|
@ -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-alpha1
|
||||
lucene = 6.4.0
|
||||
lucene = 6.4.1
|
||||
|
||||
# optional dependencies
|
||||
spatial4j = 0.6
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
e0feb9281a7da7a7df62398ab0fc655d51f68fed
|
||||
|
|
@ -0,0 +1 @@
|
|||
c6f0f593503080204e9d33189cdc59320f55db37
|
||||
|
|
@ -1 +0,0 @@
|
|||
14698ecbca1437615ee31d412d0edd3440b4fccf
|
||||
|
|
@ -0,0 +1 @@
|
|||
b0ab8aca2b0025b8733411778b6d27afe1c451f5
|
||||
|
|
@ -1 +0,0 @@
|
|||
09dd516b847dcaf8da4e9096bf3189b0b3607aef
|
||||
|
|
@ -0,0 +1 @@
|
|||
2a18924b9e0ed86b318902cb475a0b9ca4d7be5b
|
||||
|
|
@ -1 +0,0 @@
|
|||
68a8f986a0076ad784cbb20813b9465b94e4c846
|
||||
|
|
@ -0,0 +1 @@
|
|||
8297adfa469abd571079ee75a1645fc5124fff5b
|
||||
|
|
@ -1 +0,0 @@
|
|||
6d921c1242b608a4dcd0784e32bcd94097ad93cd
|
||||
|
|
@ -0,0 +1 @@
|
|||
95c0f76fc7893240483b25a5c420bed77a10d05d
|
||||
|
|
@ -1 +0,0 @@
|
|||
74d3cdf1bc863e3836b06f1865c970127cc15f26
|
||||
|
|
@ -0,0 +1 @@
|
|||
6d2f1ff94dba19b9bc6f15930b7104b890cab1ce
|
||||
|
|
@ -1 +0,0 @@
|
|||
dd13729c0b401e3df11bce0c343d1e00f07b9a19
|
||||
|
|
@ -0,0 +1 @@
|
|||
825a946902f03a38257851733da908949d69f3da
|
||||
|
|
@ -1 +0,0 @@
|
|||
ce27abe3490bb8ccbebd2eefcb68f42a609ca986
|
||||
|
|
@ -0,0 +1 @@
|
|||
4d147a6f0fcfc54630260d1bb3deecfc0d0d10f7
|
||||
|
|
@ -1 +0,0 @@
|
|||
bd1978e3fdac2fadf1068828b0b1b534a56873c3
|
||||
|
|
@ -0,0 +1 @@
|
|||
6de41d984c16185a244b52c4d069b00f5b2b120f
|
||||
|
|
@ -1 +0,0 @@
|
|||
fb8fe41948fccf13b5dbb5d50441cac974544ade
|
||||
|
|
@ -0,0 +1 @@
|
|||
1fc5795a072770a2c47dce11a3c85a80f3437af6
|
||||
|
|
@ -1 +0,0 @@
|
|||
e7f7d1ad298c4af264199d9199f34f2e4d9ca2b5
|
||||
|
|
@ -0,0 +1 @@
|
|||
d4a49664668c58aa23aba74717f3d74a61378d7c
|
||||
|
|
@ -1 +0,0 @@
|
|||
5d4b3ce4df83d0509e0b5f7eecda72af458ba225
|
||||
|
|
@ -0,0 +1 @@
|
|||
d6ceb47fdea913a8f468a240a6ea307368094463
|
||||
|
|
@ -1 +0,0 @@
|
|||
3b486b51d3aede074ab6de890b427379d40c0438
|
||||
|
|
@ -0,0 +1 @@
|
|||
5b764e5f95f610f79622ca0e957bfc23f094e4c7
|
||||
|
|
@ -1 +0,0 @@
|
|||
344097014aeaaa0f94a217f3697e14ceee06581f
|
||||
|
|
@ -0,0 +1 @@
|
|||
2c58459e671040046305dbee698fce1e6a1de71d
|
||||
|
|
@ -1 +0,0 @@
|
|||
6c4706b86718f2653120e0dbfd24e03248dd2ea7
|
||||
|
|
@ -0,0 +1 @@
|
|||
47014b400916eea259645a9e3118558ef6e95441
|
||||
|
|
@ -163,7 +163,7 @@ public abstract class BlendedTermQuery extends Query {
|
|||
if (prev > current) {
|
||||
actualDf++;
|
||||
}
|
||||
contexts[i] = ctx = adjustDF(ctx, Math.min(maxDoc, actualDf));
|
||||
contexts[i] = ctx = adjustDF(reader.getContext(), ctx, Math.min(maxDoc, actualDf));
|
||||
prev = current;
|
||||
if (sumTTF >= 0 && ctx.totalTermFreq() >= 0) {
|
||||
sumTTF += ctx.totalTermFreq();
|
||||
|
|
@ -179,16 +179,17 @@ public abstract class BlendedTermQuery extends Query {
|
|||
}
|
||||
// the blended sumTTF can't be greater than the sumTTTF on the field
|
||||
final long fixedTTF = sumTTF == -1 ? -1 : sumTTF;
|
||||
contexts[i] = adjustTTF(contexts[i], fixedTTF);
|
||||
contexts[i] = adjustTTF(reader.getContext(), contexts[i], fixedTTF);
|
||||
}
|
||||
}
|
||||
|
||||
private TermContext adjustTTF(TermContext termContext, long sumTTF) {
|
||||
private TermContext adjustTTF(IndexReaderContext readerContext, TermContext termContext, long sumTTF) {
|
||||
assert termContext.wasBuiltFor(readerContext);
|
||||
if (sumTTF == -1 && termContext.totalTermFreq() == -1) {
|
||||
return termContext;
|
||||
}
|
||||
TermContext newTermContext = new TermContext(termContext.topReaderContext);
|
||||
List<LeafReaderContext> leaves = termContext.topReaderContext.leaves();
|
||||
TermContext newTermContext = new TermContext(readerContext);
|
||||
List<LeafReaderContext> leaves = readerContext.leaves();
|
||||
final int len;
|
||||
if (leaves == null) {
|
||||
len = 1;
|
||||
|
|
@ -209,7 +210,8 @@ public abstract class BlendedTermQuery extends Query {
|
|||
return newTermContext;
|
||||
}
|
||||
|
||||
private static TermContext adjustDF(TermContext ctx, int newDocFreq) {
|
||||
private static TermContext adjustDF(IndexReaderContext readerContext, TermContext ctx, int newDocFreq) {
|
||||
assert ctx.wasBuiltFor(readerContext);
|
||||
// Use a value of ttf that is consistent with the doc freq (ie. gte)
|
||||
long newTTF;
|
||||
if (ctx.totalTermFreq() < 0) {
|
||||
|
|
@ -217,14 +219,14 @@ public abstract class BlendedTermQuery extends Query {
|
|||
} else {
|
||||
newTTF = Math.max(ctx.totalTermFreq(), newDocFreq);
|
||||
}
|
||||
List<LeafReaderContext> leaves = ctx.topReaderContext.leaves();
|
||||
List<LeafReaderContext> leaves = readerContext.leaves();
|
||||
final int len;
|
||||
if (leaves == null) {
|
||||
len = 1;
|
||||
} else {
|
||||
len = leaves.size();
|
||||
}
|
||||
TermContext newCtx = new TermContext(ctx.topReaderContext);
|
||||
TermContext newCtx = new TermContext(readerContext);
|
||||
for (int i = 0; i < len; ++i) {
|
||||
TermState termState = ctx.get(i);
|
||||
if (termState == null) {
|
||||
|
|
|
|||
|
|
@ -111,10 +111,10 @@ public class Version implements Comparable<Version> {
|
|||
public static final int V_5_2_1_ID_UNRELEASED = 5020199;
|
||||
public static final Version V_5_2_1_UNRELEASED = new Version(V_5_2_1_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_4_0);
|
||||
public static final int V_5_3_0_ID_UNRELEASED = 5030099;
|
||||
public static final Version V_5_3_0_UNRELEASED = new Version(V_5_3_0_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_4_0);
|
||||
public static final Version V_5_3_0_UNRELEASED = new Version(V_5_3_0_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_4_1);
|
||||
public static final int V_6_0_0_alpha1_ID_UNRELEASED = 6000001;
|
||||
public static final Version V_6_0_0_alpha1_UNRELEASED =
|
||||
new Version(V_6_0_0_alpha1_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_4_0);
|
||||
new Version(V_6_0_0_alpha1_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_4_1);
|
||||
public static final Version CURRENT = V_6_0_0_alpha1_UNRELEASED;
|
||||
|
||||
// unreleased versions must be added to the above list with the suffix _UNRELEASED (with the exception of CURRENT)
|
||||
|
|
|
|||
|
|
@ -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-6.4.0.jar}" {
|
||||
grant codeBase "${codebase.lucene-core-6.4.1.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-6.4.0.jar}" {
|
|||
permission java.lang.RuntimePermission "accessDeclaredMembers";
|
||||
};
|
||||
|
||||
grant codeBase "${codebase.lucene-misc-6.4.0.jar}" {
|
||||
grant codeBase "${codebase.lucene-misc-6.4.1.jar}" {
|
||||
// needed to allow shard shrinking to use hard-links if possible via lucenes HardlinkCopyDirectoryWrapper
|
||||
permission java.nio.file.LinkPermission "hard";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ grant codeBase "${codebase.securemock-1.2.jar}" {
|
|||
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
|
||||
};
|
||||
|
||||
grant codeBase "${codebase.lucene-test-framework-6.4.0.jar}" {
|
||||
grant codeBase "${codebase.lucene-test-framework-6.4.1.jar}" {
|
||||
// needed by RamUsageTester
|
||||
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
|
||||
// needed for testing hardlinks in StoreRecoveryTests since we install MockFS
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
09a755871c89fec98d3ca8372f283c1639dcadaf
|
||||
|
|
@ -0,0 +1 @@
|
|||
d56305d2ee8b2484262b1704d802470e6d8f8a8f
|
||||
|
|
@ -1 +0,0 @@
|
|||
0242cfe1a026ec3afd5a567237f634da1d95fa24
|
||||
|
|
@ -0,0 +1 @@
|
|||
dae7aa1d7ccb6eaa32d7208d25fe772c029113bd
|
||||
|
|
@ -1 +0,0 @@
|
|||
fdefb46dde0019b8173d19fe4b164dca9efcba14
|
||||
|
|
@ -0,0 +1 @@
|
|||
8acb2fd78d2a4612d677e353b056c89fe700a73a
|
||||
|
|
@ -1 +0,0 @@
|
|||
e75472bdbd3480ceddc570e747c70640429598d6
|
||||
|
|
@ -0,0 +1 @@
|
|||
5f40ded59cc0a57d2a9fe9d9b9ff6d5dbdb319e6
|
||||
|
|
@ -1 +0,0 @@
|
|||
31ebae985b936c2dcbe16126492deccbb5192ce8
|
||||
|
|
@ -0,0 +1 @@
|
|||
1aff866b1c191914301af25f818309f7ceb76cd3
|
||||
|
|
@ -1 +0,0 @@
|
|||
684bc70e964bfb93224962b24912b1bab2a5b673
|
||||
|
|
@ -0,0 +1 @@
|
|||
52fcba7d7abde7d299ba31b1c5194fca3b1625da
|
||||
|
|
@ -1 +0,0 @@
|
|||
07a2471f5da4a69be367851505338b53ceca0ef1
|
||||
|
|
@ -0,0 +1 @@
|
|||
405aeb0b03eca645434cbd23aed31bb74feaece8
|
||||
Loading…
Reference in New Issue