Merge pull request #224 from erizocosmico/feature/siva

 gitbase: add support for siva files

Author: erizocosmico

Gopkg.lock

@@ -24,7 +24,8 @@ var enableUnstableSquash = os.Getenv("UNSTABLE_SQUASH_ENABLE") != ""
 type cmdServer struct {
 	Verbose bool `short:"v" description:"Activates the verbose mode"`
 
-	Git      string `short:"g" long:"git" description:"Path where the git repositories are located, one per dir"`
+	Git      string `short:"g" long:"git" description:"Path where the git repositories are located"`
+	Siva     string `long:"siva" description:"Path where the siva repositories are located"`
 	Host     string `short:"h" long:"host" default:"localhost" description:"Host where the server is going to listen"`
 	Port     int    `short:"p" long:"port" default:"3306" description:"Port where the server is going to listen"`
 	User     string `short:"u" long:"user" default:"root" description:"User name used for connection"`
@@ -44,12 +45,12 @@ func (c *cmdServer) buildDatabase() error {
 		logrus.WithField("dir", c.Git).Debug("added folder containing git repositories")
 	}
 
-	var err error
+	c.pool = gitbase.NewRepositoryPool()
+	if err := c.pool.AddDir(c.Git); err != nil {
+		return err
+	}
 
-	pool := gitbase.NewRepositoryPool()
-	c.pool = &pool
-	err = c.pool.AddDir(c.Git)
-	if err != nil {
+	if err := c.pool.AddSivaDir(c.Siva); err != nil {
 		return err
 	}
 

_testdata/05893125684f2d3943cd84a7ab2b75e53668fba1.siva

@@ -30,7 +30,7 @@ func setup(t *testing.T) (ctx *sql.Context, path string, cleanup CleanupFunc) {
 		require.NoError(fixtures.Clean())
 	}
 
-	session := NewSession(&pool)
+	session := NewSession(pool)
 	ctx = sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	return ctx, path, cleanup

_testdata/ff/fff840f8784ef162dc83a1465fc5763d890b68ba.siva

@@ -139,7 +139,7 @@ func TestIntegration(t *testing.T) {
 			t.Run(tt.query, func(t *testing.T) {
 				require := require.New(t)
 
-				session := gitbase.NewSession(&pool)
+				session := gitbase.NewSession(pool)
 				ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 				_, iter, err := engine.Query(ctx, tt.query)
@@ -173,7 +173,7 @@ func TestUastQueries(t *testing.T) {
 	engine.AddDatabase(gitbase.NewDatabase("foo"))
 	engine.Catalog.RegisterFunctions(function.Functions)
 
-	session := gitbase.NewSession(&pool)
+	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 
@@ -249,8 +249,8 @@ func TestSquashCorrectness(t *testing.T) {
 
 	for _, q := range queries {
 		t.Run(q, func(t *testing.T) {
-			expected := queryResults(t, engine, &pool, q)
-			result := queryResults(t, squashEngine, &pool, q)
+			expected := queryResults(t, engine, pool, q)
+			result := queryResults(t, squashEngine, pool, q)
 			require.ElementsMatch(
 				t,
 				expected,
@@ -374,7 +374,7 @@ func benchmarkQuery(b *testing.B, query string) {
 	pool := gitbase.NewRepositoryPool()
 	_, err := pool.AddGit(path)
 	require.NoError(b, err)
-	session := gitbase.NewSession(&pool)
+	session := gitbase.NewSession(pool)
 	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	run := func(b *testing.B) {

_testdata/fff7062de8474d10a67d417ccea87ba6f58ca81d.siva

@@ -27,7 +27,7 @@ func TestCommitHasBlob(t *testing.T) {
 		pool.AddGit(f.Worktree().Root())
 	}
 
-	session := gitbase.NewSession(&pool)
+	session := gitbase.NewSession(pool)
 	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	testCases := []struct {
@@ -72,7 +72,7 @@ func BenchmarkCommitHasBlob(b *testing.B) {
 		pool.AddGit(f.Worktree().Root())
 	}
 
-	session := gitbase.NewSession(&pool)
+	session := gitbase.NewSession(pool)
 	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	rows := []sql.Row{

_testdata/not-siva.txt

@@ -27,7 +27,7 @@ func TestCommitHasTree(t *testing.T) {
 		pool.AddGit(f.Worktree().Root())
 	}
 
-	session := gitbase.NewSession(&pool)
+	session := gitbase.NewSession(pool)
 	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	testCases := []struct {
@@ -73,7 +73,7 @@ func BenchmarkCommitHasTree(b *testing.B) {
 		pool.AddGit(f.Worktree().Root())
 	}
 
-	session := gitbase.NewSession(&pool)
+	session := gitbase.NewSession(pool)
 	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	rows := []sql.Row{