*: changes after rebase

Signed-off-by: Miguel Molina <[email protected]>

Author: erizocosmico

cmd/gitbase/command/server.go

@@ -68,15 +68,15 @@ func (l *jaegerLogrus) Error(s string) {
 	l.Entry.Error(s)
 }
 
-func NewDatabaseEngine(readonly bool, version string) *sqle.Engine {
+func NewDatabaseEngine(readonly bool, version string, parallelism int) *sqle.Engine {
 	catalog := sql.NewCatalog()
 	ab := analyzer.NewBuilder(catalog)
 	if readonly {
 		ab = ab.ReadOnly()
 	}
-	
-	if c.Parallelism > 1 {
-		ab = ab.WithParallelism(int(c.Parallelism))
+
+	if parallelism > 1 {
+		ab = ab.WithParallelism(parallelism)
 	}
 
 	a := ab.Build()
@@ -162,7 +162,7 @@ func (c *Server) Execute(args []string) error {
 
 func (c *Server) buildDatabase() error {
 	if c.engine == nil {
-		c.engine = NewDatabaseEngine(c.ReadOnly, c.Version)
+		c.engine = NewDatabaseEngine(c.ReadOnly, c.Version, int(c.Parallelism))
 	}
 
 	c.pool = gitbase.NewRepositoryPool()

integration_test.go

@@ -852,7 +852,7 @@ func newSquashEngine() *sqle.Engine {
 
 func newBaseEngine() *sqle.Engine {
 	foo := gitbase.NewDatabase("foo")
-	engine := command.NewDatabaseEngine(false, "test")
+	engine := command.NewDatabaseEngine(false, "test", 0)
 
 	engine.AddDatabase(foo)
 	engine.Catalog.RegisterFunctions(function.Functions)

squash_iterator.go

@@ -47,7 +47,6 @@ type squashReposIter struct {
 	repo          *Repository
 	row           sql.Row
 	skipGitErrors bool
-	done          bool
 }
 
 // NewAllReposIter returns an iterator that will return all repositories