sql: remove miscellaneous unused functions and objects

yuzefovich · yuzefovich · commit 262461347d15 · 2025-06-07T09:58:24.000-07:00
These were exported, so our unused linter didn't catch them.

Release note: None
diff --git a/pkg/settings/registry.go b/pkg/settings/registry.go
@@ -267,6 +267,9 @@ var retiredSettings = map[InternalKey]struct{}{
 	"changefeed.new_pubsub_sink_enabled":                     {},
 	"changefeed.new_pubsub_sink.enabled":                     {},
 	"logical_replication.consumer.use_implicit_txns.enabled": {},
+
+	// removed as of 25.3
+	"sql.metrics.max_stmt_fingerprints_per_explicit_txn": {},
 }
 
 // grandfatheredDefaultSettings is the list of "grandfathered" existing sql.defaults
diff --git a/pkg/sql/catalog/post_deserialization_changes.go b/pkg/sql/catalog/post_deserialization_changes.go
@@ -79,10 +79,6 @@ const (
 	// field was unset and that the MVCC timestamp value was assigned to it.
 	SetModTimeToMVCCTimestamp
 
-	// SetCreateAsOfTimeUsingModTime indicates that a table's CreateAsOfTime field
-	// was unset and the ModificationTime value was assigned to it.
-	SetCreateAsOfTimeUsingModTime
-
 	// SetSystemDatabaseDescriptorVersion indicates that the system database
 	// descriptor did not have its version set.
 	SetSystemDatabaseDescriptorVersion
diff --git a/pkg/sql/catalog/systemschema/system.go b/pkg/sql/catalog/systemschema/system.go
@@ -1359,14 +1359,6 @@ const (
 	// in the hash sharded primary key in the sql stats tables, this value needs to
 	// be updated.
 	SQLStatsHashShardBucketCount = 8
-
-	// StmtStatsHashColumnName is the name of the hash column of
-	// system.statement_statistics.
-	StmtStatsHashColumnName = "crdb_internal_aggregated_ts_app_name_fingerprint_id_node_id_plan_hash_transaction_fingerprint_id_shard_8"
-
-	// TxnStatsHashColumnName is the name of the hash column of
-	// system.transaction_statistics.
-	TxnStatsHashColumnName = "crdb_internal_aggregated_ts_app_name_fingerprint_id_node_id_shard_8"
 )
 
 // SystemDatabaseName is the name of the system database.
diff --git a/pkg/sql/catalog/table_elements.go b/pkg/sql/catalog/table_elements.go
@@ -1011,20 +1011,6 @@ func ColumnIDToOrdinalMap(columns []Column) TableColMap {
 	return m
 }
 
-// ColumnTypesWithInvertedCol returns the types of all given columns,
-// If invertedCol is non-nil, substitutes the type of the inverted
-// column instead of the column with the same ID.
-func ColumnTypesWithInvertedCol(columns []Column, invertedCol Column) []*types.T {
-	t := make([]*types.T, len(columns))
-	for i, col := range columns {
-		t[i] = col.GetType()
-		if invertedCol != nil && col.GetID() == invertedCol.GetID() {
-			t[i] = invertedCol.GetType()
-		}
-	}
-	return t
-}
-
 // ColumnsByIDs returns a map of Columns keyed by their ID for the given table.
 func ColumnsByIDs(tbl TableDescriptor) map[descpb.ColumnID]Column {
 	cols := tbl.AllColumns()
diff --git a/pkg/sql/catalog/tabledesc/index.go b/pkg/sql/catalog/tabledesc/index.go
@@ -526,11 +526,6 @@ func (w index) IsEnforced() bool {
 	return !w.IsMutation() || w.WriteAndDeleteOnly()
 }
 
-// NewTestIndex wraps an index descriptor in an index struct for use in unit tests.
-func NewTestIndex(desc *descpb.IndexDescriptor, ordinal int) index {
-	return index{desc: desc, ordinal: ordinal}
-}
-
 // partitioning is the backing struct for a catalog.Partitioning interface.
 type partitioning struct {
 	desc *catpb.PartitioningDescriptor
diff --git a/pkg/sql/colexec/colexecsel/selection_ops_test.go b/pkg/sql/colexec/colexecsel/selection_ops_test.go
@@ -25,11 +25,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-const (
-	selectivity     = .5
-	nullProbability = .1
-)
-
 func TestSelLTInt64Int64ConstOp(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
@@ -164,7 +159,7 @@ func runSelOpBenchmarks(
 			batch := testAllocator.NewMemBatchWithMaxCapacity(inputTypes)
 			nullProb := 0.0
 			if hasNulls {
-				nullProb = nullProbability
+				nullProb = 0.1
 			}
 			for _, colVec := range batch.ColVecs() {
 				coldatatestutils.RandomVec(coldatatestutils.RandomVecArgs{
diff --git a/pkg/sql/descriptor.go b/pkg/sql/descriptor.go
@@ -245,19 +245,6 @@ func TranslateSurvivalGoal(g tree.SurvivalGoal) (descpb.SurvivalGoal, error) {
 	}
 }
 
-// TranslateProtoSurvivalGoal translate a descpb.SurvivalGoal into a
-// tree.SurvivalGoal.
-func TranslateProtoSurvivalGoal(g descpb.SurvivalGoal) (tree.SurvivalGoal, error) {
-	switch g {
-	case descpb.SurvivalGoal_ZONE_FAILURE:
-		return tree.SurvivalGoalZoneFailure, nil
-	case descpb.SurvivalGoal_REGION_FAILURE:
-		return tree.SurvivalGoalRegionFailure, nil
-	default:
-		return 0, errors.Newf("unknown survival goal: %d", g)
-	}
-}
-
 // TranslateDataPlacement translates a tree.DataPlacement into a
 // descpb.DataPlacement.
 func TranslateDataPlacement(g tree.DataPlacement) (descpb.DataPlacement, error) {
diff --git a/pkg/sql/exprutil/type_check.go b/pkg/sql/exprutil/type_check.go
@@ -65,15 +65,6 @@ var (
 	_ ToTypeCheck = TenantSpec{}
 )
 
-// MakeStringArraysFromOptList makes a StringArrays by casting the members of in.
-func MakeStringArraysFromOptList(in []tree.StringOrPlaceholderOptList) StringArrays {
-	ret := make([]tree.Exprs, len(in))
-	for i, exprs := range in {
-		ret[i] = tree.Exprs(exprs)
-	}
-	return ret
-}
-
 func (s StringArrays) typeCheck(ctx context.Context, op string, semaCtx *tree.SemaContext) error {
 	for _, exprs := range s {
 		if err := Strings(exprs).typeCheck(ctx, op, semaCtx); err != nil {
diff --git a/pkg/sql/schemachanger/scplan/internal/rules/release_25_2/helpers.go b/pkg/sql/schemachanger/scplan/internal/rules/release_25_2/helpers.go
@@ -74,12 +74,6 @@ func isDescriptor(e scpb.Element) bool {
 	return false
 }
 
-// IsDescriptor returns true for a descriptor-element, i.e. an element which
-// owns its corresponding descriptor. This is only used for exports
-func IsDescriptor(e scpb.Element) bool {
-	return isDescriptor(e)
-}
-
 func isSubjectTo2VersionInvariant(e scpb.Element) bool {
 	// TODO(ajwerner): This should include constraints and enum values but it
 	// currently does not because we do not support dropping them unless we're
diff --git a/pkg/sql/sem/catconstants/namespace.go b/pkg/sql/sem/catconstants/namespace.go
@@ -13,9 +13,4 @@ const (
 	// NamespaceTablePrimaryIndexID is the id of the primary index of the
 	// namespace table.
 	NamespaceTablePrimaryIndexID = 1
-
-	// PreMigrationNamespaceTableName is the name that was used on the descriptor
-	// of the current namespace table before the DeprecatedNamespaceTable was
-	// migrated away.
-	PreMigrationNamespaceTableName = "namespace2"
 )
diff --git a/pkg/sql/sem/catconstants/schemas.go b/pkg/sql/sem/catconstants/schemas.go
@@ -10,16 +10,6 @@ package catconstants
 // databases other than system were given a public schema.
 const PublicSchemaID = 29
 
-// StaticSchemaIDMapVirtualPublicSchema is a map of statically known schema IDs
-// on versions prior to PublicSchemasWithDescriptors.
-var StaticSchemaIDMapVirtualPublicSchema = map[uint32]string{
-	PublicSchemaID:      PublicSchemaName,
-	PgCatalogID:         PgCatalogName,
-	InformationSchemaID: InformationSchemaName,
-	CrdbInternalID:      CRDBInternalSchemaName,
-	PgExtensionSchemaID: PgExtensionSchemaName,
-}
-
 // StaticSchemaIDMap is a map of statically known schema IDs on versions
 // PublicSchemasWithDescriptors and onwards.
 var StaticSchemaIDMap = map[uint32]string{
@@ -29,12 +19,6 @@ var StaticSchemaIDMap = map[uint32]string{
 	PgExtensionSchemaID: PgExtensionSchemaName,
 }
 
-// GetStaticSchemaIDMap returns a map of schema ids to schema names for the
-// static schemas.
-func GetStaticSchemaIDMap() map[uint32]string {
-	return StaticSchemaIDMapVirtualPublicSchema
-}
-
 // PgCatalogName is the name of the pg_catalog system schema.
 const PgCatalogName = "pg_catalog"
 
diff --git a/pkg/sql/sem/tree/pretty.go b/pkg/sql/sem/tree/pretty.go
@@ -112,8 +112,6 @@ type LineWidthMode int
 const (
 	// DefaultLineWidth is the line width used with the default pretty-printing configuration.
 	DefaultLineWidth = 60
-	// ConsoleLineWidth is the line width used on the frontend console.
-	ConsoleLineWidth = 108
 )
 
 // keywordWithText returns a pretty.Keyword with left and/or right
diff --git a/pkg/sql/sqlinstance/instancestorage/test_helpers.go b/pkg/sql/sqlinstance/instancestorage/test_helpers.go
@@ -19,58 +19,9 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/sqlinstance"
 	"github.com/cockroachdb/cockroach/pkg/sql/sqlliveness"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
-	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
 	"github.com/cockroachdb/errors"
 )
 
-// FakeStorage implements the instanceprovider.storage interface.
-type FakeStorage struct {
-	mu struct {
-		syncutil.Mutex
-		instances     map[base.SQLInstanceID]sqlinstance.InstanceInfo
-		instanceIDCtr base.SQLInstanceID
-	}
-}
-
-// NewFakeStorage creates a new FakeStorage.
-func NewFakeStorage() *FakeStorage {
-	f := &FakeStorage{}
-	f.mu.instances = make(map[base.SQLInstanceID]sqlinstance.InstanceInfo)
-	f.mu.instanceIDCtr = base.SQLInstanceID(1)
-	return f
-}
-
-// CreateInstance implements the instanceprovider.writer interface.
-func (f *FakeStorage) CreateInstance(
-	ctx context.Context,
-	sessionID sqlliveness.SessionID,
-	sessionExpiration hlc.Timestamp,
-	rpcAddr string,
-	sqlAddr string,
-	locality roachpb.Locality,
-) (base.SQLInstanceID, error) {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	i := sqlinstance.InstanceInfo{
-		InstanceID:      f.mu.instanceIDCtr,
-		InstanceRPCAddr: rpcAddr,
-		InstanceSQLAddr: sqlAddr,
-		SessionID:       sessionID,
-		Locality:        locality,
-	}
-	f.mu.instances[f.mu.instanceIDCtr] = i
-	f.mu.instanceIDCtr++
-	return i.InstanceID, nil
-}
-
-// ReleaseInstanceID implements the instanceprovider.writer interface.
-func (f *FakeStorage) ReleaseInstanceID(_ context.Context, id base.SQLInstanceID) error {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	delete(f.mu.instances, id)
-	return nil
-}
-
 // CreateInstanceDataForTest creates a new entry in the sql_instances system
 // table for testing purposes.
 func (s *Storage) CreateInstanceDataForTest(
diff --git a/pkg/sql/sqlstats/cluster_settings.go b/pkg/sql/sqlstats/cluster_settings.go
@@ -93,41 +93,6 @@ var MaxMemReportedSQLStatsTxnFingerprints = settings.RegisterIntSetting(
 	100000,
 	settings.WithPublic)
 
-// MaxSQLStatsStmtFingerprintsPerExplicitTxn specifies the maximum of unique statement
-// fingerprints we store for each explicit transaction.
-//
-// This limit is introduced because when SQL Stats starts to record statement
-// statistics for statements inside an explicit transaction, the transaction
-// fingerprint ID is not known until the transaction is finished. SQL Stats
-// holds those statement statistics in a temporary container until the explicit
-// transaction finishes, then SQL Stats will upsert the statistics held in the
-// temporary container into its in-memory store. However, the temporary
-// container cannot inherit the node-level statement statistics fingerprint limit
-// (that is: sql.metrics.max_mem_stmt_fingerprints). This is because if we count
-// statement fingerprints inside the temporary container towards the total
-// fingerprint count, we would be over-counting the statement fingerprint.
-//
-// For example: let's suppose we execute the following transaction:
-// * BEGIN; SELECT 1; SELECT 1, 1; COMMIT;
-// This results in 4 statement fingerprints and 1 txn fingerprint.
-// Let's suppose currently our statement fingerprint limit is 6.
-// If we are to execute the same statement again:
-//   - BEGIN; <- this increments current statement fingerprint count to 5
-//     since we hold statement stats for explicit transaction in a
-//     temporary container before we can perform the upsert.
-//   - SELECT 1; <- this increments the count to 6
-//   - SELECT 1, 1; <- ERR: this causes the count to exceed our stmt fingerprint
-//     limit before we can perform the upsert.
-//
-// The total amount of memory consumed will still be constrained by the
-// top-level memory monitor created for SQL Stats.
-var MaxSQLStatsStmtFingerprintsPerExplicitTxn = settings.RegisterIntSetting(
-	settings.ApplicationLevel,
-	"sql.metrics.max_stmt_fingerprints_per_explicit_txn",
-	"the maximum number of statement fingerprints stored per explicit transaction",
-	2000,
-)
-
 // MaxSQLStatReset is the cluster setting that controls at what interval SQL
 // statement statistics must be flushed within.
 var MaxSQLStatReset = settings.RegisterDurationSetting(
diff --git a/pkg/sql/syntheticprivilege/global_privilege.go b/pkg/sql/syntheticprivilege/global_privilege.go
@@ -20,10 +20,6 @@ import (
 // the role modify cluster settings within the cluster.
 type GlobalPrivilege struct{}
 
-// GlobalPrivilegeObjectType represents the object type for
-// GlobalPrivilege.
-const GlobalPrivilegeObjectType = "Global"
-
 var _ Object = &GlobalPrivilege{}
 
 // GetPath implements the Object interface.
diff --git a/pkg/sql/syntheticprivilege/vtable_privilege.go b/pkg/sql/syntheticprivilege/vtable_privilege.go
@@ -20,10 +20,6 @@ type VirtualTablePrivilege struct {
 	TableName  string `priv:"TableName"`
 }
 
-// VirtualTablePrivilegeType represents the object type for
-// VirtualTablePrivilege.
-const VirtualTablePrivilegeType = "VirtualTable"
-
 var _ Object = &VirtualTablePrivilege{}
 
 // VirtualTablePathPrefix is the prefix used for virtual table privileges in system.privileges.
diff --git a/pkg/sql/tenant_accessors.go b/pkg/sql/tenant_accessors.go
@@ -132,52 +132,3 @@ func (p *planner) LookupTenantID(
 	}
 	return roachpb.MustMakeTenantID(rec.ID), nil
 }
-
-// GetExtendedTenantInfo hydrates a TenantInfoWithUsage with the
-// additional data beyond the TenantInfo record.
-func GetExtendedTenantInfo(
-	ctx context.Context, txn isql.Txn, info *mtinfopb.TenantInfo,
-) (*mtinfopb.TenantInfoWithUsage, error) {
-	res := &mtinfopb.TenantInfoWithUsage{
-		ProtoInfo: info.ProtoInfo,
-		SQLInfo:   info.SQLInfo,
-	}
-	rows, err := txn.QueryBufferedEx(ctx, "get-tenant-setting-overrides", txn.KV(), sessiondata.NodeUserSessionDataOverride,
-		`SELECT name, value, value_type, reason FROM system.tenant_settings WHERE tenant_id = $1`,
-		info.ID,
-	)
-	if err != nil {
-		return nil, err
-	}
-	for _, row := range rows {
-		override := &mtinfopb.SettingOverride{
-			Name:      string(tree.MustBeDString(row[0])),
-			Value:     string(tree.MustBeDString(row[1])),
-			ValueType: string(tree.MustBeDString(row[2])),
-		}
-		if row[3] != tree.DNull {
-			s := string(tree.MustBeDString(row[3]))
-			override.Reason = &s
-		}
-		res.SettingOverrides = append(res.SettingOverrides, override)
-	}
-
-	row, err := txn.QueryRowEx(ctx, "get-tenant-usage-config", txn.KV(), sessiondata.NodeUserSessionDataOverride,
-		`SELECT ru_current, ru_burst_limit, ru_refill_rate
-       FROM system.tenant_usage
-      WHERE tenant_id = $1 AND instance_id = 0`,
-		info.ID,
-	)
-	if err != nil {
-		return nil, err
-	}
-	if row != nil {
-		res.Usage = &mtinfopb.UsageInfo{
-			RUCurrent:    float64(tree.MustBeDFloat(row[0])),
-			RUBurstLimit: float64(tree.MustBeDFloat(row[1])),
-			RURefillRate: float64(tree.MustBeDFloat(row[2])),
-		}
-	}
-
-	return res, nil
-}
diff --git a/pkg/sql/vecindex/cspann/commontest/storetests.go b/pkg/sql/vecindex/cspann/commontest/storetests.go
@@ -17,10 +17,6 @@ import (
 	"github.com/stretchr/testify/suite"
 )
 
-type equaler interface {
-	Equal(that any) bool
-}
-
 var vec1 = vector.T{1, 2}
 var vec2 = vector.T{7, 4}
 var vec3 = vector.T{4, 3}
diff --git a/pkg/sql/vecindex/cspann/commontest/utils.go b/pkg/sql/vecindex/cspann/commontest/utils.go
@@ -65,16 +65,3 @@ func RoundResults(results cspann.SearchResults, prec int) cspann.SearchResults {
 	}
 	return results
 }
-
-// ValidatePartitionsEqual validates that the two partitions match.
-func ValidatePartitionsEqual(t *testing.T, l, r *cspann.Partition) {
-	q1, q2 := l.QuantizedSet(), r.QuantizedSet()
-	require.Equal(t, l.Level(), r.Level(), "levels do not match")
-	require.Equal(t, l.ChildKeys(), r.ChildKeys(), "childKeys do not match")
-	require.Equal(t, l.ValueBytes(), r.ValueBytes(), "valueBytes do not match")
-	require.Equal(t, l.Centroid, r.Centroid, "centroids do not match")
-	require.Equal(t, q1.GetCount(), q2.GetCount(), "counts do not match")
-	if eq, ok := q1.(equaler); ok {
-		require.True(t, eq.Equal(q2))
-	}
-}
diff --git a/pkg/sql/vecindex/cspann/testutils/BUILD.bazel b/pkg/sql/vecindex/cspann/testutils/BUILD.bazel
@@ -11,6 +11,5 @@ go_library(
         "//pkg/util/num32",
         "//pkg/util/vector",
         "@com_github_stretchr_testify//require",
-        "@org_gonum_v1_gonum//floats/scalar",
     ],
 )
diff --git a/pkg/sql/vecindex/cspann/testutils/testutils.go b/pkg/sql/vecindex/cspann/testutils/testutils.go

Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,9 @@ var retiredSettings = map[InternalKey]struct{}{`
`267`	`267`	`"changefeed.new_pubsub_sink_enabled": {},`
`268`	`268`	`"changefeed.new_pubsub_sink.enabled": {},`
`269`	`269`	`"logical_replication.consumer.use_implicit_txns.enabled": {},`
	`270`	`+`
	`271`	`+ // removed as of 25.3`
	`272`	`+ "sql.metrics.max_stmt_fingerprints_per_explicit_txn": {},`
`270`	`273`	`}`
`271`	`274`
`272`	`275`	`// grandfatheredDefaultSettings is the list of "grandfathered" existing sql.defaults`