[no-release-notes] stats iter types edit (#2848)

* [no-release-notes] stats iter types edit

* cleanup names

* better empty row check

* mcv checks before strconv

Author: max-hoffman

memory/stats.go

@@ -43,7 +43,7 @@ type StatsProv struct {
 
 var _ sql.StatsProvider = (*StatsProv)(nil)
 
-func (s *StatsProv) RefreshTableStats(ctx *sql.Context, table sql.Table, db string) error {
+func (s *StatsProv) AnalyzeTable(ctx *sql.Context, table sql.Table, db string) error {
 	// non-Dolt would sample the table to get estimate of unique and histogram
 	iat, ok := table.(sql.IndexAddressableTable)
 	if !ok {

sql/analyzer/catalog.go

@@ -405,8 +405,8 @@ func (c *Catalog) TableFunction(ctx *sql.Context, name string) (sql.TableFunctio
 	return nil, false
 }
 
-func (c *Catalog) RefreshTableStats(ctx *sql.Context, table sql.Table, db string) error {
-	return c.StatsProvider.RefreshTableStats(ctx, table, db)
+func (c *Catalog) AnalyzeTable(ctx *sql.Context, table sql.Table, db string) error {
+	return c.StatsProvider.AnalyzeTable(ctx, table, db)
 }
 
 func (c *Catalog) GetTableStats(ctx *sql.Context, db string, table sql.Table) ([]sql.Statistic, error) {

sql/catalog_map.go

@@ -116,7 +116,7 @@ func (t MapCatalog) GetTableStats(ctx *Context, db string, table Table) ([]Stati
 	panic("implement me")
 }
 
-func (t MapCatalog) RefreshTableStats(ctx *Context, table Table, db string) error {
+func (t MapCatalog) AnalyzeTable(ctx *Context, table Table, db string) error {
 	//TODO implement me
 	panic("implement me")
 }

sql/rowexec/other_iters.go

@@ -40,7 +40,7 @@ func (itr *analyzeTableIter) Next(ctx *sql.Context) (sql.Row, error) {
 
 	msgType := "status"
 	msgText := "OK"
-	err := itr.stats.RefreshTableStats(ctx, t, itr.db)
+	err := itr.stats.AnalyzeTable(ctx, t, itr.db)
 	if err != nil {
 		msgType = "Error"
 		msgText = err.Error()

sql/statistics.go

@@ -38,8 +38,8 @@ type StatisticsTable interface {
 type StatsProvider interface {
 	// GetTableStats returns all statistics for the table
 	GetTableStats(ctx *Context, db string, table Table) ([]Statistic, error)
-	// RefreshTableStats updates all statistics associated with a given table
-	RefreshTableStats(ctx *Context, table Table, db string) error
+	// AnalyzeTable updates all statistics associated with a given table
+	AnalyzeTable(ctx *Context, table Table, db string) error
 	// SetStats updates or overwrites a set of table statistics
 	SetStats(ctx *Context, stats Statistic) error
 	// GetStats fetches a set of statistics for a set of table columns

sql/stats/iter.go

@@ -82,7 +82,9 @@ func (s *statsIter) updateIndexMeta() {
 	}
 	s.types = dStat.Types()
 	s.typesStr = typesB.String()
-	s.lowerBoundStr = StringifyKey(dStat.LowerBound(), dStat.Types())
+	if len(dStat.LowerBound()) > 0 {
+		s.lowerBoundStr = StringifyKey(dStat.LowerBound(), dStat.Types())
+	}
 	s.colsStr = strings.Join(dStat.Columns(), ",")
 	s.qual = dStat.Qualifier()
 	s.createdAt = dStat.CreatedAt()
@@ -104,7 +106,9 @@ func (s *statsIter) bucketToRow(i int, bucket sql.HistogramBucket) (sql.Row, err
 	mcvs := make([]string, mcvCnt)
 
 	for i, mcv := range bucket.Mcvs() {
-		mcvs[i] = StringifyKey(mcv, s.types)
+		if len(mcv) > 0 {
+			mcvs[i] = StringifyKey(mcv, s.types)
+		}
 	}
 
 	return sql.Row{
@@ -139,7 +143,8 @@ func ParseRow(rowStr string, types []sql.Type) (sql.Row, error) {
 func StringifyKey(r sql.Row, typs []sql.Type) string {
 	b := strings.Builder{}
 	sep := ""
-	for i, v := range r {
+	for i := range typs {
+		v := r[i]
 		typ := typs[i]
 		if _, ok := typ.(sql.StringType); ok {
 			typ = types.LongText

test/test_catalog.go

@@ -179,7 +179,7 @@ func (c *Catalog) GetTableStats(ctx *sql.Context, db string, table sql.Table) ([
 	panic("implement me")
 }
 
-func (c *Catalog) RefreshTableStats(ctx *sql.Context, table sql.Table, db string) error {
+func (c *Catalog) AnalyzeTable(ctx *sql.Context, table sql.Table, db string) error {
 	//TODO implement me
 	panic("implement me")
 }