sql/stats,sql/opt: detect canary window expiration in digest fast path (#166957)

sql/stats,sql/opt: detect canary window expiration in digest fast path

Author: trunk-io[bot]

pkg/sql/distsql_plan_changefeed.go

@@ -23,6 +23,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/catid"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/util/errorutil/unimplemented"
+	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/errors"
 )
@@ -480,7 +481,7 @@ func (c *cdcOptCatalog) newCDCDataSource(
 	if err != nil {
 		return nil, err
 	}
-	return newOptTable(ctx, d, c.codec(), nil /* stats */, emptyZoneConfig, false /* canaryAndStableStatsDiffer */)
+	return newOptTable(ctx, d, c.codec(), nil /* stats */, emptyZoneConfig, false /* canaryAndStableStatsDiffer */, hlc.Timestamp{} /* canaryExpiration */)
 }
 
 // familyTableDescriptor wraps underlying catalog.TableDescriptor,

pkg/sql/opt/BUILD.bazel

@@ -48,9 +48,11 @@ go_library(
         "//pkg/sql/types",
         "//pkg/util",
         "//pkg/util/buildutil",
+        "//pkg/util/hlc",
         "//pkg/util/intsets",
         "//pkg/util/log",
         "//pkg/util/syncutil",
+        "//pkg/util/timeutil",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_cockroachdb_redact//:redact",
         "@com_github_lib_pq//oid",

pkg/sql/opt/cat/BUILD.bazel

@@ -39,6 +39,7 @@ go_library(
         "//pkg/sql/types",
         "//pkg/sql/vecindex/vecpb",
         "//pkg/util/encoding",
+        "//pkg/util/hlc",
         "//pkg/util/intsets",
         "//pkg/util/treeprinter",
         "@com_github_cockroachdb_errors//:errors",

pkg/sql/opt/cat/table.go

@@ -11,6 +11,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/sql/types"
+	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 )
 
 // Table is an interface to a database table, exposing only the information
@@ -219,6 +220,11 @@ type Table interface {
 	// this table. A non-zero value means the table participates in canary
 	// statistics rollout.
 	StatsCanaryWindow() time.Duration
+
+	// CanaryExpiration returns the timestamp at which this table's canary
+	// window expires. Returns the empty timestamp if there is no active
+	// canary window or canary and stable stats are already identical.
+	CanaryExpiration() hlc.Timestamp
 }
 
 // CheckConstraint represents a check constraint on a table. Check constraints