dependent columns were not getting matched because gf.Table is an empty string

Author: angelamayxie

enginetest/queries/query_plans.go

@@ -65,7 +65,7 @@ func replaceCountStar(ctx *sql.Context, a *Analyzer, n sql.Node, _ *plan.Scope,
 						rt = t
 					}
 				}
-				if rt == nil {
+				if rt == nil || sql.IsKeyless(rt.Table.Schema()) {
 					return n, transform.SameTree, nil
 				}
 

sql/analyzer/replace_count_star.go

@@ -208,16 +208,15 @@ func pruneTableCols(
 	}
 
 	// Don't prune columns if they're needed by a virtual column
-	virtualColDeps := make(map[tableCol]int)
+	virtualColDeps := make(map[string]int)
 	if !selectStar { // if selectStar, we're adding all columns anyway
 		if vct, isVCT := n.WrappedTable().(*plan.VirtualColumnTable); isVCT {
 			for _, projection := range vct.Projections {
 				transform.InspectExpr(projection, func(e sql.Expression) bool {
 					if cd, isCD := e.(*sql.ColumnDefaultValue); isCD {
 						transform.InspectExpr(cd.Expr, func(e sql.Expression) bool {
 							if gf, ok := e.(*expression.GetField); ok {
-								c := newTableCol(gf.Table(), gf.Name())
-								virtualColDeps[c]++
+								virtualColDeps[gf.Name()]++
 							}
 							return false
 						})
@@ -232,7 +231,7 @@ func pruneTableCols(
 	source := strings.ToLower(table.Name())
 	for _, col := range table.Schema() {
 		c := newTableCol(source, col.Name)
-		if selectStar || parentCols[c] > 0 || virtualColDeps[c] > 0 {
+		if selectStar || parentCols[c] > 0 || virtualColDeps[c.Name()] > 0 {
 			cols = append(cols, c.col)
 		}
 	}