Merge pull request #149 from erizocosmico/feature/session

erizocosmico · web-flow · commit a942dff84134 · 2018-03-12T11:27:29.000+01:00
gitquery: implement session
diff --git a/blobs.go b/blobs.go
@@ -29,15 +29,15 @@ func (blobsTable) Schema() sql.Schema {
 	}
 }
 
-func (r *blobsTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {
+func (r *blobsTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {
 	return f(r)
 }
 
-func (r *blobsTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
-	return r
+func (r *blobsTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {
+	return r, nil
 }
 
-func (r blobsTable) RowIter() (sql.RowIter, error) {
+func (r blobsTable) RowIter(_ sql.Session) (sql.RowIter, error) {
 	iter := &blobIter{}
 
 	repoIter, err := NewRowRepoIter(r.pool, iter)
diff --git a/blobs_test.go b/blobs_test.go
@@ -1,6 +1,7 @@
 package gitquery
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -31,7 +32,7 @@ func TestBlobsTable_RowIter(t *testing.T) {
 	f := fixtures.Basic().One()
 	table := getTable(require, f, blobsTableName)
 
-	rows, err := sql.NodeToRows(table)
+	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), table)
 	require.Nil(err)
 	require.Len(rows, 10)
 
diff --git a/cmd/gitquery/server.go b/cmd/gitquery/server.go
@@ -22,6 +22,7 @@ type CmdServer struct {
 	Password string `short:"P" long:"password" default:"" description:"Password used for connection"`
 
 	engine *sqle.Engine
+	pool   *gitquery.RepositoryPool
 	name   string
 }
 
@@ -35,12 +36,13 @@ func (c *CmdServer) buildDatabase() error {
 	var err error
 
 	pool := gitquery.NewRepositoryPool()
-	err = pool.AddDir(c.Git)
+	c.pool = &pool
+	err = c.pool.AddDir(c.Git)
 	if err != nil {
 		return err
 	}
 
-	c.engine.AddDatabase(gitquery.NewDatabase(c.name, &pool))
+	c.engine.AddDatabase(gitquery.NewDatabase(c.name, c.pool))
 	function.Register(c.engine.Catalog)
 	return nil
 }
@@ -57,7 +59,13 @@ func (c *CmdServer) Execute(args []string) error {
 	}
 
 	hostString := net.JoinHostPort(c.Host, strconv.Itoa(c.Port))
-	s, err := server.NewServer("tcp", hostString, auth, c.engine)
+	s, err := server.NewServer(
+		"tcp",
+		hostString,
+		auth,
+		c.engine,
+		gitquery.NewSessionBuilder(c.pool),
+	)
 	if err != nil {
 		return err
 	}
diff --git a/commits.go b/commits.go
@@ -35,15 +35,15 @@ func (commitsTable) Schema() sql.Schema {
 	}
 }
 
-func (r *commitsTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {
+func (r *commitsTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {
 	return f(r)
 }
 
-func (r *commitsTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
-	return r
+func (r *commitsTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {
+	return r, nil
 }
 
-func (r commitsTable) RowIter() (sql.RowIter, error) {
+func (r commitsTable) RowIter(_ sql.Session) (sql.RowIter, error) {
 	iter := &commitIter{}
 
 	repoIter, err := NewRowRepoIter(r.pool, iter)
diff --git a/commits_test.go b/commits_test.go
@@ -1,6 +1,7 @@
 package gitquery
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -31,7 +32,7 @@ func TestCommitsTable_RowIter(t *testing.T) {
 	f := fixtures.Basic().One()
 	table := getTable(require, f, commitsTableName)
 
-	rows, err := sql.NodeToRows(table)
+	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), table)
 	require.Nil(err)
 	require.Len(rows, 9)
 
diff --git a/internal/function/is_remote.go b/internal/function/is_remote.go
@@ -18,11 +18,9 @@ func NewIsRemote(e sql.Expression) sql.Expression {
 	return &IsRemote{expression.UnaryExpression{Child: e}}
 }
 
-var _ sql.Expression = (*IsRemote)(nil)
-
 // Eval implements the expression interface.
-func (f *IsRemote) Eval(row sql.Row) (interface{}, error) {
-	val, err := f.Child.Eval(row)
+func (f *IsRemote) Eval(session sql.Session, row sql.Row) (interface{}, error) {
+	val, err := f.Child.Eval(session, row)
 	if err != nil {
 		return nil, err
 	}
@@ -45,8 +43,12 @@ func (IsRemote) Name() string {
 }
 
 // TransformUp implements the Expression interface.
-func (f IsRemote) TransformUp(fn func(sql.Expression) sql.Expression) sql.Expression {
-	return NewIsRemote(fn(f.Child))
+func (f IsRemote) TransformUp(fn func(sql.Expression) (sql.Expression, error)) (sql.Expression, error) {
+	child, err := f.Child.TransformUp(fn)
+	if err != nil {
+		return nil, err
+	}
+	return fn(NewIsRemote(child))
 }
 
 // Type implements the Expression interface.
diff --git a/internal/function/is_remote_test.go b/internal/function/is_remote_test.go
@@ -1,6 +1,7 @@
 package function
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -27,7 +28,7 @@ func TestIsRemote(t *testing.T) {
 	for _, tt := range testCases {
 		t.Run(tt.name, func(t *testing.T) {
 			require := require.New(t)
-			val, err := f.Eval(tt.row)
+			val, err := f.Eval(sql.NewBaseSession(context.TODO()), tt.row)
 			if tt.err {
 				require.Error(err)
 				require.True(sql.ErrInvalidType.Is(err))
diff --git a/internal/function/is_tag.go b/internal/function/is_tag.go
@@ -18,11 +18,9 @@ func NewIsTag(e sql.Expression) sql.Expression {
 	return &IsTag{expression.UnaryExpression{Child: e}}
 }
 
-var _ sql.Expression = (*IsTag)(nil)
-
 // Eval implements the expression interface.
-func (f *IsTag) Eval(row sql.Row) (interface{}, error) {
-	val, err := f.Child.Eval(row)
+func (f *IsTag) Eval(session sql.Session, row sql.Row) (interface{}, error) {
+	val, err := f.Child.Eval(session, row)
 	if err != nil {
 		return nil, err
 	}
@@ -45,8 +43,12 @@ func (IsTag) Name() string {
 }
 
 // TransformUp implements the Expression interface.
-func (f IsTag) TransformUp(fn func(sql.Expression) sql.Expression) sql.Expression {
-	return NewIsTag(fn(f.Child))
+func (f IsTag) TransformUp(fn func(sql.Expression) (sql.Expression, error)) (sql.Expression, error) {
+	child, err := f.Child.TransformUp(fn)
+	if err != nil {
+		return nil, err
+	}
+	return fn(NewIsTag(child))
 }
 
 // Type implements the Expression interface.
diff --git a/internal/function/is_tag_test.go b/internal/function/is_tag_test.go
@@ -1,6 +1,7 @@
 package function
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -27,7 +28,7 @@ func TestIsTag(t *testing.T) {
 	for _, tt := range testCases {
 		t.Run(tt.name, func(t *testing.T) {
 			require := require.New(t)
-			val, err := f.Eval(tt.row)
+			val, err := f.Eval(sql.NewBaseSession(context.TODO()), tt.row)
 			if tt.err {
 				require.Error(err)
 				require.True(sql.ErrInvalidType.Is(err))
diff --git a/references.go b/references.go
@@ -31,15 +31,15 @@ func (referencesTable) Schema() sql.Schema {
 	}
 }
 
-func (r *referencesTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {
+func (r *referencesTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {
 	return f(r)
 }
 
-func (r *referencesTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
-	return r
+func (r *referencesTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {
+	return r, nil
 }
 
-func (r referencesTable) RowIter() (sql.RowIter, error) {
+func (r referencesTable) RowIter(_ sql.Session) (sql.RowIter, error) {
 	iter := &referenceIter{}
 
 	repoIter, err := NewRowRepoIter(r.pool, iter)
diff --git a/references_test.go b/references_test.go
@@ -1,6 +1,7 @@
 package gitquery
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -33,7 +34,7 @@ func TestReferencesTable_RowIter(t *testing.T) {
 	f := fixtures.Basic().One()
 	table := getTable(require, f, referencesTableName)
 
-	rows, err := sql.NodeToRows(plan.NewSort(
+	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), plan.NewSort(
 		[]plan.SortField{{Column: expression.NewGetField(0, sql.Text, "name", false), Order: plan.Ascending}},
 		table))
 	require.Nil(err)
diff --git a/remotes.go b/remotes.go
@@ -35,15 +35,15 @@ func (remotesTable) Schema() sql.Schema {
 	}
 }
 
-func (r *remotesTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {
+func (r *remotesTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {
 	return f(r)
 }
 
-func (r *remotesTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
-	return r
+func (r *remotesTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {
+	return r, nil
 }
 
-func (r remotesTable) RowIter() (sql.RowIter, error) {
+func (r remotesTable) RowIter(_ sql.Session) (sql.RowIter, error) {
 	iter := &remotesIter{}
 
 	rowRepoIter, err := NewRowRepoIter(r.pool, iter)
diff --git a/remotes_test.go b/remotes_test.go
@@ -1,6 +1,7 @@
 package gitquery
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -54,7 +55,7 @@ func TestRemotesTable_RowIter(t *testing.T) {
 	_, err := repo.CreateRemote(&config)
 	require.Nil(err)
 
-	rows, err := sql.NodeToRows(table)
+	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), table)
 	require.Nil(err)
 	require.Len(rows, 3)
 
diff --git a/repositories.go b/repositories.go
@@ -28,17 +28,15 @@ func (repositoriesTable) Schema() sql.Schema {
 	}
 }
 
-func (r *repositoriesTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {
+func (r *repositoriesTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {
 	return f(r)
 }
 
-func (r *repositoriesTable) TransformExpressionsUp(
-	f func(sql.Expression) sql.Expression) sql.Node {
-
-	return r
+func (r *repositoriesTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {
+	return r, nil
 }
 
-func (r repositoriesTable) RowIter() (sql.RowIter, error) {
+func (r repositoriesTable) RowIter(_ sql.Session) (sql.RowIter, error) {
 	iter := &repositoriesIter{}
 
 	rowRepoIter, err := NewRowRepoIter(r.pool, iter)
diff --git a/repositories_test.go b/repositories_test.go
@@ -1,6 +1,7 @@
 package gitquery
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -47,7 +48,7 @@ func TestRepositoriesTable_RowIter(t *testing.T) {
 	require.True(ok)
 	require.NotNil(table)
 
-	rows, err := sql.NodeToRows(table)
+	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), table)
 	require.Nil(err)
 	require.Len(rows, len(repoIDs))
 
diff --git a/session.go b/session.go
@@ -0,0 +1,30 @@
+package gitquery
+
+import (
+	"context"
+
+	"gopkg.in/src-d/go-mysql-server.v0/server"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"gopkg.in/src-d/go-vitess.v0/mysql"
+)
+
+// Session is the custom implementation of a gitquery session.
+type Session struct {
+	sql.Session
+	Pool *RepositoryPool
+}
+
+// NewSession creates a new Session.
+func NewSession(ctx context.Context, pool *RepositoryPool) *Session {
+	return &Session{
+		Session: sql.NewBaseSession(ctx),
+		Pool:    pool,
+	}
+}
+
+// NewSessionBuilder creates a SessionBuilder with the given Repository Pool.
+func NewSessionBuilder(pool *RepositoryPool) server.SessionBuilder {
+	return func(ctx context.Context, _ *mysql.Conn) sql.Session {
+		return NewSession(ctx, pool)
+	}
+}
diff --git a/tree_entries.go b/tree_entries.go
@@ -34,15 +34,15 @@ func (treeEntriesTable) Schema() sql.Schema {
 	}
 }
 
-func (r *treeEntriesTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {
+func (r *treeEntriesTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {
 	return f(r)
 }
 
-func (r *treeEntriesTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {
-	return r
+func (r *treeEntriesTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {
+	return r, nil
 }
 
-func (r treeEntriesTable) RowIter() (sql.RowIter, error) {
+func (r treeEntriesTable) RowIter(_ sql.Session) (sql.RowIter, error) {
 	iter := &treeEntryIter{}
 
 	repoIter, err := NewRowRepoIter(r.pool, iter)
diff --git a/tree_entries_test.go b/tree_entries_test.go
@@ -1,6 +1,7 @@
 package gitquery
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -31,7 +32,7 @@ func TestTreeEntriesTable_RowIter(t *testing.T) {
 	f := fixtures.Basic().One()
 	table := getTable(require, f, treeEntriesTableName)
 
-	rows, err := sql.NodeToRows(table)
+	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), table)
 	require.Nil(err)
 	require.Len(rows, 49)
 

Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,15 @@ func (blobsTable) Schema() sql.Schema {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`-func (r *blobsTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {`
	`32`	`+func (r *blobsTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {`
`33`	`33`	`return f(r)`
`34`	`34`	`}`
`35`	`35`
`36`		`-func (r *blobsTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {`
`37`		`- return r`
	`36`	`+func (r *blobsTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {`
	`37`	`+ return r, nil`
`38`	`38`	`}`
`39`	`39`
`40`		`-func (r blobsTable) RowIter() (sql.RowIter, error) {`
	`40`	`+func (r blobsTable) RowIter(_ sql.Session) (sql.RowIter, error) {`
`41`	`41`	`iter := &blobIter{}`
`42`	`42`
`43`	`43`	`repoIter, err := NewRowRepoIter(r.pool, iter)`
Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,15 @@ func (commitsTable) Schema() sql.Schema {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-func (r *commitsTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {`
	`38`	`+func (r *commitsTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {`
`39`	`39`	`return f(r)`
`40`	`40`	`}`
`41`	`41`
`42`		`-func (r *commitsTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {`
`43`		`- return r`
	`42`	`+func (r *commitsTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {`
	`43`	`+ return r, nil`
`44`	`44`	`}`
`45`	`45`
`46`		`-func (r commitsTable) RowIter() (sql.RowIter, error) {`
	`46`	`+func (r commitsTable) RowIter(_ sql.Session) (sql.RowIter, error) {`
`47`	`47`	`iter := &commitIter{}`
`48`	`48`
`49`	`49`	`repoIter, err := NewRowRepoIter(r.pool, iter)`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,15 @@ func (referencesTable) Schema() sql.Schema {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`-func (r *referencesTable) TransformUp(f func(sql.Node) sql.Node) sql.Node {`
	`34`	`+func (r *referencesTable) TransformUp(f func(sql.Node) (sql.Node, error)) (sql.Node, error) {`
`35`	`35`	`return f(r)`
`36`	`36`	`}`
`37`	`37`
`38`		`-func (r *referencesTable) TransformExpressionsUp(f func(sql.Expression) sql.Expression) sql.Node {`
`39`		`- return r`
	`38`	`+func (r *referencesTable) TransformExpressionsUp(f func(sql.Expression) (sql.Expression, error)) (sql.Node, error) {`
	`39`	`+ return r, nil`
`40`	`40`	`}`
`41`	`41`
`42`		`-func (r referencesTable) RowIter() (sql.RowIter, error) {`
	`42`	`+func (r referencesTable) RowIter(_ sql.Session) (sql.RowIter, error) {`
`43`	`43`	`iter := &referenceIter{}`
`44`	`44`
`45`	`45`	`repoIter, err := NewRowRepoIter(r.pool, iter)`