Enable GeoPointV2 with backward compatibility testing

This commit removes all noreleases and cuts over to Lucene 5.4 GeoPointField type. Included are randomized testing updates to unit and integration test suites for ensuring full backward compatability with existing geo_point indexes.

1 files changed, 6 insertions, 1 deletions

diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java
index d4ff2f106b..57283c1bd0 100644
--- a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java
+++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.search.suggest.completion.context;
 
+import org.apache.lucene.document.StringField;
 import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.util.GeoHashUtils;
@@ -193,7 +194,11 @@ public class GeoContextMapping extends ContextMapping {
                 }
             } else {
                 for (IndexableField field : fields) {
-                    spare.resetFromString(field.stringValue());
+                    if (field instanceof StringField) {
+                        spare.resetFromString(field.stringValue());
+                    } else {
+                        spare.resetFromIndexHash(Long.parseLong(field.stringValue()));
+                    }
                     geohashes.add(spare.geohash());
                 }
             }