builtins: decrease wait time for await_statement_hints_cache

Previously, `crdb_internal.await_statement_hints_cache` waited until
the hint cache frontier timestamp reached `now()` plus the closed
timestamp target duration and refresh interval. The frontier timestamp
indicates that we've seen all events up to that timestamp, so it's OK
to just wait until `now()` instead. This commit also fixes a flake in
the `statement_hint_builtins` logic test due to a test flag
`UseRangeTombstonesForPointDeletes`.

Epic: None

Release note: None

Author: DrewKimball

pkg/sql/faketreeeval/BUILD.bazel

@@ -10,7 +10,6 @@ go_library(
         "//pkg/jobs/jobspb",
         "//pkg/roachpb",
         "//pkg/security/username",
-        "//pkg/settings/cluster",
         "//pkg/sql/catalog/descpb",
         "//pkg/sql/hintpb",
         "//pkg/sql/pgwire/pgcode",

pkg/sql/faketreeeval/evalctx.go

@@ -14,7 +14,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/security/username"
-	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/hintpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
@@ -583,7 +582,7 @@ func (ep *DummyEvalPlanner) ClearTableStatsCache() {}
 func (ep *DummyEvalPlanner) ClearStatementHintsCache() {}
 
 // AwaitStatementHintsCache is part of the eval.Planner interface.
-func (ep *DummyEvalPlanner) AwaitStatementHintsCache(ctx context.Context, st *cluster.Settings) {}
+func (ep *DummyEvalPlanner) AwaitStatementHintsCache(ctx context.Context) {}
 
 // RetryCounter is part of the eval.Planner interface.
 func (ep *DummyEvalPlanner) RetryCounter() int {

pkg/sql/hints/BUILD.bazel

@@ -14,8 +14,6 @@ go_library(
         "//pkg/kv/kvclient/rangefeed/rangefeedbuffer",
         "//pkg/kv/kvclient/rangefeed/rangefeedcache",
         "//pkg/kv/kvpb",
-        "//pkg/kv/kvserver",
-        "//pkg/kv/kvserver/closedts",
         "//pkg/roachpb",
         "//pkg/settings",
         "//pkg/settings/cluster",

pkg/sql/hints/hint_cache.go

@@ -17,8 +17,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/kv/kvclient/rangefeed/rangefeedbuffer"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvclient/rangefeed/rangefeedcache"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
-	"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
-	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
@@ -381,22 +379,18 @@ var _ rangefeedbuffer.Event = &bufferEvent{}
 // with the present. After Await returns, MaybeGetStatementHints should
 // accurately reflect all hints that were modified before the call to Await
 // (assuming the ctx was not canceled).
-func (c *StatementHintsCache) Await(ctx context.Context, st *cluster.Settings) {
-	// The frontier timestamp comes from the rangefeed, and could be up to
-	// kv.closed_timestamp.target_duration +
-	// kv.rangefeed.closed_timestamp_refresh_interval behind the present.
-	targetDuration := closedts.TargetDuration.Get(&st.SV)
-	refreshInterval := kvserver.RangeFeedRefreshInterval.Get(&st.SV)
-	const fudge = 10 * time.Millisecond
-	waitUntil := c.clock.Now().AddDuration(targetDuration + refreshInterval + fudge).WallTime
+func (c *StatementHintsCache) Await(ctx context.Context) {
+	// Wait in intervals of at least 100 milliseconds to avoid busy-waiting.
+	const minWait = time.Millisecond * 100
+	waitUntil := c.clock.Now().WallTime
 
 	// Await is only used for testing, so we don't need to wake up immediately. We
 	// can get away with polling the frontier time.
-	for frontier := c.frontier.Load(); frontier < waitUntil; frontier = c.frontier.Load() {
+	for frontier := c.frontier.Load(); frontier <= waitUntil; frontier = c.frontier.Load() {
 		select {
 		case <-ctx.Done():
 			return
-		case <-time.After(time.Duration(waitUntil-frontier) * time.Nanosecond):
+		case <-time.After(max(time.Duration(waitUntil-frontier), minWait)):
 		}
 	}
 }

pkg/sql/logictest/testdata/logic_test/statement_hint_builtins

@@ -1,4 +1,5 @@
 # LogicTest: !local-mixed-25.2 !local-mixed-25.3 !local-prepared
+# cluster-opt: disable-mvcc-range-tombstones-for-point-deletes
 
 statement ok
 CREATE TABLE xy (x INT PRIMARY KEY, y INT, INDEX (y));

pkg/sql/planner.go

@@ -19,7 +19,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/security/username"
 	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
-	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/spanconfig"
 	"github.com/cockroachdb/cockroach/pkg/sql/auditlogging"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
@@ -1099,9 +1098,9 @@ func (p *planner) ClearStatementHintsCache() {
 }
 
 // AwaitStatementHintsCache is part of the eval.Planner interface.
-func (p *planner) AwaitStatementHintsCache(ctx context.Context, st *cluster.Settings) {
+func (p *planner) AwaitStatementHintsCache(ctx context.Context) {
 	if p.execCfg.StatementHintsCache != nil {
-		p.execCfg.StatementHintsCache.Await(ctx, st)
+		p.execCfg.StatementHintsCache.Await(ctx)
 	}
 }
 

pkg/sql/sem/builtins/builtins.go

@@ -9741,7 +9741,7 @@ WHERE object_id = table_descriptor_id
 			Types:      tree.ParamTypes{},
 			ReturnType: tree.FixedReturnType(types.Void),
 			Fn: func(ctx context.Context, evalCtx *eval.Context, args tree.Datums) (tree.Datum, error) {
-				evalCtx.Planner.AwaitStatementHintsCache(ctx, evalCtx.Settings)
+				evalCtx.Planner.AwaitStatementHintsCache(ctx)
 				return tree.DVoidDatum, nil
 			},
 			Info:       `This function is used to await the statement hints cache on the gateway node`,

pkg/sql/sem/eval/deps.go

@@ -13,7 +13,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/security/username"
-	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/hintpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgnotice"
@@ -464,7 +463,7 @@ type Planner interface {
 
 	// AwaitStatementHintsCache waits for the node's statement hints cache to
 	// catch up with recent hint injections.
-	AwaitStatementHintsCache(ctx context.Context, st *cluster.Settings)
+	AwaitStatementHintsCache(ctx context.Context)
 
 	// RetryCounter is the number of times this statement has been retried.
 	RetryCounter() int