renamed SyntaxQuery QueryStringQuery

also made IndexMeta private
abhishekdas29 · Aug 29, 2014 · 7313e72 · 7313e72
1 parent 635ae2b
commit 7313e72
Show file tree

Hide file tree

Showing 15 changed files with 258 additions and 258 deletions.
diff --git a/examples/beer-search/main_test.go b/examples/beer-search/main_test.go
@@ -81,7 +81,7 @@ func TestBeerSearchAll(t *testing.T) {
 	}
 
 	// run a syntax query
-	syntaxQuery := bleve.NewSyntaxQuery("+name:light +description:water -description:barley")
+	syntaxQuery := bleve.NewQueryStringQuery("+name:light +description:water -description:barley")
 	syntaxSearchRequest := bleve.NewSearchRequest(syntaxQuery)
 	syntaxSearchResult, err := index.Search(syntaxSearchRequest)
 	if err != nil {

diff --git a/examples/bleve_query/main.go b/examples/bleve_query/main.go
@@ -45,7 +45,7 @@ func main() {
 
 	// build a search with the provided parameters
 	queryString := strings.Join(flag.Args(), " ")
-	query := bleve.NewSyntaxQuery(queryString)
+	query := bleve.NewQueryStringQuery(queryString)
 	searchRequest := bleve.NewSearchRequestOptions(query, *limit, *skip, *explain)
 
 	// enable highlights if requested

diff --git a/genparser.sh b/genparser.sh
@@ -1,9 +1,9 @@
 #! /bin/sh
 
 echo Running nex...
-nex query_syntax.nex
+nex query_string.nex
 echo Running goyacc...
-go tool yacc query_syntax.y
+go tool yacc query_string.y
 # remove first line which pollutes godocs
 tail -n +2 y.go > y.go.new
 mv y.go.new y.go
diff --git a/index_impl.go b/index_impl.go
@@ -46,7 +46,7 @@ func newMemIndex(mapping *IndexMapping) (*indexImpl, error) {
 	rv := indexImpl{
 		path: "",
 		m:    mapping,
-		meta: NewIndexMeta("mem"),
+		meta: newIndexMeta("mem"),
 	}
 
 	storeConstructor := registry.KVStoreConstructorByName(rv.meta.Storage)
@@ -98,7 +98,7 @@ func newIndex(path string, mapping *IndexMapping) (*indexImpl, error) {
 	rv := indexImpl{
 		path: path,
 		m:    mapping,
-		meta: NewIndexMeta(Config.DefaultKVStore),
+		meta: newIndexMeta(Config.DefaultKVStore),
 	}
 	storeConstructor := registry.KVStoreConstructorByName(rv.meta.Storage)
 	if storeConstructor == nil {
@@ -151,7 +151,7 @@ func openIndex(path string) (*indexImpl, error) {
 		path: path,
 	}
 	var err error
-	rv.meta, err = OpenIndexMeta(path)
+	rv.meta, err = openIndexMeta(path)
 	if err != nil {
 		return nil, err
 	}

diff --git a/index_meta.go b/index_meta.go
@@ -21,11 +21,11 @@ type indexMeta struct {
 	Storage string `json:"storage"`
 }
 
-func NewIndexMeta(storage string) *indexMeta {
+func newIndexMeta(storage string) *indexMeta {
 	return &indexMeta{Storage: storage}
 }
 
-func OpenIndexMeta(path string) (*indexMeta, error) {
+func openIndexMeta(path string) (*indexMeta, error) {
 	if _, err := os.Stat(path); os.IsNotExist(err) {
 		return nil, ERROR_INDEX_PATH_DOES_NOT_EXIST
 	}

diff --git a/index_meta_test.go b/index_meta_test.go
@@ -19,7 +19,7 @@ func TestIndexMeta(t *testing.T) {
 	defer os.RemoveAll(testIndexPath)
 
 	// open non-existant meta should error
-	_, err := OpenIndexMeta(testIndexPath)
+	_, err := openIndexMeta(testIndexPath)
 	if err == nil {
 		t.Errorf("expected error, got nil")
 	}
@@ -33,7 +33,7 @@ func TestIndexMeta(t *testing.T) {
 	im = nil
 
 	// open a meta that exists
-	im, err = OpenIndexMeta(testIndexPath)
+	im, err = openIndexMeta(testIndexPath)
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/query.go b/query.go
@@ -96,7 +96,7 @@ func ParseQuery(input []byte) (Query, error) {
 	}
 	_, hasSyntaxQuery := tmp["query"]
 	if hasSyntaxQuery {
-		var rv SyntaxQuery
+		var rv QueryStringQuery
 		err := json.Unmarshal(input, &rv)
 		if err != nil {
 			return nil, err

diff --git a/query_syntax.go → query_string.go b/query_syntax.go → query_string.go
@@ -13,35 +13,35 @@ import (
 	"github.com/blevesearch/bleve/search"
 )
 
-type SyntaxQuery struct {
+type QueryStringQuery struct {
 	Query    string  `json:"query"`
 	BoostVal float64 `json:"boost,omitempty"`
 }
 
-func NewSyntaxQuery(query string) *SyntaxQuery {
-	return &SyntaxQuery{
+func NewQueryStringQuery(query string) *QueryStringQuery {
+	return &QueryStringQuery{
 		Query:    query,
 		BoostVal: 1.0,
 	}
 }
 
-func (q *SyntaxQuery) Boost() float64 {
+func (q *QueryStringQuery) Boost() float64 {
 	return q.BoostVal
 }
 
-func (q *SyntaxQuery) SetBoost(b float64) *SyntaxQuery {
+func (q *QueryStringQuery) SetBoost(b float64) *QueryStringQuery {
 	q.BoostVal = b
 	return q
 }
 
-func (q *SyntaxQuery) Searcher(i *indexImpl, explain bool) (search.Searcher, error) {
+func (q *QueryStringQuery) Searcher(i *indexImpl, explain bool) (search.Searcher, error) {
 	newQuery, err := ParseQuerySyntax(q.Query, i.m)
 	if err != nil {
 		return nil, err
 	}
 	return newQuery.Searcher(i, explain)
 }
 
-func (q *SyntaxQuery) Validate() error {
+func (q *QueryStringQuery) Validate() error {
 	return nil
 }
diff --git a/query_syntax.nex → query_string.nex b/query_syntax.nex → query_string.nex