Adapt scoring in HasChildQuery/HasParentQuery

ES 5.0 changed score features in HasChildQuery/HasParentQuery.

Close #399

Author: olivere

client.go

@@ -24,7 +24,7 @@ import (
 
 const (
 	// Version is the current version of Elastic.
-	Version = "5.0.10"
+	Version = "5.0.11"
 
 	// DefaultUrl is the default endpoint of Elasticsearch on the local machine.
 	// It is used e.g. when initializing a new Client without a specific URL.

search_queries_has_child.go

@@ -13,7 +13,7 @@ type HasChildQuery struct {
 	query              Query
 	childType          string
 	boost              *float64
-	scoreType          string
+	scoreMode          string
 	minChildren        *int
 	maxChildren        *int
 	shortCircuitCutoff *int
@@ -35,10 +35,11 @@ func (q *HasChildQuery) Boost(boost float64) *HasChildQuery {
 	return q
 }
 
-// ScoreType defines how the scores from the matching child documents
-// are mapped into the parent document.
-func (q *HasChildQuery) ScoreType(scoreType string) *HasChildQuery {
-	q.scoreType = scoreType
+// ScoreMode defines how the scores from the matching child documents
+// are mapped into the parent document. Allowed values are: min, max,
+// avg, or none.
+func (q *HasChildQuery) ScoreMode(scoreMode string) *HasChildQuery {
+	q.scoreMode = scoreMode
 	return q
 }
 
@@ -83,6 +84,7 @@ func (q *HasChildQuery) Source() (interface{}, error) {
 	// {
 	//   "has_child" : {
 	//       "type" : "blog_tag",
+	//       "score_mode" : "min",
 	//       "query" : {
 	//           "term" : {
 	//               "tag" : "something"
@@ -103,8 +105,8 @@ func (q *HasChildQuery) Source() (interface{}, error) {
 	if q.boost != nil {
 		query["boost"] = *q.boost
 	}
-	if q.scoreType != "" {
-		query["score_type"] = q.scoreType
+	if q.scoreMode != "" {
+		query["score_mode"] = q.scoreMode
 	}
 	if q.minChildren != nil {
 		query["min_children"] = *q.minChildren

search_queries_has_child_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func TestHasChildQuery(t *testing.T) {
-	q := NewHasChildQuery("blog_tag", NewTermQuery("tag", "something"))
+	q := NewHasChildQuery("blog_tag", NewTermQuery("tag", "something")).ScoreMode("min")
 	src, err := q.Source()
 	if err != nil {
 		t.Fatal(err)
@@ -20,7 +20,7 @@ func TestHasChildQuery(t *testing.T) {
 		t.Fatalf("marshaling to JSON failed: %v", err)
 	}
 	got := string(data)
-	expected := `{"has_child":{"query":{"term":{"tag":"something"}},"type":"blog_tag"}}`
+	expected := `{"has_child":{"query":{"term":{"tag":"something"}},"score_mode":"min","type":"blog_tag"}}`
 	if got != expected {
 		t.Errorf("expected\n%s\n,got:\n%s", expected, got)
 	}

search_queries_has_parent.go

@@ -16,7 +16,7 @@ type HasParentQuery struct {
 	query      Query
 	parentType string
 	boost      *float64
-	scoreType  string
+	score      *bool
 	queryName  string
 	innerHit   *InnerHit
 }
@@ -35,9 +35,9 @@ func (q *HasParentQuery) Boost(boost float64) *HasParentQuery {
 	return q
 }
 
-// ScoreType defines how the parent score is mapped into the child documents.
-func (q *HasParentQuery) ScoreType(scoreType string) *HasParentQuery {
-	q.scoreType = scoreType
+// Score defines if the parent score is mapped into the child documents.
+func (q *HasParentQuery) Score(score bool) *HasParentQuery {
+	q.score = &score
 	return q
 }
 
@@ -80,8 +80,8 @@ func (q *HasParentQuery) Source() (interface{}, error) {
 	if q.boost != nil {
 		query["boost"] = *q.boost
 	}
-	if q.scoreType != "" {
-		query["score_type"] = q.scoreType
+	if q.score != nil {
+		query["score"] = *q.score
 	}
 	if q.queryName != "" {
 		query["_name"] = q.queryName

search_queries_has_parent_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func TestHasParentQueryTest(t *testing.T) {
-	q := NewHasParentQuery("blog", NewTermQuery("tag", "something"))
+	q := NewHasParentQuery("blog", NewTermQuery("tag", "something")).Score(true)
 	src, err := q.Source()
 	if err != nil {
 		t.Fatal(err)
@@ -20,7 +20,7 @@ func TestHasParentQueryTest(t *testing.T) {
 		t.Fatalf("marshaling to JSON failed: %v", err)
 	}
 	got := string(data)
-	expected := `{"has_parent":{"parent_type":"blog","query":{"term":{"tag":"something"}}}}`
+	expected := `{"has_parent":{"parent_type":"blog","query":{"term":{"tag":"something"}},"score":true}}`
 	if got != expected {
 		t.Errorf("expected\n%s\n,got:\n%s", expected, got)
 	}