Merge branch 'master' into testcov/889

Author: ajnavarro

CHANGELOG.md

@@ -6,6 +6,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Errors now report the repository causing the error, if possible.
+- Now non rooted siva files support old siva rooted repositories.
+
+## [0.22.0] - 2019-07-03
+
+### Added
+
+- Now gitbase uses [go-borges](https://github.com/src-d/go-borges) to access repositories
+  - The type of files in each directory has to be specified ([#867](https://github.com/src-d/gitbase/pull/867))
+  - Supports new rooted repository format and separates references and objects from each repo (https://github.com/src-d/borges/issues/389)
+
+### Changed
+
+- Changed cli to be able to specify different formats ([#866](https://github.com/src-d/gitbase/issues/866))
+
+### Fixed
+
+- function: correctly transform up explode nodes ([#757](https://github.com/src-d/go-mysql-server/pull/757))
+- git libraries bare or non bare format is automatically detected ([#897](https://github.com/src-d/gitbase/pull/897))
+- Fix bug that created multiple object cache with incorrect size ([#898](https://github.com/src-d/gitbase/pull/898))
+- sql/expression: handle null values in arithmetic expressions ([#760](https://github.com/src-d/go-mysql-server/pull/760))
+- Panic on query using EXPLODE ([#755](https://github.com/src-d/go-mysql-server/issues/755))
+- Fixed error iterating over non ready repositories ([src-d/go-borges#54](https://github.com/src-d/go-borges/pull/54))
+- Error saying value could not be converted to bool.
+- function: make array_length not fail with literal null ([#767](https://github.com/src-d/go-mysql-server/pull/767))
+- server: kill queries on connection closed (([#769](https://github.com/src-d/go-mysql-server/pull/769)))
+
 ## [0.22.0-rc2] - 2019-06-24
 
 ### Fixed

README.md

@@ -2,9 +2,9 @@
 
 **gitbase**, is a SQL database interface to Git repositories.
 
-This project is now part of [source{d} Engine](https://sourced.tech/engine),
+This project is now part of [source{d} Community Edition](https://sourced.tech/products/community-edition/),
 which provides the simplest way to get started with a single command.
-Visit [sourced.tech/engine](https://sourced.tech/engine) for more information.
+Visit [https://docs.sourced.tech/community-edition](https://docs.sourced.tech/community-edition) for more information.
 
 It can be used to perform SQL queries about the Git history and
 about the [Universal AST](https://doc.bblf.sh/) of the code itself. gitbase is being built to work on top of any number of git repositories.

blobs.go

@@ -143,10 +143,10 @@ func (r *blobsTable) PartitionRows(
 
 	if err != nil {
 		span.Finish()
-		return nil, err
+		return nil, errorWithRepo(repo, err)
 	}
 
-	return sql.NewSpanIter(span, iter), nil
+	return sql.NewSpanIter(span, newRepoRowIter(repo, iter)), nil
 }
 
 func (blobsTable) HandledFilters(filters []sql.Expression) []sql.Expression {

cmd/gitbase/command/server.go

@@ -20,6 +20,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/src-d/go-borges"
 	"github.com/src-d/go-borges/libraries"
+	"github.com/src-d/go-borges/oldsiva"
 	"github.com/src-d/go-borges/plain"
 	"github.com/src-d/go-borges/siva"
 	sqle "github.com/src-d/go-mysql-server"
@@ -227,7 +228,7 @@ func (c *Server) buildDatabase() error {
 
 	c.sharedCache = cache.NewObjectLRU(c.CacheSize * cache.MiByte)
 
-	c.rootLibrary = libraries.New(libraries.Options{})
+	c.rootLibrary = libraries.New(nil)
 	c.pool = gitbase.NewRepositoryPool(c.sharedCache, c.rootLibrary)
 
 	if err := c.addDirectories(); err != nil {
@@ -318,18 +319,34 @@ func (c *Server) addDirectories() error {
 
 func (c *Server) addDirectory(d directory) error {
 	if d.Format == "siva" {
-		sivaOpts := siva.LibraryOptions{
-			Transactional: true,
-			RootedRepo:    d.Rooted,
-			Cache:         c.sharedCache,
-			Bucket:        d.Bucket,
-			Performance:   true,
-			RegistryCache: 100000,
-		}
+		var lib borges.Library
+		var err error
+
+		if d.Rooted {
+			sivaOpts := &siva.LibraryOptions{
+				Transactional: true,
+				RootedRepo:    d.Rooted,
+				Cache:         c.sharedCache,
+				Bucket:        d.Bucket,
+				Performance:   true,
+				RegistryCache: 100000,
+			}
 
-		lib, err := siva.NewLibrary(d.Path, osfs.New(d.Path), sivaOpts)
-		if err != nil {
-			return err
+			lib, err = siva.NewLibrary(d.Path, osfs.New(d.Path), sivaOpts)
+			if err != nil {
+				return err
+			}
+		} else {
+			sivaOpts := &oldsiva.LibraryOptions{
+				Cache:         c.sharedCache,
+				Bucket:        d.Bucket,
+				RegistryCache: 100000,
+			}
+
+			lib, err = oldsiva.NewLibrary(d.Path, osfs.New(d.Path), sivaOpts)
+			if err != nil {
+				return err
+			}
 		}
 
 		err = c.rootLibrary.Add(lib)

commit_blobs.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"io"
 
+	"github.com/src-d/go-mysql-server/sql"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
-	"github.com/src-d/go-mysql-server/sql"
 )
 
 type commitBlobsTable struct {
@@ -113,10 +113,10 @@ func (t *commitBlobsTable) PartitionRows(
 
 	if err != nil {
 		span.Finish()
-		return nil, err
+		return nil, errorWithRepo(repo, err)
 	}
 
-	return sql.NewSpanIter(span, iter), nil
+	return sql.NewSpanIter(span, newRepoRowIter(repo, iter)), nil
 }
 
 func (commitBlobsTable) HandledFilters(filters []sql.Expression) []sql.Expression {

commit_files.go

@@ -5,13 +5,13 @@ import (
 	"io"
 
 	"github.com/sirupsen/logrus"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 	git "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/filemode"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
-	"github.com/src-d/go-mysql-server/sql"
-	"github.com/src-d/go-mysql-server/sql/expression"
-	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 type commitFilesTable struct {
@@ -125,10 +125,10 @@ func (t *commitFilesTable) PartitionRows(
 
 	if err != nil {
 		span.Finish()
-		return nil, err
+		return nil, errorWithRepo(repo, err)
 	}
 
-	return sql.NewSpanIter(span, iter), nil
+	return sql.NewSpanIter(span, newRepoRowIter(repo, iter)), nil
 }
 
 func (commitFilesTable) HandledFilters(filters []sql.Expression) []sql.Expression {

commit_trees.go

@@ -6,9 +6,9 @@ import (
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
 
+	"github.com/src-d/go-mysql-server/sql"
 	"gopkg.in/src-d/go-git.v4/plumbing/filemode"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
-	"github.com/src-d/go-mysql-server/sql"
 )
 
 type commitTreesTable struct {
@@ -106,10 +106,10 @@ func (t *commitTreesTable) PartitionRows(
 
 	if err != nil {
 		span.Finish()
-		return nil, err
+		return nil, errorWithRepo(repo, err)
 	}
 
-	return sql.NewSpanIter(span, iter), nil
+	return sql.NewSpanIter(span, newRepoRowIter(repo, iter)), nil
 }
 
 // IndexKeyValues implements the sql.IndexableTable interface.

commits.go

@@ -133,10 +133,10 @@ func (r *commitsTable) PartitionRows(
 
 	if err != nil {
 		span.Finish()
-		return nil, err
+		return nil, errorWithRepo(repo, err)
 	}
 
-	return sql.NewSpanIter(span, iter), nil
+	return sql.NewSpanIter(span, newRepoRowIter(repo, iter)), nil
 }
 
 func (commitsTable) HandledFilters(filters []sql.Expression) []sql.Expression {

common_test.go

@@ -314,14 +314,14 @@ func newMultiLibrary() (*multiLibrary, error) {
 	plainLib.AddLocation(plainLoc)
 
 	sivaFS := memfs.New()
-	sivaLib, err := siva.NewLibrary("siva", sivaFS, siva.LibraryOptions{
+	sivaLib, err := siva.NewLibrary("siva", sivaFS, &siva.LibraryOptions{
 		RootedRepo: true,
 	})
 	if err != nil {
 		return nil, err
 	}
 
-	libs := libraries.New(libraries.Options{})
+	libs := libraries.New(nil)
 
 	err = libs.Add(plainLib)
 	if err != nil {

database_test.go

@@ -14,7 +14,7 @@ const testDBName = "foo"
 func TestDatabase_Tables(t *testing.T) {
 	require := require.New(t)
 
-	lib := libraries.New(libraries.Options{})
+	lib := libraries.New(nil)
 	db := getDB(t, testDBName, NewRepositoryPool(nil, lib))
 
 	tables := db.Tables()
@@ -45,7 +45,7 @@ func TestDatabase_Tables(t *testing.T) {
 func TestDatabase_Name(t *testing.T) {
 	require := require.New(t)
 
-	lib := libraries.New(libraries.Options{})
+	lib := libraries.New(nil)
 	db := getDB(t, testDBName, NewRepositoryPool(nil, lib))
 	require.Equal(testDBName, db.Name())
 }