From f43a8e2961d922ab70d0ed9145204abfce78f9ae Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Thu, 18 Sep 2014 11:50:23 +0200
Subject: [PATCH] Aggregations: Fix regression bug for the support of terms
 aggregation on the `_parent` field.

---
 .../aggregations/support/ValuesSource.java    |  2 +-
 .../aggregations/bucket/ParentIdAggTests.java | 62 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java

diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java b/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java
index c77d209621a..f4b47c28799 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java
@@ -339,7 +339,7 @@ public abstract class ValuesSource {
 
             @Override
             public SortedBinaryDocValues bytesValues() {
-                throw new UnsupportedOperationException();
+                return atomicFieldData.getBytesValues();
             }
 
             @Override
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java
new file mode 100644
index 00000000000..c048c912a61
--- /dev/null
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.elasticsearch.search.aggregations.bucket;
+
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.test.ElasticsearchIntegrationTest;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
+
+public class ParentIdAggTests extends ElasticsearchIntegrationTest {
+
+    @Test
+    public void testParentIdAggregation() throws IOException {
+        XContentBuilder mapping = jsonBuilder().startObject()
+                .startObject("childtype")
+                .startObject("_parent")
+                .field("type", "parenttype")
+                .field("store", true)
+                .endObject()
+                .endObject();
+        assertAcked(prepareCreate("testidx").addMapping("childtype", mapping));
+        client().prepareIndex("testidx", "childtype").setSource(jsonBuilder().startObject().field("num", 1).endObject()).setParent("p1").get();
+        client().prepareIndex("testidx", "childtype").setSource(jsonBuilder().startObject().field("num", 2).endObject()).setParent("p1").get();
+
+        refresh();
+        ensureGreen("testidx");
+        SearchResponse searchResponse = client().prepareSearch("testidx").setTypes("childtype").setQuery(matchAllQuery()).addAggregation(AggregationBuilders.terms("children").field("_parent")).get();
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(2l));
+        assertSearchResponse(searchResponse);
+        assertThat(searchResponse.getAggregations().getAsMap().get("children"), instanceOf(Terms.class));
+        Terms terms = (Terms) searchResponse.getAggregations().getAsMap().get("children");
+        assertThat(terms.getBuckets().iterator().next().getDocCount(), equalTo(2l));
+    }
+}
\ No newline at end of file