*: fix codebase after go-mysql-server upgrade

erizocosmico · erizocosmico · commit edca94453021 · 2018-04-10T12:27:43.000+02:00
Signed-off-by: Miguel Molina &lt;miguel@erizocosmi.co&gt;
diff --git a/cmd/gitquery/server.go b/cmd/gitquery/server.go
@@ -60,9 +60,11 @@ func (c *CmdServer) Execute(args []string) error {
 
 	hostString := net.JoinHostPort(c.Host, strconv.Itoa(c.Port))
 	s, err := server.NewServer(
-		"tcp",
-		hostString,
-		auth,
+		server.Config{
+			Protocol: "tcp",
+			Address:  hostString,
+			Auth:     auth,
+		},
 		c.engine,
 		gitbase.NewSessionBuilder(c.pool),
 	)
diff --git a/common_test.go b/common_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
 	sqle "gopkg.in/src-d/go-mysql-server.v0"
@@ -31,7 +32,7 @@ func setup(t *testing.T) (ctx *sql.Context, path string, cleanup CleanupFunc) {
 	}
 
 	session := NewSession(&pool)
-	ctx = sql.NewContext(context.TODO(), session)
+	ctx = sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 	return ctx, path, cleanup
 }
diff --git a/integration_test.go b/integration_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/src-d/gitbase/internal/function"
 	"github.com/stretchr/testify/require"
@@ -137,7 +138,7 @@ func TestIntegration(t *testing.T) {
 			require := require.New(t)
 
 			session := gitbase.NewSession(&pool)
-			ctx := sql.NewContext(context.TODO(), session)
+			ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 			_, iter, err := engine.Query(ctx, tt.query)
 			require.NoError(err)
diff --git a/internal/function/commit_has_blob_test.go b/internal/function/commit_has_blob_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/stretchr/testify/require"
 	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
@@ -28,7 +29,7 @@ func TestCommitHasBlob(t *testing.T) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session)
+	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 	testCases := []struct {
 		name     string
@@ -73,7 +74,7 @@ func BenchmarkCommitHasBlob(b *testing.B) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session)
+	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 	rows := []sql.Row{
 		// blob is not on commit
diff --git a/internal/function/commit_has_tree_test.go b/internal/function/commit_has_tree_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/stretchr/testify/require"
 	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
@@ -28,7 +29,7 @@ func TestCommitHasTree(t *testing.T) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session)
+	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 	testCases := []struct {
 		name     string
@@ -74,7 +75,7 @@ func BenchmarkCommitHasTree(b *testing.B) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session)
+	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 	rows := []sql.Row{
 		// tree is not on commit
diff --git a/internal/function/history_idx_test.go b/internal/function/history_idx_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/stretchr/testify/require"
 	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
@@ -28,7 +29,7 @@ func TestHistoryIdx(t *testing.T) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session)
+	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 	testCases := []struct {
 		name     string
@@ -81,7 +82,7 @@ func BenchmarkHistoryIdx(b *testing.B) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session)
+	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 	cases := []struct {
 		row sql.Row
diff --git a/internal/function/is_remote_test.go b/internal/function/is_remote_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
@@ -30,7 +31,7 @@ func TestIsRemote(t *testing.T) {
 			require := require.New(t)
 
 			session := sql.NewBaseSession()
-			ctx := sql.NewContext(context.TODO(), session)
+			ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 			val, err := f.Eval(ctx, tt.row)
 			if tt.err {
diff --git a/internal/function/is_tag_test.go b/internal/function/is_tag_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
@@ -30,7 +31,7 @@ func TestIsTag(t *testing.T) {
 			require := require.New(t)
 
 			session := sql.NewBaseSession()
-			ctx := sql.NewContext(context.TODO(), session)
+			ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 			val, err := f.Eval(ctx, tt.row)
 			if tt.err {
diff --git a/repositories_test.go b/repositories_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
@@ -43,7 +44,7 @@ func TestRepositoriesTable_RowIter(t *testing.T) {
 	}
 
 	session := NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session)
+	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 
 	db := NewDatabase(repositoriesTableName)
 	require.NotNil(db)
diff --git a/repository_pool_test.go b/repository_pool_test.go
@@ -10,6 +10,7 @@ import (
 	"sync"
 	"testing"
 
+	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-git-fixtures.v3"
 	"gopkg.in/src-d/go-git.v4"
@@ -188,7 +189,7 @@ func TestRepositoryRowIterator(t *testing.T) {
 
 	pool := NewRepositoryPool()
 	session := NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session)
+	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
 	max := 64
 
 	for i := 0; i < max; i++ {
diff --git a/session.go b/session.go
@@ -31,6 +31,6 @@ func NewSessionBuilder(pool *RepositoryPool) server.SessionBuilder {
 // ErrSessionCanceled is returned when session context is canceled
 var ErrSessionCanceled = errors.NewKind("session canceled")
 
-// ErrInvalidGitbaseSession is returned when some node expected a GitQuery
+// ErrInvalidGitbaseSession is returned when some node expected a gitbase
 // session but received something else.
 var ErrInvalidGitbaseSession = errors.NewKind("expecting gitbase session, but received: %T")

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"testing"`
`6`	`6`
	`7`	`+ opentracing "github.com/opentracing/opentracing-go"`
`7`	`8`	`"github.com/stretchr/testify/require"`
`8`	`9`	`fixtures "gopkg.in/src-d/go-git-fixtures.v3"`
`9`	`10`	`sqle "gopkg.in/src-d/go-mysql-server.v0"`
`@@ -31,7 +32,7 @@ func setup(t testing.T) (ctx sql.Context, path string, cleanup CleanupFunc) {`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`session := NewSession(&pool)`
`34`		`- ctx = sql.NewContext(context.TODO(), session)`
	`35`	`+ ctx = sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})`
`35`	`36`
`36`	`37`	`return ctx, path, cleanup`
`37`	`38`	`}`