WIP some really hacky ideas

Author: Christoph Büscher

server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java

@@ -19,11 +19,13 @@
 package org.elasticsearch.search.aggregations.bucket.geogrid;
 
 import org.apache.lucene.util.PriorityQueue;
+import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.util.LongObjectPagedHashMap;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.rest.action.search.RestSearchAction;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.InternalAggregations;
@@ -154,6 +156,8 @@ public int hashCode() {
 
     }
 
+    static final ParseField HASH_TYPE_FIELD = new ParseField("hash_type");
+
     private final int requiredSize;
     private final List<Bucket> buckets;
 
@@ -238,6 +242,17 @@ public InternalGeoHashGrid doReduce(List<InternalAggregation> aggregations, Redu
 
     @Override
     public XContentBuilder doXContentBody(XContentBuilder builder, Params params) throws IOException {
+        // not sure we should re-use RestSearchAction.TYPED_KEYS_PARAM here, but we already use it in
+        // suggestions and aggregations and it should be switched on by every high level client reqeust
+        if (params.paramAsBoolean(RestSearchAction.TYPED_KEYS_PARAM, false)) {
+            if (buckets.isEmpty() == false) {
+                // TODO this assume all types in the buckets are same, but we should really keep this
+                // info in the aggregation itself
+                // TODO the GeoHashType needs a better method to get some sort of ID for it, name() or toString()
+                // seem to brittle for me tbh
+                builder.field(HASH_TYPE_FIELD.getPreferredName(), buckets.get(0).type.toString());
+            }
+        }
         builder.startArray(CommonFields.BUCKETS.getPreferredName());
         for (Bucket bucket : buckets) {
             bucket.toXContent(builder, params);

server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java

@@ -30,6 +30,8 @@
 
 public class ParsedGeoHashGrid extends ParsedMultiBucketAggregation<ParsedGeoHashGrid.ParsedBucket> implements GeoHashGrid {
 
+    private GeoHashType type = GeoHashType.DEFAULT;
+
     @Override
     public String getType() {
         return GeoGridAggregationBuilder.NAME;
@@ -40,25 +42,40 @@ public List<? extends GeoHashGrid.Bucket> getBuckets() {
         return buckets;
     }
 
+    private void setType(String type) {
+        // TODO something less brittle than enum#valueOf() needed I think
+        this.type = GeoHashType.forString(type);
+    }
+
     private static ObjectParser<ParsedGeoHashGrid, Void> PARSER =
             new ObjectParser<>(ParsedGeoHashGrid.class.getSimpleName(), true, ParsedGeoHashGrid::new);
     static {
         declareMultiBucketAggregationFields(PARSER, ParsedBucket::fromXContent, ParsedBucket::fromXContent);
+        PARSER.declareString(ParsedGeoHashGrid::setType, InternalGeoHashGrid.HASH_TYPE_FIELD);
     }
 
     public static ParsedGeoHashGrid fromXContent(XContentParser parser, String name) throws IOException {
         ParsedGeoHashGrid aggregation = PARSER.parse(parser, null);
         aggregation.setName(name);
+        // transfer hash type info to buckets after parsing, this is horrible IMHO but I couldn't make it work
+        // otherwise quickly
+        // TODO don't do it like this!
+        for (ParsedBucket b : aggregation.buckets) {
+            b.hashType = aggregation.type;
+        }
         return aggregation;
     }
 
     public static class ParsedBucket extends ParsedMultiBucketAggregation.ParsedBucket implements GeoHashGrid.Bucket {
 
         private String geohashAsString;
+        private GeoHashType hashType = GeoHashType.DEFAULT;
 
         @Override
         public GeoPoint getKey() {
-            return GeoPoint.fromGeohash(geohashAsString);
+            // TODO in order for this to work, the GeoHashTypeProvider needs to convert back from String -> GeoPoint
+            // return hashType.getHandler().hashStringAsGeoPoint(geohashAsString);
+            return null;
         }
 
         @Override