From 8609e7af082f50a288276a237f54e0fc4e1eaa77 Mon Sep 17 00:00:00 2001
From: Sergey Avseyev <sergey.avseyev@gmail.com>
Date: Sat, 31 Oct 2015 14:01:19 +0300
Subject: [PATCH] Simplify JSON API for phrase query

New API looks like this:

    {"query":{"terms":["watered","down"],"field":"desc"}}

instead of

    {"query":{"terms":[{"term":"watered","field":"desc"},{"term":"down","field":"desc"}]}}

So that it eliminats accidental errors by supplying terms with different
fields, or different type of query
---
 .gitignore      |  1 +
 query.go        |  9 ++-------
 query_phrase.go | 45 ++++++++++++++++++---------------------------
 query_test.go   |  2 +-
 4 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index 97f0415d..c2c7973a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /utils/bleve_query/bleve_query
 /utils/bleve_registry/bleve_registry
 /y.output
+*.test
diff --git a/query.go b/query.go
index a4fa21fd..99d821d7 100644
--- a/query.go
+++ b/query.go
@@ -108,11 +108,6 @@ func ParseQuery(input []byte) (Query, error) {
 		if rv.Boost() == 0 {
 			rv.SetBoost(1)
 		}
-		for _, tq := range rv.TermQueries {
-			if tq.Boost() == 0 {
-				tq.SetBoost(1)
-			}
-		}
 		return &rv, nil
 	}
 	_, hasConjuncts := tmp["conjuncts"]
@@ -273,11 +268,11 @@ func expandQuery(m *IndexMapping, query Query) (Query, error) {
 			return &q, nil
 		case *phraseQuery:
 			q := *query.(*phraseQuery)
-			children, err := expandSlice(q.TermQueries)
+			children, err := expandSlice(q.termQueries)
 			if err != nil {
 				return nil, err
 			}
-			q.TermQueries = children
+			q.termQueries = children
 			return &q, nil
 		default:
 			return query, nil
diff --git a/query_phrase.go b/query_phrase.go
index d0318146..f45cbf9c 100644
--- a/query_phrase.go
+++ b/query_phrase.go
@@ -11,7 +11,6 @@ package bleve
 
 import (
 	"encoding/json"
-	"fmt"
 
 	"github.com/blevesearch/bleve/index"
 	"github.com/blevesearch/bleve/search"
@@ -19,9 +18,10 @@ import (
 )
 
 type phraseQuery struct {
-	TermQueries []Query `json:"terms"`
-	BoostVal    float64 `json:"boost,omitempty"`
-	terms       []string
+	Terms       []string `json:"terms"`
+	FieldVal    string   `json:"field,omitempty"`
+	BoostVal    float64  `json:"boost,omitempty"`
+	termQueries []Query
 }
 
 // NewPhraseQuery creates a new Query for finding
@@ -37,9 +37,10 @@ func NewPhraseQuery(terms []string, field string) *phraseQuery {
 		}
 	}
 	return &phraseQuery{
-		TermQueries: termQueries,
+		Terms:       terms,
+		FieldVal:    field,
 		BoostVal:    1.0,
-		terms:       terms,
+		termQueries: termQueries,
 	}
 }
 
@@ -54,48 +55,38 @@ func (q *phraseQuery) SetBoost(b float64) Query {
 
 func (q *phraseQuery) Searcher(i index.IndexReader, m *IndexMapping, explain bool) (search.Searcher, error) {
 
-	conjunctionQuery := NewConjunctionQuery(q.TermQueries)
+	conjunctionQuery := NewConjunctionQuery(q.termQueries)
 	conjunctionSearcher, err := conjunctionQuery.Searcher(i, m, explain)
 	if err != nil {
 		return nil, err
 	}
-	return searchers.NewPhraseSearcher(i, conjunctionSearcher.(*searchers.ConjunctionSearcher), q.terms)
+	return searchers.NewPhraseSearcher(i, conjunctionSearcher.(*searchers.ConjunctionSearcher), q.Terms)
 }
 
 func (q *phraseQuery) Validate() error {
-	if len(q.TermQueries) < 1 {
+	if len(q.termQueries) < 1 {
 		return ErrorPhraseQueryNoTerms
 	}
 	return nil
 }
 
 func (q *phraseQuery) UnmarshalJSON(data []byte) error {
-	tmp := struct {
-		Terms    []json.RawMessage `json:"terms"`
-		BoostVal float64           `json:"boost,omitempty"`
-	}{}
+	type _phraseQuery phraseQuery
+	tmp := _phraseQuery{}
 	err := json.Unmarshal(data, &tmp)
 	if err != nil {
 		return err
 	}
-	q.TermQueries = make([]Query, len(tmp.Terms))
-	q.terms = make([]string, 0)
-	for i, term := range tmp.Terms {
-		query, err := ParseQuery(term)
-		if err != nil {
-			return err
-		}
-		q.TermQueries[i] = query
-		tq, isTermQuery := query.(*termQuery)
-		if !isTermQuery {
-			return fmt.Errorf("phrase query can only contain term queries")
-		}
-		q.terms = append(q.terms, tq.Term)
-	}
+	q.Terms = tmp.Terms
+	q.FieldVal = tmp.FieldVal
 	q.BoostVal = tmp.BoostVal
 	if q.BoostVal == 0 {
 		q.BoostVal = 1
 	}
+	q.termQueries = make([]Query, len(q.Terms))
+	for i, term := range q.Terms {
+		q.termQueries[i] = &termQuery{Term: term, FieldVal: q.FieldVal, BoostVal: q.BoostVal}
+	}
 	return nil
 }
 
diff --git a/query_test.go b/query_test.go
index 8933ccf8..82d1f3b8 100644
--- a/query_test.go
+++ b/query_test.go
@@ -46,7 +46,7 @@ func TestParseQuery(t *testing.T) {
 				[]Query{NewMatchQuery("devon").SetField("desc")}),
 		},
 		{
-			input:  []byte(`{"terms":[{"term":"watered","field":"desc"},{"term":"down","field":"desc"}]}`),
+			input:  []byte(`{"terms":["watered","down"],"field":"desc"}`),
 			output: NewPhraseQuery([]string{"watered", "down"}, "desc"),
 		},
 		{