testserver: make ForceTableGC agnostic of secondary tenants

Release note: None

Author: knz

pkg/server/testserver.go

@@ -906,6 +906,13 @@ func (t *TestTenant) TracerI() interface{} {
 	return t.Tracer()
 }
 
+// ForceTableGC is part of the serverutils.ApplicationLayerInterface.
+func (t *TestTenant) ForceTableGC(
+	ctx context.Context, database, table string, timestamp hlc.Timestamp,
+) error {
+	return internalForceTableGC(ctx, t, database, table, timestamp)
+}
+
 // SettingsWatcher is part of the serverutils.ApplicationLayerInterface.
 func (t *TestTenant) SettingsWatcher() interface{} {
 	return t.sql.settingsWatcher
@@ -1856,38 +1863,33 @@ func (ts *TestServer) Tracer() *tracing.Tracer {
 	return ts.node.storeCfg.AmbientCtx.Tracer
 }
 
-// ForceTableGC is part of the serverutils.TestServerInterface.
+// ForceTableGC is part of the serverutils.ApplicationLayerInterface.
 func (ts *TestServer) ForceTableGC(
 	ctx context.Context, database, table string, timestamp hlc.Timestamp,
 ) error {
-	tableIDQuery := `
- SELECT tables.id FROM system.namespace tables
-   JOIN system.namespace dbs ON dbs.id = tables."parentID"
-   WHERE dbs.name = $1 AND tables.name = $2
- `
-	row, err := ts.sqlServer.internalExecutor.QueryRowEx(
-		ctx, "resolve-table-id", nil, /* txn */
-		sessiondata.RootUserSessionDataOverride,
-		tableIDQuery, database, table)
+	return internalForceTableGC(ctx, ts.SystemLayer(), database, table, timestamp)
+}
+
+func internalForceTableGC(
+	ctx context.Context,
+	app serverutils.ApplicationLayerInterface,
+	database, table string,
+	timestamp hlc.Timestamp,
+) error {
+	tableID, err := app.QueryTableID(ctx, username.RootUserName(), database, table)
 	if err != nil {
 		return err
 	}
-	if row == nil {
-		return errors.Errorf("table not found")
-	}
-	if len(row) != 1 {
-		return errors.AssertionFailedf("expected 1 column from internal query")
-	}
-	tableID := uint32(*row[0].(*tree.DInt))
-	tblKey := keys.SystemSQLCodec.TablePrefix(tableID)
+
+	tblKey := app.Codec().TablePrefix(uint32(tableID))
 	gcr := kvpb.GCRequest{
 		RequestHeader: kvpb.RequestHeader{
 			Key:    tblKey,
 			EndKey: tblKey.PrefixEnd(),
 		},
 		Threshold: timestamp,
 	}
-	_, pErr := kv.SendWrapped(ctx, ts.distSender, &gcr)
+	_, pErr := kv.SendWrapped(ctx, app.DistSenderI().(kv.Sender), &gcr)
 	return pErr.GoError()
 }
 

pkg/testutils/serverutils/test_tenant_shim.go

@@ -302,6 +302,12 @@ type ApplicationLayerInterface interface {
 		ctx context.Context, span roachpb.Span,
 	) (*serverpb.TableStatsResponse, error)
 
+	// ForceTableGC sends a GCRequest for the ranges corresponding to a table.
+	//
+	// An error will be returned if the same table name exists in multiple schemas
+	// inside the specified database.
+	ForceTableGC(ctx context.Context, database, table string, timestamp hlc.Timestamp) error
+
 	// TODO(irfansharif): We'd benefit from an API to construct a *gosql.DB, or
 	// better yet, a *sqlutils.SQLRunner. We use it all the time, constructing
 	// it by hand each time.