Merge branch 'master' into update-regression

Author: ajnavarro

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "eff16b2a86be40cb6bf6ef35801ab1eb283fd983"
+  revision = "090a17d38c22a28eccf631f400c11704f65bb6ce"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"

Gopkg.toml

@@ -35,11 +35,13 @@ const (
 
 // Server represents the `server` command of gitbase cli tool.
 type Server struct {
-	Verbose       bool     `short:"v" description:"Activates the verbose mode"`
+	engine *sqle.Engine
+	pool   *gitbase.RepositoryPool
+	name   string
+
+	Version       string   // Version of the application.
 	Directories   []string `short:"d" long:"directories" description:"Path where the git repositories are located (standard and siva), multiple directories can be defined. Accepts globs."`
 	Depth         int      `long:"depth" default:"1000" description:"load repositories looking at less than <depth> nested subdirectories."`
-	DisableGit    bool     `long:"no-git" description:"disable the load of git standard repositories."`
-	DisableSiva   bool     `long:"no-siva" description:"disable the load of siva files."`
 	Host          string   `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"`
@@ -49,14 +51,11 @@ type Server struct {
 	DisableSquash bool     `long:"no-squash" description:"Disables the table squashing."`
 	TraceEnabled  bool     `long:"trace" env:"GITBASE_TRACE" description:"Enables jaeger tracing"`
 	ReadOnly      bool     `short:"r" long:"readonly" description:"Only allow read queries. This disables creating and deleting indexes as well." env:"GITBASE_READONLY"`
-	// SkipGitErrors disables failing when Git errors are found.
-	SkipGitErrors bool
-	// Version of the application.
-	Version string
 
-	engine *sqle.Engine
-	pool   *gitbase.RepositoryPool
-	name   string
+	SkipGitErrors bool // SkipGitErrors disables failing when Git errors are found.
+	DisableGit    bool `long:"no-git" description:"disable the load of git standard repositories."`
+	DisableSiva   bool `long:"no-siva" description:"disable the load of siva files."`
+	Verbose       bool `short:"v" description:"Activates the verbose mode"`
 }
 
 type jaegerLogrus struct {

cmd/gitbase/command/server.go

@@ -65,11 +65,8 @@ Help Options:
   -h, --help             Show this help message
 
 [server command options]
-      -v                 Activates the verbose mode
       -d, --directories= Path where the git repositories are located (standard and siva), multiple directories can be defined. Accepts globs.
           --depth=       load repositories looking at less than <depth> nested subdirectories. (default: 1000)
-          --no-git       disable the load of git standard repositories.
-          --no-siva      disable the load of siva files.
           --host=        Host where the server is going to listen (default: localhost)
       -p, --port=        Port where the server is going to listen (default: 3306)
       -u, --user=        User name used for connection (default: root)
@@ -79,5 +76,8 @@ Help Options:
           --no-squash    Disables the table squashing.
           --trace        Enables jaeger tracing [$GITBASE_TRACE]
       -r, --readonly     Only allow read queries. This disables creating and deleting indexes as well. [$GITBASE_READONLY]
+          --no-git       disable the load of git standard repositories.
+          --no-siva      disable the load of siva files.
+      -v                 Activates the verbose mode
 
 ```

docs/using-gitbase/configuration.md

@@ -14,4 +14,4 @@ To make some common tasks easier for the user, there are some functions to inter
 
 ## Standard functions
 
-You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/eff16b2a86be40cb6bf6ef35801ab1eb283fd983#custom-functions).
+You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/090a17d38c22a28eccf631f400c11704f65bb6ce#custom-functions).

docs/using-gitbase/functions.md

@@ -10,4 +10,4 @@ Note that you can create an index either **on one or more columns** or **on a si
 
 You can find some more examples in the [examples](./examples.md#create-an-index-for-columns-on-a-table) section.
 
-See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/eff16b2a86be40cb6bf6ef35801ab1eb283fd983#indexes) documentation for more details
+See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/090a17d38c22a28eccf631f400c11704f65bb6ce#indexes) documentation for more details

docs/using-gitbase/indexes.md

@@ -1,3 +1,3 @@
 ## Supported syntax
 
-To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/eff16b2a86be40cb6bf6ef35801ab1eb283fd983/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).
+To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/090a17d38c22a28eccf631f400c11704f65bb6ce/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).

docs/using-gitbase/supported-syntax.md

@@ -773,7 +773,7 @@ func createIndex(
 	t.Helper()
 
 	query := fmt.Sprintf(
-		`CREATE INDEX %s ON %s (%s) WITH (async = false)`,
+		`CREATE INDEX %s ON %s USING pilosa (%s) WITH (async = false)`,
 		data.id, data.table, strings.Join(data.exprs, ", "),
 	)
 

integration_test.go

@@ -43,11 +43,11 @@ type ReposIter interface {
 type squashReposIter struct {
 	ctx           *sql.Context
 	filters       sql.Expression
-	done          bool
 	iter          *RepositoryIter
 	repo          *Repository
 	row           sql.Row
 	skipGitErrors bool
+	done          bool
 }
 
 // NewAllReposIter returns an iterator that will return all repositories
@@ -410,12 +410,12 @@ type squashRefIter struct {
 	ctx           *sql.Context
 	repo          *Repository
 	repos         *RepositoryIter
-	virtual       bool
 	filters       sql.Expression
 	refs          storer.ReferenceIter
 	head          *plumbing.Reference
 	ref           *Ref
 	row           sql.Row
+	virtual       bool
 	skipGitErrors bool
 }
 
@@ -3131,11 +3131,11 @@ type squashCommitFilesIter struct {
 	commits       CommitsIter
 	files         *object.FileIter
 	file          *object.File
-	treeHash      plumbing.Hash
 	commit        *object.Commit
 	row           sql.Row
 	filters       sql.Expression
 	ctx           *sql.Context
+	treeHash      plumbing.Hash
 	skipGitErrors bool
 }
 
@@ -3260,10 +3260,10 @@ type squashIndexCommitFilesIter struct {
 	repo          *Repository
 	iter          *commitFilesIndexIter
 	file          *object.File
-	treeHash      plumbing.Hash
 	row           sql.Row
 	filters       sql.Expression
 	ctx           *sql.Context
+	treeHash      plumbing.Hash
 	skipGitErrors bool
 }