Upgrade to Lucene-7.4.0-snapshot-bcf9f5c36b (#29536)

This snapshot includes LUCENE-8253 and improvements for LUCENE-8233.
This commit is contained in:
Nhat Nguyen 2018-04-16 13:34:06 -04:00 committed by GitHub
parent ed427953d6
commit 7ede88fe4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 25 additions and 25 deletions

View File

@ -1,5 +1,5 @@
elasticsearch = 7.0.0-alpha1
lucene = 7.4.0-snapshot-bcf9f5c36b
lucene = 7.4.0-snapshot-aeac55a602
# optional dependencies
spatial4j = 0.7

View File

@ -0,0 +1 @@
c6141778b6773dfa8133402fb87251a48b522f71

View File

@ -1 +0,0 @@
c78657977dd5ca44defbdd77155b87e199d607b7

View File

@ -0,0 +1 @@
3c33ef8a4088f408f0786dd64e111673b0577eff

View File

@ -1 +0,0 @@
946cfdd6f93e542094fde179c854f915097a24ee

View File

@ -0,0 +1 @@
2056051c024d9f8580db94a629f2c97245852003

View File

@ -1 +0,0 @@
3be7d940a7f9f0b090b07d40095bf1dfbce4c0b4

View File

@ -0,0 +1 @@
12d051a6521ad4eeb78eec11db66cf1c25995292

View File

@ -1 +0,0 @@
aa1d1419a71c51af0fe07c85565f931655b50d2d

View File

@ -0,0 +1 @@
ad4bcf0a27bc9f7b31e0d504528a3f062723c42f

View File

@ -1 +0,0 @@
0b4caf6f9b43e840476fbfad88bce4b8f69bfaba

View File

@ -0,0 +1 @@
2ff367c7b730e20f64baa4dd42d0cbd8d4964b4a

View File

@ -1 +0,0 @@
c7fdd43a503867129eeb72f632ccd8d0d5c1a114

View File

@ -0,0 +1 @@
d47bef70d558cc29fcb627ded2aa1e4d11f172f0

View File

@ -1 +0,0 @@
f24074b0c84d8928a59d8ffc0e35b5a0d7118e5a

View File

@ -0,0 +1 @@
cd2c30150b5b274dc0eb184b9b343b645ac16914

View File

@ -1 +0,0 @@
35fe318de8e259af242e54af019c7120476744d8

View File

@ -0,0 +1 @@
2cb12a0173dcc98a03f97200293606c8a0064162

View File

@ -1 +0,0 @@
dc5a2b6af11a2e20632f5f47c4266ed9666b1aa1

View File

@ -0,0 +1 @@
3d8efc98834652e20f3fbbf39164806d5e0c2591

View File

@ -1 +0,0 @@
f291c3d247e46ce1d9fd1a648324864b8232a762

View File

@ -0,0 +1 @@
065a98afa830f5cc42f4f51e8de320ff5747e95a

View File

@ -1 +0,0 @@
7e0a97b0717d548951e4172769e0adb6dab3a5ce

View File

@ -0,0 +1 @@
355648eca33f24621061966545270db50c46469c

View File

@ -1 +0,0 @@
b8ea60b8b694f86a38c27c84ad4dbe18f88ed457

View File

@ -0,0 +1 @@
91d747bcaa9240f49ebfd706528459c04e72a105

View File

@ -1 +0,0 @@
224951a933a3244fff7f48ada466bf46f3a25e6b

View File

@ -0,0 +1 @@
d2b4a65550206e7bc3e47f8c15e1d64a8c555d02

View File

@ -1 +0,0 @@
24e0864db54970237a08c8b59a9769be70c8c252

View File

@ -0,0 +1 @@
27f6af2833dc9dd6435db9ee161a640360937e9b

View File

@ -1 +0,0 @@
9375c0976ace985402fe1360b9ffa15bef09f1d1

View File

@ -0,0 +1 @@
7639cca89b03b53e7a4d075563cab770e6367d3f

View File

@ -1 +0,0 @@
eb493f05ee5d1fdbddf3d43db9a51fa0bddf1efd

View File

@ -0,0 +1 @@
2bc5117eb0e9a9a454762ee19b00fe8ba5dbf639

View File

@ -1 +0,0 @@
abe600a798fdfbd87eb836bf06eb3fae352a71a4

View File

@ -0,0 +1 @@
a429d7bb0f0a065d95bcadeb4b9544571bac8c54

View File

@ -1 +0,0 @@
d476b38846c8c130260fb19c7c65227e4cff32c8

View File

@ -0,0 +1 @@
7480c87858b0914cd1e8b6eca4233bfd992e05fe

View File

@ -1 +0,0 @@
96cd664728c1698b3540c465949f4f9c1bace740

View File

@ -0,0 +1 @@
cdedb3903325a4befad094813e96a06d6fb8501f

View File

@ -1 +0,0 @@
8ecbd479b8d4b871d501448b8b446222df0bbdba

View File

@ -0,0 +1 @@
43a2716e10e10fe3e4ee799c3bb30a98ce488156

View File

@ -1 +0,0 @@
c3c93da655f46157a6d76e915d6bda99b1375ca0

View File

@ -0,0 +1 @@
8a5906b6b9fc4d13ce563e304baf67fcd2fbc3b6

View File

@ -1 +0,0 @@
8161d63a0b9f41ae394cc1ac8aa954c585169143

View File

@ -20,9 +20,9 @@
package org.elasticsearch.index.shard;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.index.FilterMergePolicy;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.MergePolicyWrapper;
import org.apache.lucene.index.SegmentCommitInfo;
import org.apache.lucene.index.SegmentInfos;
import org.elasticsearch.Version;
@ -44,7 +44,7 @@ import java.util.Map;
* For now, this {@link MergePolicy} takes care of moving versions that used to
* be stored as payloads to numeric doc values.
*/
public final class ElasticsearchMergePolicy extends MergePolicyWrapper {
public final class ElasticsearchMergePolicy extends FilterMergePolicy {
private static Logger logger = Loggers.getLogger(ElasticsearchMergePolicy.class);