Merge pull request #195 from erizocosmico/feature/uast-udf

 internal/function: implement uast and uast_xpath functions

Author: erizocosmico

.travis.yml

@@ -1,18 +1,40 @@
 language: go
+sudo: required
 
 go:
   - 1.9
   - tip
 
+services:
+  - docker
+
 go_import_path: github.com/src-d/gitbase
 
 matrix:
   fast_finish: true
   allow_failures:
     - go: tip
 
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-6
+    - g++-6
+
 install:
+  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90
+  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 90
+  - cd ./vendor/gopkg.in/bblfsh/client-go.v2
   - make dependencies
+  - cd ./../../../..
+  - make dependencies
+
+before_script:
+  - docker run -d --name bblfshd --privileged -p 9432:9432 -v /var/lib/bblfshd:/var/lib/bblfshd bblfsh/bblfshd
+  - docker exec -it bblfshd bblfshctl driver install python bblfsh/python-driver
+  - docker exec -it bblfshd bblfshctl driver install php bblfsh/php-driver
 
 script:
   - make test-coverage codecov

Gopkg.lock

@@ -45,3 +45,7 @@
 [[constraint]]
   name = "gopkg.in/src-d/enry.v1"
   version = "1.6.3"
+
+[[constraint]]
+  name = "gopkg.in/bblfsh/client-go.v2"
+  version = "2.4.1"

Gopkg.toml

@@ -25,3 +25,11 @@ func getBoolEnv(key string, defaultValue bool) bool {
 
 	return defaultValue
 }
+
+func getStringEnv(key string, defaultValue string) string {
+	v, ok := os.LookupEnv(key)
+	if !ok {
+		return defaultValue
+	}
+	return v
+}

env.go

@@ -157,6 +157,38 @@ func TestIntegration(t *testing.T) {
 	t.Run("with squash", runTests)
 }
 
+func TestUastQueries(t *testing.T) {
+	require := require.New(t)
+	engine := sqle.New()
+	require.NoError(fixtures.Init())
+	defer func() {
+		require.NoError(fixtures.Clean())
+	}()
+
+	pool := gitbase.NewRepositoryPool()
+	for _, f := range fixtures.ByTag("worktree") {
+		pool.AddGit(f.Worktree().Root())
+	}
+
+	engine.AddDatabase(gitbase.NewDatabase("foo"))
+	engine.Catalog.RegisterFunctions(function.Functions)
+
+	session := gitbase.NewSession(&pool)
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
+	_, iter, err := engine.Query(ctx, `
+		SELECT uast_xpath(uast(content, 'php'), '//*[@roleIdentifier]') as uast, name 
+		FROM tree_entries te
+		INNER JOIN blobs b
+		ON b.hash = te.entry_hash
+		WHERE te.name = 'php/crappy.php'`,
+	)
+	require.NoError(err)
+
+	rows, err := sql.RowIterToRows(iter)
+	require.NoError(err)
+	require.Len(rows, 3)
+}
+
 func BenchmarkQueries(b *testing.B) {
 	queries := []struct {
 		name  string

integration_test.go

@@ -2,11 +2,14 @@ package function
 
 import "gopkg.in/src-d/go-mysql-server.v0/sql"
 
+// Functions for gitbase queries.
 var Functions = sql.Functions{
 	"is_tag":          sql.Function1(NewIsTag),
 	"is_remote":       sql.Function1(NewIsRemote),
 	"commit_has_blob": sql.Function2(NewCommitHasBlob),
 	"history_idx":     sql.Function2(NewHistoryIdx),
 	"commit_has_tree": sql.Function2(NewCommitHasTree),
 	"language":        sql.FunctionN(NewLanguage),
+	"uast":            sql.FunctionN(NewUAST),
+	"uast_xpath":      sql.Function2(NewUASTXPath),
 }