branch qualified analyze fix

go/libraries/doltcore/sqle/enginetest/dolt_harness.go

@@ -254,7 +254,7 @@ func (d *DoltHarness) NewEngine(t *testing.T) (enginetest.QueryEngine, error) {
 		bThreads := sql.NewBackgroundThreads()
 
 		ctxGen := func(ctx context.Context) (*sql.Context, error) {
-			return d.NewSession(), nil
+			return d.NewContextWithClient(sql.Client{Address: "localhost", User: "root"}), nil
 		}
 		statsPro := statspro.NewStatsCoord(doltProvider, ctxGen, sqlCtx.Session.GetLogger().Logger, bThreads, d.multiRepoEnv.GetEnv(d.multiRepoEnv.GetFirstDatabase()))
 		statsPro.SetTimers(int64(1*time.Nanosecond), int64(1*time.Second), int64(1*time.Second))

go/libraries/doltcore/sqle/enginetest/stats_queries.go

@@ -590,7 +590,6 @@ var StatBranchTests = []queries.ScriptTest{
 	{
 		Name: "multi branch stats",
 		SetUpScript: []string{
-			"set @@PERSIST.dolt_stats_branches = 'main,feat';",
 			"CREATE table xy (x bigint primary key, y int, z varchar(500), key(y,z));",
 			"insert into xy values (0,0,'a'), (1,0,'a'), (2,0,'a'), (3,0,'a'), (4,1,'a'), (5,2,'a')",
 			"call dolt_commit('-Am', 'xy')",
@@ -602,10 +601,7 @@ var StatBranchTests = []queries.ScriptTest{
 		},
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query: "call dolt_stats_restart()",
-			},
-			{
-				Query: "select sleep(.1)",
+				Query: "call dolt_stats_sync()",
 			},
 			{
 				Query: "select table_name, index_name, row_count from dolt_statistics",
@@ -640,7 +636,7 @@ var StatBranchTests = []queries.ScriptTest{
 				Query: "call dolt_commit('-am', 'cm')",
 			},
 			{
-				Query: "select sleep(.1)",
+				Query: "call dolt_stats_wait()",
 			},
 			{
 				Query: "select table_name, index_name, row_count from dolt_statistics as of 'feat'",
@@ -658,30 +654,6 @@ var StatBranchTests = []queries.ScriptTest{
 					{"xy", "y", uint64(6)},
 				},
 			},
-			{
-				Query: "call dolt_checkout('feat')",
-			},
-			{
-				Query: "call dolt_stats_stop()",
-			},
-			{
-				Query: "select sleep(.1)",
-			},
-			{
-				Query: "call dolt_stats_drop()",
-			},
-			{
-				Query:    "select table_name, index_name, row_count from dolt_statistics as of 'feat'",
-				Expected: []sql.Row{},
-			},
-			{
-				// we dropped 'feat', not 'main'
-				Query: "select table_name, index_name, row_count from dolt_statistics as of 'main'",
-				Expected: []sql.Row{
-					{"xy", "primary", uint64(6)},
-					{"xy", "y", uint64(6)},
-				},
-			},
 		},
 	},
 	{

go/libraries/doltcore/sqle/statspro/provider.go

@@ -64,13 +64,24 @@ func (sc *StatsCoord) GetTableStats(ctx *sql.Context, db string, table sql.Table
 
 func (sc *StatsCoord) RefreshTableStats(ctx *sql.Context, table sql.Table, dbName string) error {
 	dSess := dsess.DSessFromSess(ctx.Session)
-	branch, err := dSess.GetBranch()
-	if err != nil {
-		return err
-	}
 
+	var branch string
+	if strings.Contains(dbName, "/") {
+		parts := strings.Split(dbName, "/")
+		if len(parts) == 2 {
+			dbName = parts[0]
+			branch = parts[1]
+		}
+	}
 	if branch == "" {
-		branch = "main"
+		branch, err := dSess.GetBranch()
+		if err != nil {
+			return err
+		}
+
+		if branch == "" {
+			branch = "main"
+		}
 	}
 
 	var sqlDb dsess.SqlDatabase