honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-27 18:38:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Lucene-7.4-snapshot-1cbadda4d3 ()

Browse Source 
This snapshot includes LUCENE-8328 which is needed to stabilize CCR builds.
This commit is contained in:
Nhat Nguyen 2018-05-29 12:29:52 -04:00 committed by GitHub
parent a8faf9768a
commit 363f1e84ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 27 additions and 27 deletions
buildSrc
version.properties
modules/lang-expression/licenses
lucene-expressions-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-expressions-7.4.0-snapshot-cc2ee23050.jar.sha1
plugins
analysis-icu/licenses
lucene-analyzers-icu-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-analyzers-icu-7.4.0-snapshot-cc2ee23050.jar.sha1
analysis-kuromoji/licenses
lucene-analyzers-kuromoji-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-analyzers-kuromoji-7.4.0-snapshot-cc2ee23050.jar.sha1
analysis-nori/licenses
lucene-analyzers-nori-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-analyzers-nori-7.4.0-snapshot-cc2ee23050.jar.sha1
analysis-phonetic/licenses
lucene-analyzers-phonetic-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-analyzers-phonetic-7.4.0-snapshot-cc2ee23050.jar.sha1
analysis-smartcn/licenses
lucene-analyzers-smartcn-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-analyzers-smartcn-7.4.0-snapshot-cc2ee23050.jar.sha1
analysis-stempel/licenses
lucene-analyzers-stempel-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-analyzers-stempel-7.4.0-snapshot-cc2ee23050.jar.sha1
analysis-ukrainian/licenses
lucene-analyzers-morfologik-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-analyzers-morfologik-7.4.0-snapshot-cc2ee23050.jar.sha1
server
licenses
lucene-analyzers-common-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-analyzers-common-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-backward-codecs-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-backward-codecs-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-core-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-core-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-grouping-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-grouping-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-highlighter-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-highlighter-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-join-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-join-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-memory-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-memory-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-misc-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-misc-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-queries-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-queries-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-queryparser-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-queryparser-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-sandbox-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-sandbox-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-spatial-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-spatial-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-spatial-extras-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-spatial-extras-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-spatial3d-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-spatial3d-7.4.0-snapshot-cc2ee23050.jar.sha1lucene-suggest-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-suggest-7.4.0-snapshot-cc2ee23050.jar.sha1
src/main/java/org/elasticsearch/index/shard
ElasticsearchMergePolicy.java
x-pack/plugin/sql/sql-proto/licenses
lucene-core-7.4.0-snapshot-1cbadda4d3.jar.sha1lucene-core-7.4.0-snapshot-cc2ee23050.jar.sha1

2
buildSrc/version.properties

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

1
modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
98c920972b2f5e8563540e805d87e6a3bc888972

1
modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
1e28b448387ec05d655f8c81ee54e13ff2975a4d

1
plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
844e2b76f4bc6e646e1c3257d668ac598e03f36a

1
plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
452c9a9f86b79b9b3eaa7d6aa782e189d5bcfe8f

1
plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
2f2bd2d67c7952e4ae14ab3f742824a45d0d1719

1
plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
48c76a922bdfc7f50b1b6fe22e9456c555f3f990

1
plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
46ad7ebcfcdbdb60dd54aae4d720356a7a51c7c0

1
plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
4db5777df468b0867ff6539c9ab687e0ed6cab41

1
plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
548e9f2b4d4a985dc174b2eee4007c0bd5642e68

1
plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
0e09e6b011ab2b1a0e3e0e1df2ab2a91dca8ba23

1
plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
b90e66f4104f0234cfef335762f65a6fed695231

1
plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
ceefa0f9789ab9ea5c8ab9f67ed7a601a3ae6aa9

1
plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
929a4eb52b11f6d3f0df9c8eba014f5ee2464c67

1
plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
b013adc183e52a74795ad3d3032f4d0f9db30b73

1
plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
0e6575a411b65cd95e0e54f04d3da278b68be521

1
plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
95300f29418f60e57e022d934d3462be9e1e2225

1
server/licenses/lucene-analyzers-common-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
0f75703c30756c31f7d09ec79191dab6fb35c958

1
server/licenses/lucene-analyzers-common-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
96ab108569c77932ecb17c45421affece207df5c

1
server/licenses/lucene-backward-codecs-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
c5c519fdea65726612f79e3dd942b7316966646e

1
server/licenses/lucene-backward-codecs-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
72d09ca50979f716a57f53f2de33d55023a166ec

1
server/licenses/lucene-core-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
f345b6aa3c550dafc63de3e5a5c404691e782336

1
server/licenses/lucene-core-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
e118e4d05070378516b9055184b74498ba528dee

1
server/licenses/lucene-grouping-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
7a74855e37124a27af36390c9d15abe33614129e

1
server/licenses/lucene-grouping-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
2b2ea6bfe6fa159bbf205bf7f7fa2ed2c22bbffc

1
server/licenses/lucene-highlighter-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
0e3df4b469465ef101254fdcbb08ebd8a19f1f9d

1
server/licenses/lucene-highlighter-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
423e4fff9276101d845d6073dc6cd27504def207

1
server/licenses/lucene-join-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
05d236149c99c860e6b627a8f78ea32918c108c3

1
server/licenses/lucene-join-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
27561038da2edcae3ecc3a08b0a52824966af87a

1
server/licenses/lucene-memory-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
d83e7e65eb268425f7bd5be2425d4a00b556bc47

1
server/licenses/lucene-memory-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
d7d422159f705261784d121e24877119d9c95083

1
server/licenses/lucene-misc-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
440a998b5bf99871bec4272a219de01b25751d5c

1
server/licenses/lucene-misc-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
fc09508fde6ba87f241d7e3148d9e310c0db9cb9

1
server/licenses/lucene-queries-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
2a5c031155fdfa743af321150c0dd654a6ea3c71

1
server/licenses/lucene-queries-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
201fdf3432ff3fef0f48c38c2c0f482c144f6868

1
server/licenses/lucene-queryparser-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
d021c9a461ff0f020d038ad5ecc5127973d4674a

1
server/licenses/lucene-queryparser-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
917df8c8d08952a012a34050b183b6204ae7081b

1
server/licenses/lucene-sandbox-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
9877a14c53e69b39fff2bf10d49a61171746d940

1
server/licenses/lucene-sandbox-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
caff84fa66cb0376835c39f3d4ca7dfd2177d8f4

1
server/licenses/lucene-spatial-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
7d7e5101b46a120efa311509948c0d1f9bf30155

1
server/licenses/lucene-spatial-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
e1bce61a9d9129a8d0fdd3127a84665d29f53eb0

1
server/licenses/lucene-spatial-extras-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
5a4c11db96ae70b9048243cc530fcbc76faa0978

1
server/licenses/lucene-spatial-extras-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
3a2e4373d79fda968a078971efa2cb8ec9ff65b0

1
server/licenses/lucene-spatial3d-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
afb01af1450067b145ca2c1d737b5907288af560

1
server/licenses/lucene-spatial3d-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
7f14927e5c3c1c85c4c5b3681c28c5e36f241dda

1
server/licenses/lucene-suggest-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
473f0221e0b2ea45940d8ae6dcf16e39c81b18c2

1
server/licenses/lucene-suggest-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
6e708a38c957a655e0cfedb06a1b9aa892929db0

4
server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java

@ -83,7 +83,7 @@ public final class ElasticsearchMergePolicy extends FilterMergePolicy {
@Override
public MergeSpecification findForcedMerges(SegmentInfos segmentInfos,
int maxSegmentCount, Map<SegmentCommitInfo,Boolean> segmentsToMerge, IndexWriter writer)
int maxSegmentCount, Map<SegmentCommitInfo,Boolean> segmentsToMerge, MergeContext mergeContext)
throws IOException {
if (upgradeInProgress) {
@ -122,7 +122,7 @@ public final class ElasticsearchMergePolicy extends FilterMergePolicy {
// has a chance to decide what to do (e.g. collapse the segments to satisfy maxSegmentCount)
}
return super.findForcedMerges(segmentInfos, maxSegmentCount, segmentsToMerge, writer);
return super.findForcedMerges(segmentInfos, maxSegmentCount, segmentsToMerge, mergeContext);
}
/**

1
x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-1cbadda4d3.jar.sha1 Normal file

@ -0,0 +1 @@
f345b6aa3c550dafc63de3e5a5c404691e782336

1
x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-cc2ee23050.jar.sha1

@ -1 +0,0 @@
e118e4d05070378516b9055184b74498ba528dee