Simplify generator interface

Author: ajroetker

generators/blevegen/blevegenerator.go

@@ -11,7 +11,6 @@ import (
 	"github.com/lytics/qlbridge/expr"
 	"github.com/lytics/qlbridge/generators/gentypes"
 	"github.com/lytics/qlbridge/lex"
-	"github.com/lytics/qlbridge/rel"
 	"github.com/lytics/qlbridge/vm"
 )
 
@@ -41,9 +40,9 @@ func (fg *FilterGenerator) fieldType(n expr.Node) (*gentypes.FieldType, error) {
 	return fieldType(fg.schema, n)
 }
 
-func (fg *FilterGenerator) Walk(stmt *rel.FilterStatement) (*gentypes.Payload, error) {
+func (fg *FilterGenerator) WalkExpr(node expr.Node) (*gentypes.Payload, error) {
 	payload := &gentypes.Payload{Size: new(int)}
-	q, err := fg.walkExpr(stmt.Filter, 0)
+	q, err := fg.walkExpr(node, 0)
 	if err != nil {
 		return nil, err
 	}

generators/blevegen/blevegenerator_test.go

@@ -255,7 +255,7 @@ func TestBleve(t *testing.T) {
 	require.NoError(t, err, "Failed to parse filter")
 
 	g := NewGenerator(time.Now(), nil, bookSchema)
-	payload, err := g.Walk(filter)
+	payload, err := g.WalkExpr(filter.Filter)
 	require.NoError(t, err, "Failed to walk filter")
 
 	q := payload.Filter.(query.Query)

generators/esgen/esgenerator.go

@@ -9,7 +9,6 @@ import (
 	"github.com/lytics/qlbridge/expr"
 	"github.com/lytics/qlbridge/generators/gentypes"
 	"github.com/lytics/qlbridge/lex"
-	"github.com/lytics/qlbridge/rel"
 	"github.com/lytics/qlbridge/vm"
 )
 
@@ -39,9 +38,9 @@ func (fg *FilterGenerator) fieldType(n expr.Node) (*gentypes.FieldType, error) {
 	return fieldType(fg.schema, n)
 }
 
-func (fg *FilterGenerator) Walk(stmt *rel.FilterStatement) (*gentypes.Payload, error) {
+func (fg *FilterGenerator) WalkExpr(node expr.Node) (*gentypes.Payload, error) {
 	payload := &gentypes.Payload{Size: new(int)}
-	f, err := fg.walkExpr(stmt.Filter, 0)
+	f, err := fg.walkExpr(node, 0)
 	if err != nil {
 		return nil, err
 	}

generators/esgen/esgenerator_test.go

@@ -66,7 +66,7 @@ func TestWalk(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			fs := test.filter(t)
-			p, err := g.Walk(fs)
+			p, err := g.WalkExpr(fs.Filter)
 			require.NoError(t, err)
 			test.asserts(t, p)
 		})

generators/generator.go

@@ -7,14 +7,13 @@ import (
 	"github.com/lytics/qlbridge/generators/blevegen"
 	"github.com/lytics/qlbridge/generators/esgen"
 	"github.com/lytics/qlbridge/generators/gentypes"
-	"github.com/lytics/qlbridge/rel"
 )
 
 type (
 	// Generator interface accepts a FilterStatement and walks
 	// the ast statement generating an elasticsearch payload
 	Generator interface {
-		Walk(stmt *rel.FilterStatement) (*gentypes.Payload, error)
+		WalkExpr(stmt expr.Node) (*gentypes.Payload, error)
 	}
 
 	// SearchBackend indicates which search engine to generate queries for

generators/generators_test.go

@@ -17,7 +17,7 @@ func TestSegmentQLIndexPlan(t *testing.T) {
 			g := generators.NewGenerator(time.Now(), nil, nil, backend)
 			fs, err := rel.ParseFilterQL(`FILTER x==1`)
 			require.Equal(t, nil, err)
-			_, err = g.Walk(fs)
+			_, err = g.WalkExpr(fs.Filter)
 			require.Equal(t, nil, err)
 		})
 	}
@@ -34,7 +34,7 @@ func TestIncluderNilReturn(t *testing.T) {
 			g := generators.NewGenerator(time.Now(), nilincluder{}, nil)
 			fs, err := rel.ParseFilterQL(`FILTER INCLUDE xyz`)
 			require.NoError(t, err)
-			_, err = g.Walk(fs)
+			_, err = g.WalkExpr(fs.Filter)
 			require.Error(t, err)
 		})
 	}