elastic · nknize · Nov 4, 2018 · Nov 2, 2018
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 6.6.0
-lucene            = 7.5.0
+lucene            = 7.6.0-snapshot-f9598f335b
 
 # optional dependencies
 spatial4j         = 0.7

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
@@ -1,7 +1,7 @@
 :version:               6.6.0
 :major-version:         6.x
-:lucene_version:        7.5.0
-:lucene_version_path:   7_5_0
+:lucene_version:        7.6.0
+:lucene_version_path:   7_6_0
 :branch:                6.x
 :jdk:                   1.8.0_131
 :jdk_major:             8

diff --git a/modules/lang-expression/licenses/lucene-expressions-7.5.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.5.0.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-7.6.0-snapshot-f9598f335b.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+717fb4e5f1c1667819465805858731d6683f3ab4
diff --git a/...pper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java b/...pper-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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         assertFalse(pointField.fieldType().stored());
         assertEquals(25, pointField.numericValue().longValue());
         IndexableField dvField = fields[1];

diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java b/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.getPointDimensionCount() == 1) { // not != 0 because range fields are not supported
+                if (info.getPointIndexDimensionCount() == 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());

diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.6.0-snapshot-f9598f335b.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+4eaf937aa95487a518d458666da78b68fff35ef4
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0.jar.sha1
diff --git a/...s/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.6.0-snapshot-f9598f335b.jar.sha1 b/...s/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+cdb7c83e29aa6c365e2c06c843ddfe16cfba12cc
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.6.0-snapshot-f9598f335b.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+00cb9ce94be5f24bf6e35e4a8cfe641b01c37cf3
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0.jar.sha1
diff --git a/...s/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.6.0-snapshot-f9598f335b.jar.sha1 b/...s/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+5fa1fa9c15ff4646dca8bf68696cfb4f85adbe15
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0.jar.sha1
diff --git a/...ins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.6.0-snapshot-f9598f335b.jar.sha1 b/...ins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+54790d0478d6411ae9a237b4d29056030e48b87e
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0.jar.sha1
diff --git a/...ins/analysis-stempel/licenses/lucene-analyzers-stempel-7.6.0-snapshot-f9598f335b.jar.sha1 b/...ins/analysis-stempel/licenses/lucene-analyzers-stempel-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+d240eff790c236180562f20b697db2915d0100cf
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0.jar.sha1
diff --git a/...nalysis-ukrainian/licenses/lucene-analyzers-morfologik-7.6.0-snapshot-f9598f335b.jar.sha1 b/...nalysis-ukrainian/licenses/lucene-analyzers-morfologik-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+6bde728277806062a9473626c312a52c52b6f72a
diff --git a/plugins/mapper-size/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java b/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().pointDimensionCount() > 0;
+            points |= field.fieldType().pointIndexDimensionCount() > 0;
         }
         assertTrue(stored);
         assertTrue(points);

diff --git a/server/licenses/lucene-analyzers-common-7.5.0.jar.sha1 b/server/licenses/lucene-analyzers-common-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-analyzers-common-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-analyzers-common-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+57a504b6795f22a25b8a1f054d9943039a85a18d
diff --git a/server/licenses/lucene-backward-codecs-7.5.0.jar.sha1 b/server/licenses/lucene-backward-codecs-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-backward-codecs-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+77e50b66ce562a20b55a7580c2d5be6ee37ff23c
diff --git a/server/licenses/lucene-core-7.5.0.jar.sha1 b/server/licenses/lucene-core-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-core-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-core-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+ec080318251807172626c0ba8dc931276d52b15e
diff --git a/server/licenses/lucene-grouping-7.5.0.jar.sha1 b/server/licenses/lucene-grouping-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-grouping-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-grouping-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+3855c79ab2ca091e84ba46d8326a149f1d67bb51
diff --git a/server/licenses/lucene-highlighter-7.5.0.jar.sha1 b/server/licenses/lucene-highlighter-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-highlighter-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-highlighter-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+236febdc0f3211640b265d4a6a682f98481d0e20
diff --git a/server/licenses/lucene-join-7.5.0.jar.sha1 b/server/licenses/lucene-join-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-join-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-join-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+b5ce0f6d8a6730bbcfd187401168052bd2c8450b
diff --git a/server/licenses/lucene-memory-7.5.0.jar.sha1 b/server/licenses/lucene-memory-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-memory-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-memory-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+3794e1321c23187399c0b246548827a7613ea15c
diff --git a/server/licenses/lucene-misc-7.5.0.jar.sha1 b/server/licenses/lucene-misc-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-misc-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-misc-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+605faa9cdb9ba356e289cb5be02fa687d5de1efb
diff --git a/server/licenses/lucene-queries-7.5.0.jar.sha1 b/server/licenses/lucene-queries-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-queries-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-queries-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+12ecd339212886c2b37934ef2a3af4c85d89b4e3
diff --git a/server/licenses/lucene-queryparser-7.5.0.jar.sha1 b/server/licenses/lucene-queryparser-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-queryparser-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-queryparser-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+a74e9bac2cd10c878cb6aa005753267958a52101
diff --git a/server/licenses/lucene-sandbox-7.5.0.jar.sha1 b/server/licenses/lucene-sandbox-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-sandbox-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-sandbox-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+a1bb75649b0252e4ae8f9140eb9a457b68e3f8aa
diff --git a/server/licenses/lucene-spatial-7.5.0.jar.sha1 b/server/licenses/lucene-spatial-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-spatial-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+38ef3c295d4d8b79490ff8e9451e4e65f3e6212e
diff --git a/server/licenses/lucene-spatial-extras-7.5.0.jar.sha1 b/server/licenses/lucene-spatial-extras-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-spatial-extras-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+ba81a0520b8e085a7890d91c9a90343d21bbbc65
diff --git a/server/licenses/lucene-spatial3d-7.5.0.jar.sha1 b/server/licenses/lucene-spatial3d-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-spatial3d-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+edb2e853646d236154050fa8f1e68f908e73d10a
diff --git a/server/licenses/lucene-suggest-7.5.0.jar.sha1 b/server/licenses/lucene-suggest-7.5.0.jar.sha1
diff --git a/server/licenses/lucene-suggest-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-suggest-7.6.0-snapshot-f9598f335b.jar.sha1
@@ -0,0 +1 @@
+ee715c9d8dc562b98572eb036b2aee356c23ae23
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/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_5_0);
+    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 CURRENT = V_6_6_0;
 

diff --git a/server/src/main/java/org/elasticsearch/index/engine/TranslogLeafReader.java b/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, false);
+        0, 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, false);
+        0, 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, false);
+        0, 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, false);
+        0, 0, 0, false);
     private final Version indexVersionCreated;
 
     TranslogLeafReader(Translog.Index operation, Version indexVersionCreated) {

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java b/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 && pointDimensionCount() == 0) {
+        if (indexOptions() == IndexOptions.NONE && pointDataDimensionCount() == 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.");
         }

diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java b/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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
     }
 
     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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         assertEquals(8, pointField.fieldType().pointNumBytes());
         assertFalse(pointField.fieldType().stored());
         assertEquals(1457654400000L, pointField.numericValue().longValue());

diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         assertEquals(16, pointField.fieldType().pointNumBytes());
         assertFalse(pointField.fieldType().stored());
         assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointField.binaryValue());

diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java b/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().pointDimensionCount());
+            assertEquals(2, pointField.fieldType().pointIndexDimensionCount());
             IndexableField storedField = fields[2];
             assertTrue(storedField.fieldType().stored());
             String strVal =

diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         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().pointDimensionCount());
+        assertEquals(1, pointField.fieldType().pointIndexDimensionCount());
         assertFalse(pointField.fieldType().stored());
         assertEquals(123, pointField.numericValue().doubleValue(), 0d);
         IndexableField dvField = fields[1];