wip: Elasticsearch 2.0

* Convert all aggregations to pointer types.

Author: olivere

search_aggs_bucket_children.go

@@ -14,30 +14,29 @@ type ChildrenAggregation struct {
 	meta            map[string]interface{}
 }
 
-func NewChildrenAggregation() ChildrenAggregation {
-	a := ChildrenAggregation{
+func NewChildrenAggregation() *ChildrenAggregation {
+	return &ChildrenAggregation{
 		subAggregations: make(map[string]Aggregation),
 	}
-	return a
 }
 
-func (a ChildrenAggregation) Type(typ string) ChildrenAggregation {
+func (a *ChildrenAggregation) Type(typ string) *ChildrenAggregation {
 	a.typ = typ
 	return a
 }
 
-func (a ChildrenAggregation) SubAggregation(name string, subAggregation Aggregation) ChildrenAggregation {
+func (a *ChildrenAggregation) SubAggregation(name string, subAggregation Aggregation) *ChildrenAggregation {
 	a.subAggregations[name] = subAggregation
 	return a
 }
 
 // Meta sets the meta data to be included in the aggregation response.
-func (a ChildrenAggregation) Meta(metaData map[string]interface{}) ChildrenAggregation {
+func (a *ChildrenAggregation) Meta(metaData map[string]interface{}) *ChildrenAggregation {
 	a.meta = metaData
 	return a
 }
 
-func (a ChildrenAggregation) Source() (interface{}, error) {
+func (a *ChildrenAggregation) Source() (interface{}, error) {
 	// Example:
 	//	{
 	//    "aggs" : {

search_aggs_bucket_date_histogram.go

@@ -28,84 +28,83 @@ type DateHistogramAggregation struct {
 	factor                     *float64
 }
 
-func NewDateHistogramAggregation() DateHistogramAggregation {
-	a := DateHistogramAggregation{
+func NewDateHistogramAggregation() *DateHistogramAggregation {
+	return &DateHistogramAggregation{
 		subAggregations: make(map[string]Aggregation),
 	}
-	return a
 }
 
-func (a DateHistogramAggregation) Field(field string) DateHistogramAggregation {
+func (a *DateHistogramAggregation) Field(field string) *DateHistogramAggregation {
 	a.field = field
 	return a
 }
 
-func (a DateHistogramAggregation) Script(script *Script) DateHistogramAggregation {
+func (a *DateHistogramAggregation) Script(script *Script) *DateHistogramAggregation {
 	a.script = script
 	return a
 }
 
-func (a DateHistogramAggregation) SubAggregation(name string, subAggregation Aggregation) DateHistogramAggregation {
+func (a *DateHistogramAggregation) SubAggregation(name string, subAggregation Aggregation) *DateHistogramAggregation {
 	a.subAggregations[name] = subAggregation
 	return a
 }
 
 // Meta sets the meta data to be included in the aggregation response.
-func (a DateHistogramAggregation) Meta(metaData map[string]interface{}) DateHistogramAggregation {
+func (a *DateHistogramAggregation) Meta(metaData map[string]interface{}) *DateHistogramAggregation {
 	a.meta = metaData
 	return a
 }
 
 // Allowed values are: "year", "quarter", "month", "week", "day",
 // "hour", "minute". It also supports time settings like "1.5h"
 // (up to "w" for weeks).
-func (a DateHistogramAggregation) Interval(interval string) DateHistogramAggregation {
+func (a *DateHistogramAggregation) Interval(interval string) *DateHistogramAggregation {
 	a.interval = interval
 	return a
 }
 
 // Order specifies the sort order. Valid values for order are:
 // "_key", "_count", a sub-aggregation name, or a sub-aggregation name
 // with a metric.
-func (a DateHistogramAggregation) Order(order string, asc bool) DateHistogramAggregation {
+func (a *DateHistogramAggregation) Order(order string, asc bool) *DateHistogramAggregation {
 	a.order = order
 	a.orderAsc = asc
 	return a
 }
 
-func (a DateHistogramAggregation) OrderByCount(asc bool) DateHistogramAggregation {
+func (a *DateHistogramAggregation) OrderByCount(asc bool) *DateHistogramAggregation {
 	// "order" : { "_count" : "asc" }
 	a.order = "_count"
 	a.orderAsc = asc
 	return a
 }
 
-func (a DateHistogramAggregation) OrderByCountAsc() DateHistogramAggregation {
+func (a *DateHistogramAggregation) OrderByCountAsc() *DateHistogramAggregation {
 	return a.OrderByCount(true)
 }
 
-func (a DateHistogramAggregation) OrderByCountDesc() DateHistogramAggregation {
+func (a *DateHistogramAggregation) OrderByCountDesc() *DateHistogramAggregation {
 	return a.OrderByCount(false)
 }
 
-func (a DateHistogramAggregation) OrderByKey(asc bool) DateHistogramAggregation {
+func (a *DateHistogramAggregation) OrderByKey(asc bool) *DateHistogramAggregation {
 	// "order" : { "_key" : "asc" }
 	a.order = "_key"
 	a.orderAsc = asc
 	return a
 }
 
-func (a DateHistogramAggregation) OrderByKeyAsc() DateHistogramAggregation {
+func (a *DateHistogramAggregation) OrderByKeyAsc() *DateHistogramAggregation {
 	return a.OrderByKey(true)
 }
 
-func (a DateHistogramAggregation) OrderByKeyDesc() DateHistogramAggregation {
+func (a *DateHistogramAggregation) OrderByKeyDesc() *DateHistogramAggregation {
 	return a.OrderByKey(false)
 }
 
 // OrderByAggregation creates a bucket ordering strategy which sorts buckets
 // based on a single-valued calc get.
-func (a DateHistogramAggregation) OrderByAggregation(aggName string, asc bool) DateHistogramAggregation {
+func (a *DateHistogramAggregation) OrderByAggregation(aggName string, asc bool) *DateHistogramAggregation {
 	// {
 	//     "aggs" : {
 	//         "genders" : {
@@ -126,7 +125,7 @@ func (a DateHistogramAggregation) OrderByAggregation(aggName string, asc bool) D
 
 // OrderByAggregationAndMetric creates a bucket ordering strategy which
 // sorts buckets based on a multi-valued calc get.
-func (a DateHistogramAggregation) OrderByAggregationAndMetric(aggName, metric string, asc bool) DateHistogramAggregation {
+func (a *DateHistogramAggregation) OrderByAggregationAndMetric(aggName, metric string, asc bool) *DateHistogramAggregation {
 	// {
 	//     "aggs" : {
 	//         "genders" : {
@@ -145,59 +144,59 @@ func (a DateHistogramAggregation) OrderByAggregationAndMetric(aggName, metric st
 	return a
 }
 
-func (a DateHistogramAggregation) MinDocCount(minDocCount int64) DateHistogramAggregation {
+func (a *DateHistogramAggregation) MinDocCount(minDocCount int64) *DateHistogramAggregation {
 	a.minDocCount = &minDocCount
 	return a
 }
 
-func (a DateHistogramAggregation) PreZone(preZone string) DateHistogramAggregation {
+func (a *DateHistogramAggregation) PreZone(preZone string) *DateHistogramAggregation {
 	a.preZone = preZone
 	return a
 }
 
-func (a DateHistogramAggregation) PostZone(postZone string) DateHistogramAggregation {
+func (a *DateHistogramAggregation) PostZone(postZone string) *DateHistogramAggregation {
 	a.postZone = postZone
 	return a
 }
 
-func (a DateHistogramAggregation) PreZoneAdjustLargeInterval(preZoneAdjustLargeInterval bool) DateHistogramAggregation {
+func (a *DateHistogramAggregation) PreZoneAdjustLargeInterval(preZoneAdjustLargeInterval bool) *DateHistogramAggregation {
 	a.preZoneAdjustLargeInterval = &preZoneAdjustLargeInterval
 	return a
 }
 
-func (a DateHistogramAggregation) PreOffset(preOffset int64) DateHistogramAggregation {
+func (a *DateHistogramAggregation) PreOffset(preOffset int64) *DateHistogramAggregation {
 	a.preOffset = preOffset
 	return a
 }
 
-func (a DateHistogramAggregation) PostOffset(postOffset int64) DateHistogramAggregation {
+func (a *DateHistogramAggregation) PostOffset(postOffset int64) *DateHistogramAggregation {
 	a.postOffset = postOffset
 	return a
 }
 
-func (a DateHistogramAggregation) Factor(factor float64) DateHistogramAggregation {
+func (a *DateHistogramAggregation) Factor(factor float64) *DateHistogramAggregation {
 	a.factor = &factor
 	return a
 }
 
-func (a DateHistogramAggregation) Format(format string) DateHistogramAggregation {
+func (a *DateHistogramAggregation) Format(format string) *DateHistogramAggregation {
 	a.format = format
 	return a
 }
 
 // ExtendedBoundsMin accepts int, int64, string, or time.Time values.
-func (a DateHistogramAggregation) ExtendedBoundsMin(min interface{}) DateHistogramAggregation {
+func (a *DateHistogramAggregation) ExtendedBoundsMin(min interface{}) *DateHistogramAggregation {
 	a.extendedBoundsMin = min
 	return a
 }
 
 // ExtendedBoundsMax accepts int, int64, string, or time.Time values.
-func (a DateHistogramAggregation) ExtendedBoundsMax(max interface{}) DateHistogramAggregation {
+func (a *DateHistogramAggregation) ExtendedBoundsMax(max interface{}) *DateHistogramAggregation {
 	a.extendedBoundsMax = max
 	return a
 }
 
-func (a DateHistogramAggregation) Source() (interface{}, error) {
+func (a *DateHistogramAggregation) Source() (interface{}, error) {
 	// Example:
 	// {
 	//     "aggs" : {

search_aggs_bucket_date_range.go

@@ -33,111 +33,110 @@ type DateRangeAggregationEntry struct {
 	To   interface{}
 }
 
-func NewDateRangeAggregation() DateRangeAggregation {
-	a := DateRangeAggregation{
+func NewDateRangeAggregation() *DateRangeAggregation {
+	return &DateRangeAggregation{
 		subAggregations: make(map[string]Aggregation),
 		entries:         make([]DateRangeAggregationEntry, 0),
 	}
-	return a
 }
 
-func (a DateRangeAggregation) Field(field string) DateRangeAggregation {
+func (a *DateRangeAggregation) Field(field string) *DateRangeAggregation {
 	a.field = field
 	return a
 }
 
-func (a DateRangeAggregation) Script(script *Script) DateRangeAggregation {
+func (a *DateRangeAggregation) Script(script *Script) *DateRangeAggregation {
 	a.script = script
 	return a
 }
 
-func (a DateRangeAggregation) SubAggregation(name string, subAggregation Aggregation) DateRangeAggregation {
+func (a *DateRangeAggregation) SubAggregation(name string, subAggregation Aggregation) *DateRangeAggregation {
 	a.subAggregations[name] = subAggregation
 	return a
 }
 
 // Meta sets the meta data to be included in the aggregation response.
-func (a DateRangeAggregation) Meta(metaData map[string]interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) Meta(metaData map[string]interface{}) *DateRangeAggregation {
 	a.meta = metaData
 	return a
 }
 
-func (a DateRangeAggregation) Keyed(keyed bool) DateRangeAggregation {
+func (a *DateRangeAggregation) Keyed(keyed bool) *DateRangeAggregation {
 	a.keyed = &keyed
 	return a
 }
 
-func (a DateRangeAggregation) Unmapped(unmapped bool) DateRangeAggregation {
+func (a *DateRangeAggregation) Unmapped(unmapped bool) *DateRangeAggregation {
 	a.unmapped = &unmapped
 	return a
 }
 
-func (a DateRangeAggregation) Format(format string) DateRangeAggregation {
+func (a *DateRangeAggregation) Format(format string) *DateRangeAggregation {
 	a.format = format
 	return a
 }
 
-func (a DateRangeAggregation) AddRange(from, to interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) AddRange(from, to interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{From: from, To: to})
 	return a
 }
 
-func (a DateRangeAggregation) AddRangeWithKey(key string, from, to interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) AddRangeWithKey(key string, from, to interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{Key: key, From: from, To: to})
 	return a
 }
 
-func (a DateRangeAggregation) AddUnboundedTo(from interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) AddUnboundedTo(from interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{From: from, To: nil})
 	return a
 }
 
-func (a DateRangeAggregation) AddUnboundedToWithKey(key string, from interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) AddUnboundedToWithKey(key string, from interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{Key: key, From: from, To: nil})
 	return a
 }
 
-func (a DateRangeAggregation) AddUnboundedFrom(to interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) AddUnboundedFrom(to interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{From: nil, To: to})
 	return a
 }
 
-func (a DateRangeAggregation) AddUnboundedFromWithKey(key string, to interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) AddUnboundedFromWithKey(key string, to interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{Key: key, From: nil, To: to})
 	return a
 }
 
-func (a DateRangeAggregation) Lt(to interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) Lt(to interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{From: nil, To: to})
 	return a
 }
 
-func (a DateRangeAggregation) LtWithKey(key string, to interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) LtWithKey(key string, to interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{Key: key, From: nil, To: to})
 	return a
 }
 
-func (a DateRangeAggregation) Between(from, to interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) Between(from, to interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{From: from, To: to})
 	return a
 }
 
-func (a DateRangeAggregation) BetweenWithKey(key string, from, to interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) BetweenWithKey(key string, from, to interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{Key: key, From: from, To: to})
 	return a
 }
 
-func (a DateRangeAggregation) Gt(from interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) Gt(from interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{From: from, To: nil})
 	return a
 }
 
-func (a DateRangeAggregation) GtWithKey(key string, from interface{}) DateRangeAggregation {
+func (a *DateRangeAggregation) GtWithKey(key string, from interface{}) *DateRangeAggregation {
 	a.entries = append(a.entries, DateRangeAggregationEntry{Key: key, From: from, To: nil})
 	return a
 }
 
-func (a DateRangeAggregation) Source() (interface{}, error) {
+func (a *DateRangeAggregation) Source() (interface{}, error) {
 	// Example:
 	// {
 	//     "aggs" : {

search_aggs_bucket_filter.go

@@ -15,30 +15,29 @@ type FilterAggregation struct {
 	meta            map[string]interface{}
 }
 
-func NewFilterAggregation() FilterAggregation {
-	a := FilterAggregation{
+func NewFilterAggregation() *FilterAggregation {
+	return &FilterAggregation{
 		subAggregations: make(map[string]Aggregation),
 	}
-	return a
 }
 
-func (a FilterAggregation) SubAggregation(name string, subAggregation Aggregation) FilterAggregation {
+func (a *FilterAggregation) SubAggregation(name string, subAggregation Aggregation) *FilterAggregation {
 	a.subAggregations[name] = subAggregation
 	return a
 }
 
 // Meta sets the meta data to be included in the aggregation response.
-func (a FilterAggregation) Meta(metaData map[string]interface{}) FilterAggregation {
+func (a *FilterAggregation) Meta(metaData map[string]interface{}) *FilterAggregation {
 	a.meta = metaData
 	return a
 }
 
-func (a FilterAggregation) Filter(filter Query) FilterAggregation {
+func (a *FilterAggregation) Filter(filter Query) *FilterAggregation {
 	a.filter = filter
 	return a
 }
 
-func (a FilterAggregation) Source() (interface{}, error) {
+func (a *FilterAggregation) Source() (interface{}, error) {
 	// Example:
 	//	{
 	//    "aggs" : {