New nodes

.travis.yml

@@ -25,7 +25,6 @@ before_script:
   - docker run -d --name bblfshd --privileged -p 9432:9432 bblfsh/bblfshd:v2.14.0-drivers
   - docker exec -it bblfshd bblfshctl driver list
   - go get -v github.com/go-sql-driver/mysql/...
-  - go get gopkg.in/src-d/go-git-fixtures.v3/...
 
 script:
   - make test-coverage codecov

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Varchar type.
 - FIRST and LAST aggregations.
+- Count distinct aggregation.
 
 ### Changed
 
@@ -18,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Switch some types of known or maximum length (mostly hashes and emails)
   to VarChar with a size.
 - Traces now have a root span.
+- New API for node transformations.
 
 ### Fixed
 

docs/using-gitbase/supported-syntax.md

@@ -18,7 +18,7 @@
 
 ## Grouping expressions
 - AVG
-- COUNT
+- COUNT and COUNT(DISTINCT)
 - MAX
 - MIN
 - SUM (always returns DOUBLE)

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/src-d/go-borges v0.0.0-20190628121335-da12a84d60fd
 	github.com/src-d/go-git v4.7.0+incompatible
 	github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible
-	github.com/src-d/go-mysql-server v0.4.1-0.20190704102044-bbae51955887
+	github.com/src-d/go-mysql-server v0.4.1-0.20190708083625-b61703ad45cc
 	github.com/stretchr/testify v1.3.0
 	github.com/uber-go/atomic v1.4.0 // indirect
 	github.com/uber/jaeger-client-go v2.16.0+incompatible
@@ -33,7 +33,6 @@ require (
 	gopkg.in/src-d/go-billy-siva.v4 v4.5.1
 	gopkg.in/src-d/go-billy.v4 v4.3.0
 	gopkg.in/src-d/go-errors.v1 v1.0.0
-	gopkg.in/src-d/go-git-fixtures.v3 v3.5.0
 	gopkg.in/src-d/go-git.v4 v4.12.0
 	gopkg.in/yaml.v2 v2.2.2
 	vitess.io/vitess v3.0.0-rc.3.0.20190602171040-12bfde34629c+incompatible

go.sum

@@ -238,8 +238,8 @@ github.com/src-d/go-git v4.7.0+incompatible h1:IYSSnbAHeKmsfbQFi9ozbid+KNh0bKjlo
 github.com/src-d/go-git v4.7.0+incompatible/go.mod h1:1bQciz+hn0jzPQNsYj0hDFZHLJBdV7gXE2mWhC7EkFk=
 github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible h1:A5bKevhs9C//Nh8QV0J+1KphEaIa25cDe1DTs/yPxDI=
 github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible/go.mod h1:XcIQp7L+k0pgfTqfbaTKj3kxlBv8kYOKZ/tKNXbZFLg=
-github.com/src-d/go-mysql-server v0.4.1-0.20190704102044-bbae51955887 h1:yGeW4Zia4x5TYP/xPb2rKknO0qoAVZn9IWfw0AbmaPM=
-github.com/src-d/go-mysql-server v0.4.1-0.20190704102044-bbae51955887/go.mod h1:GO8SmBnN9LcKSXy6DYuBbqKtJvrRnHsBrlXvlVOX+NM=
+github.com/src-d/go-mysql-server v0.4.1-0.20190708083625-b61703ad45cc h1:Rgz2etoEnslCgMKCfwpKd0hBFrZVxpV33QAXjadVi0o=
+github.com/src-d/go-mysql-server v0.4.1-0.20190708083625-b61703ad45cc/go.mod h1:GO8SmBnN9LcKSXy6DYuBbqKtJvrRnHsBrlXvlVOX+NM=
 github.com/src-d/go-oniguruma v1.0.0/go.mod h1:chVbff8kcVtmrhxtZ3yBVLLquXbzCS6DrxQaAK/CeqM=
 github.com/src-d/go-oniguruma v1.1.0 h1:EG+Nm5n2JqWUaCjtM0NtutPxU7ZN5Tp50GWrrV8bTww=
 github.com/src-d/go-oniguruma v1.1.0/go.mod h1:chVbff8kcVtmrhxtZ3yBVLLquXbzCS6DrxQaAK/CeqM=

internal/commitstats/commit_test.go

@@ -3,9 +3,9 @@ package commitstats
 import (
 	"testing"
 
+	fixtures "github.com/src-d/go-git-fixtures"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/cache"
@@ -14,12 +14,8 @@ import (
 )
 
 func TestCalculate(t *testing.T) {
-	err := fixtures.Init()
-	require.NoError(t, err)
-
 	defer func() {
-		err := fixtures.Clean()
-		require.NoError(t, err)
+		require.NoError(t, fixtures.Clean())
 	}()
 
 	tests := map[string]struct {

internal/commitstats/file_test.go

@@ -3,9 +3,9 @@ package commitstats
 import (
 	"testing"
 
+	fixtures "github.com/src-d/go-git-fixtures"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/cache"
@@ -15,13 +15,8 @@ import (
 
 func TestNewFileStats(t *testing.T) {
 	require := require.New(t)
-
-	err := fixtures.Init()
-	require.NoError(err)
-
 	defer func() {
-		err := fixtures.Clean()
-		require.NoError(err)
+		require.NoError(fixtures.Clean())
 	}()
 
 	f := fixtures.Basic().One()
@@ -42,12 +37,8 @@ func TestNewFileStats(t *testing.T) {
 }
 
 func TestCalculateByFile(t *testing.T) {
-	err := fixtures.Init()
-	require.NoError(t, err)
-
 	defer func() {
-		err := fixtures.Clean()
-		require.NoError(t, err)
+		require.NoError(t, fixtures.Clean())
 	}()
 
 	tests := map[string]struct {

internal/function/commit_file_stats.go

@@ -46,28 +46,27 @@ func (CommitFileStats) Type() sql.Type {
 	return sql.Array(sql.JSON)
 }
 
-// TransformUp implements the Expression interface.
-func (f *CommitFileStats) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
-	repo, err := f.Repository.TransformUp(fn)
-	if err != nil {
-		return nil, err
+// WithChildren implements the Expression interface.
+func (f *CommitFileStats) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	expected := 2
+	if f.From != nil {
+		expected = 3
 	}
 
-	to, err := f.To.TransformUp(fn)
-	if err != nil {
-		return nil, err
+	if len(children) != expected {
+		return nil, sql.ErrInvalidChildrenNumber.New(f, len(children), expected)
 	}
 
-	if f.From == nil {
-		return fn(&CommitFileStats{Repository: repo, To: to})
-	}
-
-	from, err := f.From.TransformUp(fn)
-	if err != nil {
-		return nil, err
+	repo := children[0]
+	var from, to sql.Expression
+	if f.From != nil {
+		from = children[1]
+		to = children[2]
+	} else {
+		to = children[1]
 	}
 
-	return fn(&CommitFileStats{Repository: repo, From: from, To: to})
+	return &CommitStats{repo, from, to}, nil
 }
 
 // Children implements the Expression interface.

internal/function/commit_stats.go

@@ -49,28 +49,27 @@ func (CommitStats) Type() sql.Type {
 	return sql.JSON
 }
 
-// TransformUp implements the Expression interface.
-func (f *CommitStats) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
-	repo, err := f.Repository.TransformUp(fn)
-	if err != nil {
-		return nil, err
+// WithChildren implements the Expression interface.
+func (f *CommitStats) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	expected := 2
+	if f.From != nil {
+		expected = 3
 	}
 
-	to, err := f.To.TransformUp(fn)
-	if err != nil {
-		return nil, err
+	if len(children) != expected {
+		return nil, sql.ErrInvalidChildrenNumber.New(f, len(children), expected)
 	}
 
-	if f.From == nil {
-		return fn(&CommitStats{Repository: repo, To: to})
-	}
-
-	from, err := f.From.TransformUp(fn)
-	if err != nil {
-		return nil, err
+	repo := children[0]
+	var from, to sql.Expression
+	if f.From != nil {
+		from = children[1]
+		to = children[2]
+	} else {
+		to = children[1]
 	}
 
-	return fn(&CommitStats{Repository: repo, From: from, To: to})
+	return &CommitStats{repo, from, to}, nil
 }
 
 // Children implements the Expression interface.

internal/function/commit_stats_test.go

@@ -11,10 +11,10 @@ import (
 	"github.com/src-d/go-borges/plain"
 	"github.com/stretchr/testify/require"
 
+	fixtures "github.com/src-d/go-git-fixtures"
 	"github.com/src-d/go-mysql-server/sql"
 	"github.com/src-d/go-mysql-server/sql/expression"
 	"gopkg.in/src-d/go-billy.v4/osfs"
-	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
 	"gopkg.in/src-d/go-git.v4/plumbing/cache"
 )
 
@@ -86,7 +86,6 @@ func TestCommitStatsEval(t *testing.T) {
 
 func setupPool(t *testing.T) (*gitbase.RepositoryPool, func()) {
 	t.Helper()
-	require.NoError(t, fixtures.Init())
 
 	path := fixtures.ByTag("worktree").One().Worktree().Root()
 	pathLib := path + "-lib"

internal/function/is_remote.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
-	"gopkg.in/src-d/go-git.v4/plumbing"
 	"github.com/src-d/go-mysql-server/sql"
 	"github.com/src-d/go-mysql-server/sql/expression"
+	"gopkg.in/src-d/go-git.v4/plumbing"
 )
 
 // IsRemote checks the given string is a remote reference.
@@ -45,13 +45,12 @@ func (f IsRemote) String() string {
 	return fmt.Sprintf("is_remote(%s)", f.Child)
 }
 
-// TransformUp implements the Expression interface.
-func (f IsRemote) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
-	child, err := f.Child.TransformUp(fn)
-	if err != nil {
-		return nil, err
+// WithChildren implements the Expression interface.
+func (f IsRemote) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	if len(children) != 1 {
+		return nil, sql.ErrInvalidChildrenNumber.New(f, len(children), 1)
 	}
-	return fn(NewIsRemote(child))
+	return NewIsRemote(children[0]), nil
 }
 
 // Type implements the Expression interface.

internal/function/is_tag.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
-	"gopkg.in/src-d/go-git.v4/plumbing"
 	"github.com/src-d/go-mysql-server/sql"
 	"github.com/src-d/go-mysql-server/sql/expression"
+	"gopkg.in/src-d/go-git.v4/plumbing"
 )
 
 // IsTag checks the given string is a tag name.
@@ -45,13 +45,12 @@ func (f IsTag) String() string {
 	return fmt.Sprintf("is_tag(%s)", f.Child)
 }
 
-// TransformUp implements the Expression interface.
-func (f IsTag) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
-	child, err := f.Child.TransformUp(fn)
-	if err != nil {
-		return nil, err
+// WithChildren implements the Expression interface.
+func (f IsTag) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	if len(children) != 1 {
+		return nil, sql.ErrInvalidChildrenNumber.New(f, len(children), 1)
 	}
-	return fn(NewIsTag(child))
+	return NewIsTag(children[0]), nil
 }
 
 // Type implements the Expression interface.

internal/function/is_vendor.go

@@ -47,12 +47,10 @@ func (v *IsVendor) String() string {
 	return fmt.Sprintf("IS_VENDOR(%s)", v.Child)
 }
 
-// TransformUp implements the sql.Expression interface.
-func (v *IsVendor) TransformUp(f sql.TransformExprFunc) (sql.Expression, error) {
-	child, err := v.Child.TransformUp(f)
-	if err != nil {
-		return nil, err
+// WithChildren implements the Expression interface.
+func (v IsVendor) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	if len(children) != 1 {
+		return nil, sql.ErrInvalidChildrenNumber.New(v, len(children), 1)
 	}
-
-	return f(NewIsVendor(child))
+	return NewIsVendor(children[0]), nil
 }

internal/function/language.go

@@ -82,22 +82,18 @@ func (Language) Type() sql.Type {
 	return sql.Text
 }
 
-// TransformUp implements the Expression interface.
-func (f *Language) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
-	left, err := f.Left.TransformUp(fn)
-	if err != nil {
-		return nil, err
+// WithChildren implements the Expression interface.
+func (f *Language) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	expected := 1
+	if f.Right != nil {
+		expected = 2
 	}
 
-	var right sql.Expression
-	if f.Right != nil {
-		right, err = f.Right.TransformUp(fn)
-		if err != nil {
-			return nil, err
-		}
+	if len(children) != expected {
+		return nil, sql.ErrInvalidChildrenNumber.New(f, len(children), expected)
 	}
 
-	return fn(&Language{left, right})
+	return NewLanguage(children...)
 }
 
 // Eval implements the Expression interface.

internal/function/loc.go

@@ -47,19 +47,9 @@ func (LOC) Type() sql.Type {
 	return sql.JSON
 }
 
-// TransformUp implements the Expression interface.
-func (f *LOC) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
-	left, err := f.Left.TransformUp(fn)
-	if err != nil {
-		return nil, err
-	}
-
-	right, err := f.Right.TransformUp(fn)
-	if err != nil {
-		return nil, err
-	}
-
-	return fn(&LOC{left, right})
+// WithChildren implements the Expression interface.
+func (f *LOC) WithChildren(children ...sql.Expression) (sql.Expression, error) {
+	return NewLOC(children...)
 }
 
 // Eval implements the Expression interface.