Revert "Upgrade to Lucene-7.6.0-snapshot-f9598f335b (elastic#35225)"

We need to upgrade the master first; otherwise 7.0 won't
understand the new format in 6.x.
This reverts commit 542a3f6.

buildSrc/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 6.6.0
-lucene            = 7.6.0-snapshot-f9598f335b
+lucene            = 7.5.0
 
 # optional dependencies
 spatial4j         = 0.7

docs/Versions.asciidoc

@@ -1,7 +1,7 @@
 :version:               6.6.0
 :major-version:         6.x
-:lucene_version:        7.6.0
-:lucene_version_path:   7_6_0
+:lucene_version:        7.5.0
+:lucene_version_path:   7_5_0
 :branch:                6.x
 :jdk:                   1.8.0_131
 :jdk_major:             8

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

@@ -0,0 +1 @@
+4566befa0926231cfc86692809bba4f636836a58

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

@@ -75,7 +75,7 @@ public void testDefaults() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertFalse(pointField.fieldType().stored());
         assertEquals(1230, pointField.numericValue().longValue());
         IndexableField dvField = fields[1];
@@ -149,7 +149,7 @@ public void testNoDocValues() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(1, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(1230, pointField.numericValue().longValue());
     }
 
@@ -173,7 +173,7 @@ public void testStore() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(3, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(1230, pointField.numericValue().doubleValue(), 0d);
         IndexableField dvField = fields[1];
         assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType());
@@ -202,7 +202,7 @@ public void testCoerce() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(1230, pointField.numericValue().longValue());
         IndexableField dvField = fields[1];
         assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType());
@@ -317,7 +317,7 @@ public void testNullValue() throws IOException {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertFalse(pointField.fieldType().stored());
         assertEquals(25, pointField.numericValue().longValue());
         IndexableField dvField = fields[1];

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

@@ -341,7 +341,7 @@ Tuple<List<BytesRef>, Map<String, List<byte[]>>> extractTermsAndRanges(IndexRead
                         extractedTerms.add(builder.toBytesRef());
                     }
                 }
-                if (info.getPointIndexDimensionCount() == 1) { // not != 0 because range fields are not supported
+                if (info.getPointDimensionCount() == 1) { // not != 0 because range fields are not supported
                     PointValues values = reader.getPointValues(info.name);
                     List<byte[]> encodedPointValues = new ArrayList<>();
                     encodedPointValues.add(values.getMinPackedValue().clone());

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

@@ -0,0 +1 @@
+d156361604898e3d9e5c751c9308b7b856eec523

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

@@ -0,0 +1 @@
+d412659d8b0dd6a579888cab192fe86d468953f3

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

@@ -0,0 +1 @@
+9fdfafd182aa18dc42854f595bed9c65319786a5

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

@@ -0,0 +1 @@
+708120bc7ce6d6bde1a4a30b6bb7edeee1fc17ed

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

@@ -0,0 +1 @@
+ec339902ac6c05440340732b992dd3b73d66d899

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

@@ -0,0 +1 @@
+a32e24d0781b97b1f2a3e86268d188180f4e41cb

plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0.jar.sha1

@@ -0,0 +1 @@
+ceafdf4a0d8cc9d61110c9ac6ba610e8485620b9

plugins/mapper-size/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java

@@ -63,7 +63,7 @@ public void testSizeEnabled() throws Exception {
         boolean points = false;
         for (IndexableField field : doc.rootDoc().getFields("_size")) {
             stored |= field.fieldType().stored();
-            points |= field.fieldType().pointIndexDimensionCount() > 0;
+            points |= field.fieldType().pointDimensionCount() > 0;
         }
         assertTrue(stored);
         assertTrue(points);

server/licenses/lucene-analyzers-common-7.5.0.jar.sha1

@@ -0,0 +1 @@
+e7fbdfc2297c3ff5d194d7bef95810504e52710e

server/licenses/lucene-backward-codecs-7.5.0.jar.sha1

@@ -0,0 +1 @@
+3ebd10f4a1fe71a92b69c0d653136bcf9790a165

server/licenses/lucene-core-7.5.0.jar.sha1

@@ -0,0 +1 @@
+736e94305e2a0e803563c5b184877df5c7d4cb69

server/licenses/lucene-grouping-7.5.0.jar.sha1

@@ -0,0 +1 @@
+f326a63640a288c302c713fcf2965fdc827b3cca

server/licenses/lucene-highlighter-7.5.0.jar.sha1

@@ -0,0 +1 @@
+59420a5e30f12885f160e49bb975ab6b5985bd3d

server/licenses/lucene-join-7.5.0.jar.sha1

@@ -0,0 +1 @@
+065d3c275b094383640d393579cdb7aff22bcd1d

server/licenses/lucene-memory-7.5.0.jar.sha1

@@ -0,0 +1 @@
+b8cc0c311a823287264653fbd05f866e059d303c

server/licenses/lucene-misc-7.5.0.jar.sha1

@@ -0,0 +1 @@
+60d0a02b9297b5423d5400a6b0aa114915232b60

server/licenses/lucene-queries-7.5.0.jar.sha1

@@ -0,0 +1 @@
+bfbf786b75c60a25daf33d389efd6458e17218d9

server/licenses/lucene-queryparser-7.5.0.jar.sha1

@@ -0,0 +1 @@
+3eefb522e150f2ba0009df20f3bcfa91d60e7090

server/licenses/lucene-sandbox-7.5.0.jar.sha1

@@ -0,0 +1 @@
+9fa3bb1c81179e112a62c0db6749767127c616bd

server/licenses/lucene-spatial-7.5.0.jar.sha1

@@ -0,0 +1 @@
+8de64a6a8ad22b5849f2ab5f824917723de7a349

server/licenses/lucene-spatial-extras-7.5.0.jar.sha1

@@ -0,0 +1 @@
+b0892bbc0dc16ca07cf98897df3b3e9ed3069615

server/licenses/lucene-spatial3d-7.5.0.jar.sha1

@@ -0,0 +1 @@
+672920a7fb48624bcb84ce0ee67dd0c7bc080c94

server/licenses/lucene-suggest-7.5.0.jar.sha1

@@ -0,0 +1 @@
+aa7d170871711ebd4dbd367d7b8ee0f1eb5e88b7

server/src/main/java/org/elasticsearch/Version.java

@@ -187,7 +187,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final int V_6_5_0_ID = 6050099;
     public static final Version V_6_5_0 = new Version(V_6_5_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
     public static final int V_6_6_0_ID = 6060099;
-    public static final Version V_6_6_0 = new Version(V_6_6_0_ID, org.apache.lucene.util.Version.LUCENE_7_6_0);
+    public static final Version V_6_6_0 = new Version(V_6_6_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
 
     public static final Version CURRENT = V_6_6_0;
 

server/src/main/java/org/elasticsearch/index/engine/TranslogLeafReader.java

@@ -57,16 +57,16 @@ final class TranslogLeafReader extends LeafReader {
     private final Translog.Index operation;
     private static final FieldInfo FAKE_SOURCE_FIELD
         = new FieldInfo(SourceFieldMapper.NAME, 1, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(),
-        0, 0, 0, false);
+        0, 0, false);
     private static final FieldInfo FAKE_ROUTING_FIELD
         = new FieldInfo(RoutingFieldMapper.NAME, 2, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(),
-        0, 0, 0, false);
+        0, 0, false);
     private static final FieldInfo FAKE_ID_FIELD
         = new FieldInfo(IdFieldMapper.NAME, 3, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(),
-        0, 0, 0, false);
+        0, 0, false);
     private static final FieldInfo FAKE_UID_FIELD
         = new FieldInfo(UidFieldMapper.NAME, 4, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(),
-        0, 0, 0, false);
+        0, 0, false);
     private final Version indexVersionCreated;
 
     TranslogLeafReader(Translog.Index operation, Version indexVersionCreated) {

server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java

@@ -448,7 +448,7 @@ protected final void failIfNoDocValues() {
     }
 
     protected final void failIfNotIndexed() {
-        if (indexOptions() == IndexOptions.NONE && pointDataDimensionCount() == 0) {
+        if (indexOptions() == IndexOptions.NONE && pointDimensionCount() == 0) {
             // we throw an IAE rather than an ISE so that it translates to a 4xx code rather than 5xx code on the http layer
             throw new IllegalArgumentException("Cannot search on field [" + name() + "] since it is not indexed.");
         }

server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java

@@ -77,7 +77,7 @@ public void testDefaults() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(8, pointField.fieldType().pointNumBytes());
         assertFalse(pointField.fieldType().stored());
         assertEquals(1457654400000L, pointField.numericValue().longValue());
@@ -128,7 +128,7 @@ public void testNoDocValues() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(1, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
     }
 
     public void testStore() throws Exception {
@@ -150,7 +150,7 @@ public void testStore() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(3, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         IndexableField dvField = fields[1];
         assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType());
         IndexableField storedField = fields[2];
@@ -304,7 +304,7 @@ public void testNullValue() throws IOException {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(8, pointField.fieldType().pointNumBytes());
         assertFalse(pointField.fieldType().stored());
         assertEquals(1457654400000L, pointField.numericValue().longValue());

server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java

@@ -78,7 +78,7 @@ public void testDefaults() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(16, pointField.fieldType().pointNumBytes());
         assertFalse(pointField.fieldType().stored());
         assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointField.binaryValue());
@@ -129,7 +129,7 @@ public void testNoDocValues() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(1, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointField.binaryValue());
     }
 
@@ -152,7 +152,7 @@ public void testStore() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(3, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         IndexableField dvField = fields[1];
         assertEquals(DocValuesType.SORTED_SET, dvField.fieldType().docValuesType());
         IndexableField storedField = fields[2];
@@ -240,7 +240,7 @@ public void testNullValue() throws IOException {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(16, pointField.fieldType().pointNumBytes());
         assertFalse(pointField.fieldType().stored());
         assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointField.binaryValue());

server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java

@@ -71,7 +71,7 @@ public void testStoreCidr() throws Exception {
             IndexableField dvField = fields[0];
             assertEquals(DocValuesType.BINARY, dvField.fieldType().docValuesType());
             IndexableField pointField = fields[1];
-            assertEquals(2, pointField.fieldType().pointIndexDimensionCount());
+            assertEquals(2, pointField.fieldType().pointDimensionCount());
             IndexableField storedField = fields[2];
             assertTrue(storedField.fieldType().stored());
             String strVal =

server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java

@@ -67,7 +67,7 @@ public void doTestDefaults(String type) throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertFalse(pointField.fieldType().stored());
         assertEquals(123, pointField.numericValue().doubleValue(), 0d);
         IndexableField dvField = fields[1];
@@ -118,7 +118,7 @@ public void doTestNoDocValues(String type) throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(1, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(123, pointField.numericValue().doubleValue(), 0d);
     }
 
@@ -142,7 +142,7 @@ public void doTestStore(String type) throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(3, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(123, pointField.numericValue().doubleValue(), 0d);
         IndexableField dvField = fields[1];
         assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType());
@@ -171,7 +171,7 @@ public void doTestCoerce(String type) throws IOException {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(123, pointField.numericValue().doubleValue(), 0d);
         IndexableField dvField = fields[1];
         assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType());
@@ -345,7 +345,7 @@ protected void doTestNullValue(String type) throws IOException {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertFalse(pointField.fieldType().stored());
         assertEquals(123, pointField.numericValue().doubleValue(), 0d);
         IndexableField dvField = fields[1];