Merge #150387 #150390 #150391 #150414

150387: builtins: fix `pg_collation_for` for CITEXT r=yuzefovich a=yuzefovich

We missed a spot where we need to unwrap the DOidWrapper corresponding to DCIText.

Fixes: #150386.

Release note: None

150390: kvserver: pass NodeCapacityProviderConfig to NewNodeCapacityProvider r=tbg a=wenyihu6

Previously, NewNodeCapacityProvider took NodeCapacityProviderTestingKnobs
directly and handled the logic for picking refresh intervals internally. This
wasn't ideal, as it is preferred for configuration to be handled by the caller,
keeping NewNodeCapacityProvider focused on its core logic. This change moves
that logic to the caller, which now constructs the config with the appropriate
interval values. The default setting is now also closer to the server
configuration in pkg/base/config.go.

Epic: none
Release note: none

150391: valueside: fix missing support for CITEXT r=yuzefovich a=yuzefovich

We forgot to add support for CITEXT in MarshalLegacy value encoding. We forgot to add support for CITEXT in MarshalLegacy value encoding. (This encoding type is used when multiple column families are present, and the CITEXT is included not in the zeroth column family.)

No stable release with this bug, so we omit the release note.

Fixes: #150389.
Release none: None

150414: release: add support for s390x in custom release signing script r=rickystewart a=rail

This commit adds support for the s390x architecture in the custom release signing script and introduces a new script to build CockroachDB releases for the s390x platform without telemetry.

Release note: none
Epic: none

Co-authored-by: Yahor Yuzefovich <[email protected]>
Co-authored-by: wenyihu6 <[email protected]>
Co-authored-by: Tobias Grieger <[email protected]>
Co-authored-by: Rail Aliiev <[email protected]>

Author: 5 people

build/teamcity/internal/cockroach/release/publish/sign-custom-release.sh

@@ -53,7 +53,7 @@ log_into_gcloud
 mkdir -p artifacts
 cd artifacts
 
-for platform in linux-amd64 linux-arm64; do
+for platform in linux-amd64 linux-arm64 linux-s390x; do
   tarball=${cockroach_archive_prefix}-${version}.${platform}.tgz
 
   gsutil cp "gs://$gcs_staged_bucket/$tarball" "$tarball"

build/teamcity/internal/release/process/build-cockroach-release-linux-s390x-no-telemetry.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Copyright 2025 The Cockroach Authors.
+#
+# Use of this software is governed by the CockroachDB Software License
+# included in the /LICENSE file.
+
+
+PLATFORM=linux-s390x TELEMETRY_DISABLED=true ./build/teamcity/internal/release/process/build-cockroach-release-per-platform.sh

pkg/base/config.go

@@ -96,6 +96,21 @@ const (
 	// DefaultLeaseRenewalCrossValidate is the default setting for if
 	// we should validate descriptors on lease renewals.
 	DefaultLeaseRenewalCrossValidate = false
+
+	// DefaultCPUUsageRefreshInterval controls how often cpu usage measurements
+	// are sampled by NodeCapacityProvider.
+	DefaultCPUUsageRefreshInterval = time.Second
+
+	// DefaultCPUCapacityRefreshInterval controls how often the total CPU capacity
+	// of the node is re-calculated by NodeCapacityProvider. This is less frequent
+	// than usage since capacity changes happen less often.
+	DefaultCPUCapacityRefreshInterval = 10 * time.Second
+
+	// DefaultCPUUsageMovingAverageAge defines the effective time window size for
+	// sampling cpu usage. With a value of 20, the 20th-to-last measurement
+	// contributes meaningfully to the average, while earlier measurements have
+	// diminishing impact.
+	DefaultCPUUsageMovingAverageAge = 20
 )
 
 // DefaultCertsDirectory is the default value for the cert directory flag.

pkg/kv/kvserver/load/node_capacity_provider.go

@@ -35,45 +35,35 @@ type NodeCapacityProvider struct {
 	runtimeLoadMonitor *runtimeLoadMonitor
 }
 
+// NodeCapacityProviderConfig holds the configuration for creating a
+// NodeCapacityProvider.
+type NodeCapacityProviderConfig struct {
+	// CPUUsageRefreshInterval controls how often cpu usage measurements are
+	// sampled.
+	CPUUsageRefreshInterval time.Duration
+	// CPUCapacityRefreshInterval controls how often the total CPU capacity is
+	// polled.
+	CPUCapacityRefreshInterval time.Duration
+	// CPUUsageMovingAverageAge defines the effective time window size for the
+	// moving average when sampling cpu usage.
+	CPUUsageMovingAverageAge float64
+}
+
 // NewNodeCapacityProvider creates a new NodeCapacityProvider that monitors CPU
-// metrics using the provided stores aggregator. The optional knobs parameter
-// allows customizing refresh intervals for testing.
+// metrics using the provided stores aggregator and configuration.
 func NewNodeCapacityProvider(
-	stopper *stop.Stopper, stores StoresStatsAggregator, knobs *NodeCapacityProviderTestingKnobs,
+	stopper *stop.Stopper, stores StoresStatsAggregator, config NodeCapacityProviderConfig,
 ) *NodeCapacityProvider {
 	if stopper == nil || stores == nil {
 		panic("programming error: stopper or stores aggregator cannot be nil")
 	}
 
-	// refreshIntervals define how frequently cpu metrics are updated.
-	const (
-		// defaultCPUUsageRefreshInterval controls how often cpu usage measurements
-		// are taken.
-		defaultCPUUsageRefreshInterval = time.Second
-		// defaultCPUCapacityRefreshInterval controls how often the total CPU
-		// capacity of the node is re-calculated. This is less frequent than usage
-		// since capacity changes happen less often.
-		defaultCPUCapacityRefreshInterval = 10 * time.Second
-	)
-
-	// defaultMovingAverageAge defines the effective time window size. With a
-	// value of 20, the 20th-to-last measurement contributes meaningfully to the
-	// average, while earlier measurements have diminishing impact.
-	const defaultMovingAverageAge = 20
-
-	usageInterval := defaultCPUUsageRefreshInterval
-	capacityInterval := defaultCPUCapacityRefreshInterval
-	if knobs != nil {
-		usageInterval = knobs.CpuUsageRefreshInterval
-		capacityInterval = knobs.CpuCapacityRefreshInterval
-	}
-
 	monitor := &runtimeLoadMonitor{
 		stopper:                 stopper,
-		usageRefreshInterval:    usageInterval,
-		capacityRefreshInterval: capacityInterval,
+		usageRefreshInterval:    config.CPUUsageRefreshInterval,
+		capacityRefreshInterval: config.CPUCapacityRefreshInterval,
 	}
-	monitor.mu.usageEWMA = ewma.NewMovingAverage(defaultMovingAverageAge)
+	monitor.mu.usageEWMA = ewma.NewMovingAverage(config.CPUUsageMovingAverageAge)
 	monitor.recordCPUCapacity(context.Background())
 	return &NodeCapacityProvider{
 		stores:             stores,

pkg/kv/kvserver/load/node_capacity_provider_test.go

@@ -40,9 +40,10 @@ func TestNodeCapacityProvider(t *testing.T) {
 		storeCount: 3,
 	}
 
-	provider := load.NewNodeCapacityProvider(stopper, mockStores, &load.NodeCapacityProviderTestingKnobs{
-		CpuUsageRefreshInterval:    1 * time.Millisecond,
-		CpuCapacityRefreshInterval: 1 * time.Millisecond,
+	provider := load.NewNodeCapacityProvider(stopper, mockStores, load.NodeCapacityProviderConfig{
+		CPUUsageRefreshInterval:    1 * time.Millisecond,
+		CPUCapacityRefreshInterval: 1 * time.Millisecond,
+		CPUUsageMovingAverageAge:   20,
 	})
 
 	ctx, cancel := context.WithCancel(context.Background())

pkg/kv/kvserver/store_test.go

@@ -262,7 +262,12 @@ func createTestStoreWithoutStart(
 	stores := NewStores(cfg.AmbientCtx, cfg.Clock)
 	nodeDesc := &roachpb.NodeDescriptor{NodeID: 1}
 	if cfg.NodeCapacityProvider == nil {
-		cfg.NodeCapacityProvider = load.NewNodeCapacityProvider(stopper, stores, nil)
+		// Faster refresh intervals for testing.
+		cfg.NodeCapacityProvider = load.NewNodeCapacityProvider(stopper, stores, load.NodeCapacityProviderConfig{
+			CPUUsageRefreshInterval:    10 * time.Millisecond,
+			CPUCapacityRefreshInterval: 10 * time.Millisecond,
+			CPUUsageMovingAverageAge:   20,
+		})
 	}
 
 	rangeProv := &dummyFirstRangeProvider{}

pkg/server/server.go

@@ -128,7 +128,7 @@ import (
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/logtags"
 	"github.com/cockroachdb/redact"
-	sentry "github.com/getsentry/sentry-go"
+	"github.com/getsentry/sentry-go"
 	"google.golang.org/grpc/codes"
 )
 
@@ -690,14 +690,19 @@ func NewServer(cfg Config, stopper *stop.Stopper) (serverctl.ServerStartupInterf
 		policyRefresher = policyrefresher.NewPolicyRefresher(stopper, st, ctSender.GetLeaseholders,
 			rpcContext.RemoteClocks.AllLatencies, knobs)
 	}
-	var nodeCapacityProvider *load.NodeCapacityProvider
-	{
-		var knobs *load.NodeCapacityProviderTestingKnobs
-		if nodeCapacityProviderKnobs := cfg.TestingKnobs.NodeCapacityProviderKnobs; nodeCapacityProviderKnobs != nil {
-			knobs = nodeCapacityProviderKnobs.(*load.NodeCapacityProviderTestingKnobs)
-		}
-		nodeCapacityProvider = load.NewNodeCapacityProvider(stopper, stores, knobs)
+
+	cpuUsageRefreshInterval := base.DefaultCPUUsageRefreshInterval
+	cpuCapacityRefreshInterval := base.DefaultCPUCapacityRefreshInterval
+	if ncpKnobs, _ := cfg.TestingKnobs.NodeCapacityProviderKnobs.(*load.NodeCapacityProviderTestingKnobs); ncpKnobs != nil {
+		cpuUsageRefreshInterval = ncpKnobs.CpuUsageRefreshInterval
+		cpuCapacityRefreshInterval = ncpKnobs.CpuCapacityRefreshInterval
+	}
+	nodeCapacityProviderConfig := load.NodeCapacityProviderConfig{
+		CPUUsageRefreshInterval:    cpuUsageRefreshInterval,
+		CPUCapacityRefreshInterval: cpuCapacityRefreshInterval,
+		CPUUsageMovingAverageAge:   base.DefaultCPUUsageMovingAverageAge,
 	}
+	nodeCapacityProvider := load.NewNodeCapacityProvider(stopper, stores, nodeCapacityProviderConfig)
 
 	// The Executor will be further initialized later, as we create more
 	// of the server's components. There's a circular dependency - many things

pkg/sql/logictest/testdata/logic_test/citext

@@ -79,6 +79,84 @@ SELECT c FROM r WHERE c = ARRAY['tEsT', 'tEsTeR']::CITEXT[];
 ----
 {test,TESTER}
 
+subtest column_families
+
+statement ok
+DROP TABLE IF EXISTS t;
+
+statement ok
+CREATE TABLE t (
+  k INT PRIMARY KEY,
+  c CITEXT,
+  FAMILY (k),
+  FAMILY (c)
+)
+
+onlyif config schema-locked-disabled
+query TT colnames
+SHOW CREATE TABLE t
+----
+table_name  create_statement
+t           CREATE TABLE public.t (
+              k INT8 NOT NULL,
+              c CITEXT NULL,
+              CONSTRAINT t_pkey PRIMARY KEY (k ASC),
+              FAMILY fam_0_k (k),
+              FAMILY fam_1_c (c)
+            );
+
+statement ok
+INSERT INTO t VALUES (1, 'test')
+
+query T
+SELECT pg_typeof(c) FROM t LIMIT 1;
+----
+citext
+
+query T
+SELECT c FROM t WHERE c = 'tEsT';
+----
+test
+
+statement ok
+DROP TABLE IF EXISTS r;
+
+statement ok
+CREATE TABLE r (
+  k INT PRIMARY KEY,
+  c CITEXT[],
+  FAMILY (k),
+  FAMILY (c)
+)
+
+onlyif config schema-locked-disabled
+query TT colnames
+SHOW CREATE TABLE r
+----
+table_name  create_statement
+r           CREATE TABLE public.r (
+              k INT8 NOT NULL,
+              c CITEXT[] NULL,
+              CONSTRAINT r_pkey PRIMARY KEY (k ASC),
+              FAMILY fam_0_k (k),
+              FAMILY fam_1_c (c)
+            );
+
+statement ok
+INSERT INTO r VALUES (1, ARRAY['test', 'TESTER'])
+
+query T
+SELECT pg_typeof(c) FROM r LIMIT 1;
+----
+citext[]
+
+query T
+SELECT c FROM r WHERE c = ARRAY['tEsT', 'tEsTeR']::CITEXT[];
+----
+{test,TESTER}
+
+subtest end
+
 query error multiple COLLATE declarations
 CREATE TABLE s (c CITEXT COLLATE "en_US");
 
@@ -191,10 +269,10 @@ statement ok
 CREATE TYPE IF NOT EXISTS ctype AS (id INT, c CITEXT);
 
 statement ok
-CREATE TABLE composite_citext_tbl (a ctype);
+CREATE TABLE composite_citext_tbl (k INT PRIMARY KEY, a ctype);
 
 statement ok
-INSERT INTO composite_citext_tbl VALUES (ROW(1, 'TeSt')), (ROW(2, 'TESTER')), (ROW(3, 'tEsT'));
+INSERT INTO composite_citext_tbl VALUES (1, ROW(1, 'TeSt')), (2, ROW(2, 'TESTER')), (3, ROW(3, 'tEsT'));
 
 query T
 SELECT (a).c FROM composite_citext_tbl WHERE (a).c = 'test' ORDER BY (a).id;
@@ -214,3 +292,8 @@ query T
 SELECT cast('test'::TEXT AS CITEXT);
 ----
 test
+
+query T
+SELECT pg_collation_for('foo'::CITEXT);
+----
+"default"

pkg/sql/rowenc/valueside/legacy.go

@@ -9,6 +9,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/geo"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/lex"
+	"github.com/cockroachdb/cockroach/pkg/sql/oidext"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgrepl/lsn"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/sql/types"
@@ -195,6 +196,9 @@ func MarshalLegacy(colType *types.T, val tree.Datum) (roachpb.Value, error) {
 			return r, nil
 		}
 	case types.CollatedStringFamily:
+		if colType.Oid() == oidext.T_citext {
+			val = tree.UnwrapDOidWrapper(val)
+		}
 		if v, ok := val.(*tree.DCollatedString); ok {
 			if lex.LocaleNamesAreEqual(v.Locale, colType.Locale()) {
 				r.SetString(v.Contents)
@@ -354,6 +358,9 @@ func UnmarshalLegacy(a *tree.DatumAlloc, typ *types.T, value roachpb.Value) (tre
 		if err != nil {
 			return nil, err
 		}
+		if typ.Oid() == oidext.T_citext {
+			return a.NewDCIText(string(v))
+		}
 		return a.NewDCollatedString(string(v), typ.Locale())
 	case types.UuidFamily:
 		v, err := value.GetBytes()

pkg/sql/sem/builtins/pg_builtins.go

@@ -1013,13 +1013,18 @@ var pgBuiltins = map[string]builtinDefinition{
 			Types:      tree.ParamTypes{{Name: "str", Typ: types.AnyElement}},
 			ReturnType: tree.FixedReturnType(types.String),
 			Fn: func(_ context.Context, _ *eval.Context, args tree.Datums) (tree.Datum, error) {
+				d := args[0]
 				var collation string
-				switch t := args[0].(type) {
+				switch t := d.(type) {
 				case *tree.DString:
 					collation = "default"
 				case *tree.DCollatedString:
 					collation = t.Locale
 				default:
+					if w, ok := d.(*tree.DOidWrapper); ok && w.Oid == oidext.T_citext {
+						collation = "default"
+						break
+					}
 					return tree.DNull, pgerror.Newf(pgcode.DatatypeMismatch,
 						"collations are not supported by type: %s", t.ResolvedType())
 				}