cmd: enable parallelism for squash mode as well

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

Author: erizocosmico

cmd/gitbase/command/server.go

@@ -68,7 +68,12 @@ func (l *jaegerLogrus) Error(s string) {
 	l.Entry.Error(s)
 }
 
-func NewDatabaseEngine(readonly bool, version string, parallelism int) *sqle.Engine {
+func NewDatabaseEngine(
+	readonly bool,
+	version string,
+	parallelism int,
+	squash bool,
+) *sqle.Engine {
 	catalog := sql.NewCatalog()
 	ab := analyzer.NewBuilder(catalog)
 	if readonly {
@@ -79,6 +84,10 @@ func NewDatabaseEngine(readonly bool, version string, parallelism int) *sqle.Eng
 		ab = ab.WithParallelism(parallelism)
 	}
 
+	if squash {
+		ab = ab.AddPostAnalyzeRule(rule.SquashJoinsRule, rule.SquashJoins)
+	}
+
 	a := ab.Build()
 	engine := sqle.New(catalog, a, &sqle.Config{
 		VersionPostfix: version,
@@ -162,7 +171,12 @@ func (c *Server) Execute(args []string) error {
 
 func (c *Server) buildDatabase() error {
 	if c.engine == nil {
-		c.engine = NewDatabaseEngine(c.ReadOnly, c.Version, int(c.Parallelism))
+		c.engine = NewDatabaseEngine(
+			c.ReadOnly,
+			c.Version,
+			int(c.Parallelism),
+			!c.DisableSquash,
+		)
 	}
 
 	c.pool = gitbase.NewRepositoryPool()
@@ -183,12 +197,6 @@ func (c *Server) buildDatabase() error {
 
 	if !c.DisableSquash {
 		logrus.Info("squash tables rule is enabled")
-		a := analyzer.NewBuilder(c.engine.Catalog).
-			AddPostAnalyzeRule(rule.SquashJoinsRule, rule.SquashJoins).
-			Build()
-
-		a.CurrentDatabase = c.engine.Analyzer.CurrentDatabase
-		c.engine.Analyzer = a
 	} else {
 		logrus.Warn("squash tables rule is disabled")
 	}

integration_test.go

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