Upgrade to lucene 8.0.0-snapshot-ff9509a8df (#39444)
Backport of #39350 Contains the following: * LUCENE-8635: Move terms dictionary off-heap for non-primary-key fields in `MMapDirectory` * LUCENE-8292: `TermsEnum` is fully abstract * LUCENE-8679: Return WITHIN in `EdgeTree#relateTriangle` only when polygon and triangle share one edge * LUCENE-8676: Nori tokenizer deals correctly with large buffers * LUCENE-8697: `GraphTokenStreamFiniteStrings` better handles side paths with gaps * LUCENE-8664: Add `equals` and `hashCode` to `TotalHits` * LUCENE-8660: `TopDocsCollector` returns accurate hit counts if the total equals the threshold * LUCENE-8654: `Polygon2D#relateTriangle` fix for when the polygon is inside the triangle * LUCENE-8645: `Intervals#fixField` can merge intervals from different fields * LUCENE-8585: Create jump-tables for DocValues at index time
This commit is contained in:
Alan Woodward
GitHub
parent
f675b33d50
commit
71b8494181
|
|
@ -159,8 +159,8 @@ task verifyVersions {
|
|||
* the enabled state of every bwc task. It should be set back to true
|
||||
* after the backport of the backcompat code is complete.
|
||||
*/
|
||||
boolean bwc_tests_enabled = true
|
||||
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
|
||||
boolean bwc_tests_enabled = false
|
||||
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/39444" /* place a PR link here when committing bwc changes */
|
||||
if (bwc_tests_enabled == false) {
|
||||
if (bwc_tests_disabled_issue.isEmpty()) {
|
||||
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
elasticsearch = 7.1.0
|
||||
lucene = 8.0.0-snapshot-83f9835
|
||||
lucene = 8.0.0-snapshot-ff9509a8df
|
||||
|
||||
# optional dependencies
|
||||
spatial4j = 0.7
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
c84431b751d851f484f2799f6dcb9110113b1958
|
||||
|
|
@ -0,0 +1 @@
|
|||
6b487ff516c053fae3fa270cd51964534f46b628
|
||||
|
|
@ -1 +0,0 @@
|
|||
ea440f53a9e858c2ed87927c63d57eb70e5af9ee
|
||||
|
|
@ -0,0 +1 @@
|
|||
116fed6827a68b78b46a1eadfda1e27936b171a1
|
||||
|
|
@ -1 +0,0 @@
|
|||
b016fdfb8f1ac413d902cd4d244b295c9f01e610
|
||||
|
|
@ -0,0 +1 @@
|
|||
c39659fa1684742370dfabf37641e41394ac4799
|
||||
|
|
@ -1 +0,0 @@
|
|||
395c8291751ffa7fbbb96faf578408a33a34ad1d
|
||||
|
|
@ -0,0 +1 @@
|
|||
51e35640ceac2e4801b9be1263c7bea8637c7ad7
|
||||
|
|
@ -1 +0,0 @@
|
|||
6957c71604356a1fbf0e13794595e4ea42126dd7
|
||||
|
|
@ -0,0 +1 @@
|
|||
bd8f2fe37a3e2f1c4d052071ceba618e6d16f119
|
||||
|
|
@ -1 +0,0 @@
|
|||
09f42235a8daca4ca8ea604314c2eb9de51b9e98
|
||||
|
|
@ -0,0 +1 @@
|
|||
022de0054e9597d16f366bb83d6404d2006dcecf
|
||||
|
|
@ -1 +0,0 @@
|
|||
7cf7eeb685a2060e97f50551236cfcaf39990083
|
||||
|
|
@ -0,0 +1 @@
|
|||
6cff98d0fdbb6d2d65ce9051005954f5b565986c
|
||||
|
|
@ -1 +0,0 @@
|
|||
ff163fb06ec3e47d501b290d8f69cca88a0341cc
|
||||
|
|
@ -0,0 +1 @@
|
|||
438537046ef60d75f17358bf09bb339aa84191e5
|
||||
|
|
@ -1 +0,0 @@
|
|||
f4d286ed7940fc206331424e8ce577584208eba3
|
||||
|
|
@ -0,0 +1 @@
|
|||
d96364f1b6a041f797e3d5f55b45284d8ab5cf95
|
||||
|
|
@ -1 +0,0 @@
|
|||
e5416da7370f5def9a79fb1cccb091b091b808a5
|
||||
|
|
@ -0,0 +1 @@
|
|||
a39f5683e6e6ce17a191dd5fcbf90fcc43d25109
|
||||
|
|
@ -1 +0,0 @@
|
|||
e3a95ff3cbd96e2c05b90932c20ca6374cdcdbe9
|
||||
|
|
@ -0,0 +1 @@
|
|||
283cbab4d58f18fd4eed169448bd0114e5d7c971
|
||||
|
|
@ -1 +0,0 @@
|
|||
045dcae6368a436cec6e56f654a9c6b3a4656d17
|
||||
|
|
@ -0,0 +1 @@
|
|||
e63de6e4690f844b571edef03e4029a63bf2458b
|
||||
|
|
@ -1 +0,0 @@
|
|||
63b7164d24547cea36df3d81eedb9e8b424cf3c2
|
||||
|
|
@ -0,0 +1 @@
|
|||
097cfc9ed8575c845c32f80745af11c04aaa6541
|
||||
|
|
@ -1 +0,0 @@
|
|||
7b3358889c491237709e8aea4a39e816227f3d26
|
||||
|
|
@ -0,0 +1 @@
|
|||
a1b20c5408c9a1d2fec4604dc66b3d54bf91f84c
|
||||
|
|
@ -1 +0,0 @@
|
|||
5d9566e2b3be41c81fe42df1c57fff31fcdbc565
|
||||
|
|
@ -0,0 +1 @@
|
|||
14bf9224dd2cd13d81ff90a43af713bda9c5b699
|
||||
|
|
@ -1 +0,0 @@
|
|||
45574e22c4b1569a2aecd5b2837388c7287892b5
|
||||
|
|
@ -0,0 +1 @@
|
|||
79be1830102a764d79da6c81d40f5f6bf85ad032
|
||||
|
|
@ -1 +0,0 @@
|
|||
67405660330db8c09e0994a615cf3ab95d7bc151
|
||||
|
|
@ -0,0 +1 @@
|
|||
3f7281351f03ac34c8a950e667e826053b82f31e
|
||||
|
|
@ -1 +0,0 @@
|
|||
c8de64bf2c4f09766d4cd62e8dd403016665f37c
|
||||
|
|
@ -0,0 +1 @@
|
|||
039229d20cb500de435b458998aa35370c616f69
|
||||
|
|
@ -1 +0,0 @@
|
|||
fc080b45b881a78a23743df9a7388fd3dbbb9d66
|
||||
|
|
@ -0,0 +1 @@
|
|||
00cee2f9ff5fcaa3ac3838f2d8b0c8b59c55e4a6
|
||||
|
|
@ -1 +0,0 @@
|
|||
6e0e12b9882005b87ef39325e1fc8539c8caff31
|
||||
|
|
@ -0,0 +1 @@
|
|||
4246d1cc124eb7b2d18ccee1db96b5999ae45b95
|
||||
|
|
@ -1 +0,0 @@
|
|||
7ed9c9a03e1a15840237d09ca4da7aadfce1c780
|
||||
|
|
@ -0,0 +1 @@
|
|||
caa0c22ce9a985f4a7a76c315ac8841d37083c2b
|
||||
|
|
@ -1 +0,0 @@
|
|||
fdf0efdeb9a73a6b0f8349df21049ecbc73955d7
|
||||
|
|
@ -0,0 +1 @@
|
|||
7d01e71c2e2e9fd5a2ad1f397bf75de12b860fab
|
||||
|
|
@ -1 +0,0 @@
|
|||
c69399183d5f9f85f3f8130452d0bed62fd92440
|
||||
|
|
@ -0,0 +1 @@
|
|||
fd72490e235dffbf455886d4a4339dd29f4ccd5b
|
||||
|
|
@ -21,6 +21,7 @@ package org.elasticsearch.action.termvectors;
|
|||
|
||||
import com.carrotsearch.hppc.ObjectLongHashMap;
|
||||
import com.carrotsearch.hppc.cursors.ObjectLongCursor;
|
||||
import org.apache.lucene.index.BaseTermsEnum;
|
||||
import org.apache.lucene.index.Fields;
|
||||
import org.apache.lucene.index.ImpactsEnum;
|
||||
import org.apache.lucene.index.PostingsEnum;
|
||||
|
|
@ -229,7 +230,7 @@ public final class TermVectorsFields extends Fields {
|
|||
// reset before asking for an iterator
|
||||
reset();
|
||||
// convert bytes ref for the terms to actual data
|
||||
return new TermsEnum() {
|
||||
return new BaseTermsEnum() {
|
||||
int currentTerm = 0;
|
||||
int freq = 0;
|
||||
int docFreq = -1;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ import org.apache.lucene.index.ImpactsEnum;
|
|||
import org.apache.lucene.index.IndexReader;
|
||||
import org.apache.lucene.index.LeafReaderContext;
|
||||
import org.apache.lucene.index.PostingsEnum;
|
||||
import org.apache.lucene.index.TermState;
|
||||
import org.apache.lucene.index.Terms;
|
||||
import org.apache.lucene.index.TermsEnum;
|
||||
import org.apache.lucene.search.DocIdSetIterator;
|
||||
|
|
@ -32,6 +33,7 @@ import org.apache.lucene.search.Query;
|
|||
import org.apache.lucene.search.ScoreMode;
|
||||
import org.apache.lucene.search.Scorer;
|
||||
import org.apache.lucene.search.Weight;
|
||||
import org.apache.lucene.util.AttributeSource;
|
||||
import org.apache.lucene.util.BitSet;
|
||||
import org.apache.lucene.util.Bits;
|
||||
import org.apache.lucene.util.BytesRef;
|
||||
|
|
@ -126,6 +128,11 @@ public class FilterableTermsEnum extends TermsEnum {
|
|||
return current;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AttributeSource attributes() {
|
||||
throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean seekExact(BytesRef text) throws IOException {
|
||||
int docFreq = 0;
|
||||
|
|
@ -195,6 +202,16 @@ public class FilterableTermsEnum extends TermsEnum {
|
|||
throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void seekExact(BytesRef term, TermState state) throws IOException {
|
||||
throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TermState termState() throws IOException {
|
||||
throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SeekStatus seekCeil(BytesRef text) throws IOException {
|
||||
throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
e3a95ff3cbd96e2c05b90932c20ca6374cdcdbe9
|
||||
|
|
@ -0,0 +1 @@
|
|||
283cbab4d58f18fd4eed169448bd0114e5d7c971
|
||||
Loading…
Reference in New Issue