Skip to content

Commit fd6dba7

Browse files
committed
Restore "Upgrade to Lucene-7.6.0-snapshot-f9598f335b (#35225)"
This commit restores the upgrade to Lucene-7.6.0 snapshot that was reverted by 81daf4c. The change should work now that master has been upgraded to a recent Lucene 8 snapshot.
1 parent e2e7400 commit fd6dba7

File tree

64 files changed

+63
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+63
-63
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 6.6.0
2-
lucene = 7.5.0
2+
lucene = 7.6.0-snapshot-f9598f335b
33

44
# optional dependencies
55
spatial4j = 0.7

docs/Versions.asciidoc

Lines changed: 2 additions & 2 deletions

modules/lang-expression/licenses/lucene-expressions-7.5.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
717fb4e5f1c1667819465805858731d6683f3ab4

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void testDefaults() throws Exception {
7575
IndexableField[] fields = doc.rootDoc().getFields("field");
7676
assertEquals(2, fields.length);
7777
IndexableField pointField = fields[0];
78-
assertEquals(1, pointField.fieldType().pointDimensionCount());
78+
assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
7979
assertFalse(pointField.fieldType().stored());
8080
assertEquals(1230, pointField.numericValue().longValue());
8181
IndexableField dvField = fields[1];
@@ -149,7 +149,7 @@ public void testNoDocValues() throws Exception {
149149
IndexableField[] fields = doc.rootDoc().getFields("field");
150150
assertEquals(1, fields.length);
151151
IndexableField pointField = fields[0];
152-
assertEquals(1, pointField.fieldType().pointDimensionCount());
152+
assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
153153
assertEquals(1230, pointField.numericValue().longValue());
154154
}
155155

@@ -173,7 +173,7 @@ public void testStore() throws Exception {
173173
IndexableField[] fields = doc.rootDoc().getFields("field");
174174
assertEquals(3, fields.length);
175175
IndexableField pointField = fields[0];
176-
assertEquals(1, pointField.fieldType().pointDimensionCount());
176+
assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
177177
assertEquals(1230, pointField.numericValue().doubleValue(), 0d);
178178
IndexableField dvField = fields[1];
179179
assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType());
@@ -202,7 +202,7 @@ public void testCoerce() throws Exception {
202202
IndexableField[] fields = doc.rootDoc().getFields("field");
203203
assertEquals(2, fields.length);
204204
IndexableField pointField = fields[0];
205-
assertEquals(1, pointField.fieldType().pointDimensionCount());
205+
assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
206206
assertEquals(1230, pointField.numericValue().longValue());
207207
IndexableField dvField = fields[1];
208208
assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType());
@@ -317,7 +317,7 @@ public void testNullValue() throws IOException {
317317
IndexableField[] fields = doc.rootDoc().getFields("field");
318318
assertEquals(2, fields.length);
319319
IndexableField pointField = fields[0];
320-
assertEquals(1, pointField.fieldType().pointDimensionCount());
320+
assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
321321
assertFalse(pointField.fieldType().stored());
322322
assertEquals(25, pointField.numericValue().longValue());
323323
IndexableField dvField = fields[1];

modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ Tuple<List<BytesRef>, Map<String, List<byte[]>>> extractTermsAndRanges(IndexRead
341341
extractedTerms.add(builder.toBytesRef());
342342
}
343343
}
344-
if (info.getPointDimensionCount() == 1) { // not != 0 because range fields are not supported
344+
if (info.getPointIndexDimensionCount() == 1) { // not != 0 because range fields are not supported
345345
PointValues values = reader.getPointValues(info.name);
346346
List<byte[]> encodedPointValues = new ArrayList<>();
347347
encodedPointValues.add(values.getMinPackedValue().clone());

plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4eaf937aa95487a518d458666da78b68fff35ef4

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cdb7c83e29aa6c365e2c06c843ddfe16cfba12cc

0 commit comments

Comments
 (0)