From 6d2adef45c121b59d77514bb6f53b7b55c7a18f3 Mon Sep 17 00:00:00 2001
From: wlwilliamx <53336371+wlwilliamx@users.noreply.github.com>
Date: Mon, 8 Jun 2026 13:11:56 +0800
Subject: [PATCH 1/2] This is an automated cherry-pick of #4278

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
---
 pkg/sink/sqlmodel/row_change_test.go          |   6 +-
 .../_utils/start_tidb_cluster_nextgen         |  51 ++-
 .../start_tls_tidb_cluster_impl_nextgen       |  20 +-
 .../_utils/stop_tidb_cluster                  |   4 +
 tools/workload/schema/bank3/bank.go           | 366 ++++++++++++++++++
 5 files changed, 413 insertions(+), 34 deletions(-)
 create mode 100644 tools/workload/schema/bank3/bank.go

diff --git a/pkg/sink/sqlmodel/row_change_test.go b/pkg/sink/sqlmodel/row_change_test.go
index f6d67c5e27..ee9fe2d5a5 100644
--- a/pkg/sink/sqlmodel/row_change_test.go
+++ b/pkg/sink/sqlmodel/row_change_test.go
@@ -275,9 +275,9 @@ func (s *dpanicSuite) TestGenUpdate() {
 func (s *dpanicSuite) TestExpressionIndex() {
 	source := &common.TableName{Schema: "db", Table: "tb1"}
 	sql := `CREATE TABLE tb1 (
-    	id INT PRIMARY KEY,
-    	j JSON,
-    	UNIQUE KEY j_index ((cast(json_extract(j,'$[*]') as signed array)), id)
+    id INT PRIMARY KEY,
+    j JSON,
+    UNIQUE KEY j_index ((cast(json_extract(j,'$[*]') as signed array)), id)
 )`
 	ti := mockTableInfo(s.T(), sql)
 	change := NewRowChange(source, nil, nil, []interface{}{1, `[1,2,3]`, nil}, ti, nil, nil)
diff --git a/tests/integration_tests/_utils/start_tidb_cluster_nextgen b/tests/integration_tests/_utils/start_tidb_cluster_nextgen
index 2f91b3af27..189f1d71a6 100755
--- a/tests/integration_tests/_utils/start_tidb_cluster_nextgen
+++ b/tests/integration_tests/_utils/start_tidb_cluster_nextgen
@@ -13,8 +13,10 @@ TEST_DATA_DIR="$CASE_DIR/$TEST_OUT_DATA_DIR"
 
 echo "TEST_DATA_DIR: $TEST_DATA_DIR"
 
-# Random generate the sockets config.
-# Make sure we dont use the same sock.
+# Random generate the `socket` config for TiDB.
+# TiDB parses `socket = ...` as a root-level key. Our generated config ends with
+# `[instance]`, so appending `socket = ...` at the end would become `instance.socket`,
+# which is rejected by newer TiDB versions (and makes TiDB fail to start).
 randomGenSocketsConf() {
 	config_file="$1"
 	random_str=$(date '+%s%N')
@@ -22,7 +24,13 @@ randomGenSocketsConf() {
 		random_str=$(cat /dev/random | LC_ALL=C tr -dc "a-zA-Z0-9" | head -c 10)
 	fi
 
-	echo "socket = \"/tmp/tidb-$random_str.sock\"" >>"$config_file"
+	# Prepend the root-level `socket` and drop any existing `socket = ...` lines
+	# (old scripts appended it under `[instance]`, which becomes `instance.socket`).
+	{
+		echo "socket = \"/tmp/tidb-$random_str.sock\""
+		sed '/^[[:space:]]*socket[[:space:]]*=/d' "$config_file"
+	} >"$config_file.tmp"
+	mv "$config_file.tmp" "$config_file"
 }
 
 check_bin() {
@@ -350,6 +358,13 @@ check_port_available "$DOWN_TIKV_WORKER_HOST" "$DOWN_TIKV_WORKER_PORT" "Downstre
 echo "Waiting for next-gen keyspace pre-allocation to settle..."
 sleep 30
 
+<<<<<<< HEAD
+=======
+# NOTE: TiDB config keys are section-sensitive. Keep `socket` and
+# `max-server-connections` at root level, and keep tuning knobs like
+# `run-auto-analyze` / `server-memory-quota` under `[performance]`. Otherwise
+# TiDB will report "invalid configuration options" and silently ignore them.
+>>>>>>> bef9fba03 (tests: fix next gen integration TiDB startup flakiness (#4278))
 touch "$OUT_DIR/upstream-tidb-system.toml"
 if [ -f "$tidb_config" ]; then
 	cat "$tidb_config" >>"$OUT_DIR/upstream-tidb-system.toml"
@@ -359,9 +374,7 @@ cat >>"$OUT_DIR/upstream-tidb-system.toml" <<EOF
 keyspace-name = "SYSTEM"
 enable-telemetry = false
 mem-quota-query = 671088640
-run-auto-analyze = false
-server-memory-quota = 2684354560
-analyze-always-skip-wide-columns = true
+max-server-connections = 0
 tikv-worker-url = "http://$UP_TIKV_WORKER_HOST:$UP_TIKV_WORKER_PORT"
 # temp-dir = "$TEST_DATA_DIR/upstream/tidb-system"
 
@@ -370,13 +383,14 @@ max-backups = 100
 
 [performance]
 tcp-keep-alive = true
+run-auto-analyze = false
+server-memory-quota = 2684354560
 
 [security]
 enable-sem = false
 
 [instance]
 tidb_service_scope = 'dxf_service'
-max-server-connections = 0
 EOF
 
 touch "$OUT_DIR/upstream-tidb-$KEYSPACE_NAME.toml"
@@ -388,9 +402,7 @@ cat >>"$OUT_DIR/upstream-tidb-$KEYSPACE_NAME.toml" <<EOF
 keyspace-name = "$KEYSPACE_NAME"
 enable-telemetry = false
 mem-quota-query = 671088640
-run-auto-analyze = false
-server-memory-quota = 2684354560
-analyze-always-skip-wide-columns = true
+max-server-connections = 0
 # temp-dir = "$TEST_DATA_DIR/upstream/tidb-$KEYSPACE_NAME"
 
 [log.file]
@@ -398,12 +410,12 @@ max-backups = 100
 
 [performance]
 tcp-keep-alive = true
+run-auto-analyze = false
+server-memory-quota = 2684354560
 
 [security]
 enable-sem = false
 
-[instance]
-max-server-connections = 0
 EOF
 
 cp "$OUT_DIR/upstream-tidb-$KEYSPACE_NAME.toml" "$OUT_DIR/upstream-tidb-$KEYSPACE_NAME-other.toml"
@@ -417,9 +429,7 @@ cat >>"$OUT_DIR/downstream-tidb-system.toml" <<EOF
 keyspace-name = "SYSTEM"
 enable-telemetry = false
 mem-quota-query = 671088640
-run-auto-analyze = false
-server-memory-quota = 2684354560
-analyze-always-skip-wide-columns = true
+max-server-connections = 0
 tikv-worker-url = "http://$DOWN_TIKV_WORKER_HOST:$DOWN_TIKV_WORKER_PORT"
 # temp-dir = "$TEST_DATA_DIR/downstream/tidb-system"
 
@@ -428,13 +438,14 @@ max-backups = 100
 
 [performance]
 tcp-keep-alive = true
+run-auto-analyze = false
+server-memory-quota = 2684354560
 
 [security]
 enable-sem = false
 
 [instance]
 tidb_service_scope = 'dxf_service'
-max-server-connections = 0
 EOF
 
 touch "$OUT_DIR/downstream-tidb-$KEYSPACE_NAME.toml"
@@ -446,9 +457,7 @@ cat >>"$OUT_DIR/downstream-tidb-$KEYSPACE_NAME.toml" <<EOF
 keyspace-name = "$KEYSPACE_NAME"
 enable-telemetry = false
 mem-quota-query = 671088640
-run-auto-analyze = false
-server-memory-quota = 2684354560
-analyze-always-skip-wide-columns = true
+max-server-connections = 0
 # temp-dir = "$TEST_DATA_DIR/downstream/tidb-$KEYSPACE_NAME"
 
 [log.file]
@@ -456,12 +465,12 @@ max-backups = 100
 
 [performance]
 tcp-keep-alive = true
+run-auto-analyze = false
+server-memory-quota = 2684354560
 
 [security]
 enable-sem = false
 
-[instance]
-max-server-connections = 0
 EOF
 
 echo "Starting upstream system TiDB"
diff --git a/tests/integration_tests/_utils/start_tls_tidb_cluster_impl_nextgen b/tests/integration_tests/_utils/start_tls_tidb_cluster_impl_nextgen
index bb799e9b51..72e6bd7b16 100755
--- a/tests/integration_tests/_utils/start_tls_tidb_cluster_impl_nextgen
+++ b/tests/integration_tests/_utils/start_tls_tidb_cluster_impl_nextgen
@@ -115,15 +115,17 @@ key-path = "$TLS_DIR/server-key.pem"
 EOF
 
 # system tidb server config file
+# NOTE: TiDB config keys are section-sensitive. Keep `socket` and
+# `max-server-connections` at root level, and keep tuning knobs like
+# `run-auto-analyze` / `server-memory-quota` under `[performance]`. Otherwise
+# TiDB will report "invalid configuration options" and silently ignore them.
 cat - >"$OUT_DIR/tidb-system-config-tls.toml" <<EOF
 socket = "/tmp/tidb-system-tls.sock"
 keyspace-name = "SYSTEM"
 enable-telemetry = false
 mem-quota-query = 671088640
 new_collations_enabled_on_first_bootstrap = true
-run-auto-analyze = false
-server-memory-quota = 2684354560
-analyze-always-skip-wide-columns = true
+max-server-connections = 0
 tikv-worker-url = "http://$UP_TIKV_WORKER_HOST:$UP_TIKV_WORKER_PORT"
 
 [log.file]
@@ -131,10 +133,11 @@ max-backups = 100
 
 [performance]
 tcp-keep-alive = true
+run-auto-analyze = false
+server-memory-quota = 2684354560
 
 [instance]
 tidb_service_scope = 'dxf_service'
-max-server-connections = 0
 
 [security]
 enable-sem = false
@@ -152,18 +155,15 @@ keyspace-name = "$KEYSPACE_NAME"
 enable-telemetry = false
 mem-quota-query = 671088640
 new_collations_enabled_on_first_bootstrap = true
-run-auto-analyze = false
-server-memory-quota = 2684354560
-analyze-always-skip-wide-columns = true
+max-server-connections = 0
 
 [log.file]
 max-backups = 100
 
 [performance]
 tcp-keep-alive = true
-
-[instance]
-max-server-connections = 0
+run-auto-analyze = false
+server-memory-quota = 2684354560
 
 [security]
 enable-sem = false
diff --git a/tests/integration_tests/_utils/stop_tidb_cluster b/tests/integration_tests/_utils/stop_tidb_cluster
index 44663f0db5..4d9d6a4c9f 100755
--- a/tests/integration_tests/_utils/stop_tidb_cluster
+++ b/tests/integration_tests/_utils/stop_tidb_cluster
@@ -2,6 +2,9 @@
 
 # cdc server is ran by binary cdc.test, kill cdc server first to avoid too much
 # noise in cdc logs.
+#
+# Also kill sink consumer binaries started by integration tests to avoid leaking
+# background processes across cases/groups.
 
 PKILL="killall -q -w -s 9 "
 if [ "$(uname)" == "Darwin" ]; then
@@ -11,6 +14,7 @@ fi
 ${PKILL} cdc.test || true
 ${PKILL} cdc || true
 ${PKILL} cdc_kafka_consumer || true
+${PKILL} cdc_pulsar_consumer || true
 ${PKILL} cdc_storage_consumer || true
 ${PKILL} tidb-server || true
 ${PKILL} tikv-server || true
diff --git a/tools/workload/schema/bank3/bank.go b/tools/workload/schema/bank3/bank.go
new file mode 100644
index 0000000000..734633fc87
--- /dev/null
+++ b/tools/workload/schema/bank3/bank.go
@@ -0,0 +1,366 @@
+// Copyright 2026 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bank
+
+import (
+	"bytes"
+	"fmt"
+	"math/rand"
+
+	"workload/schema"
+)
+
+const createBankTableBase = `
+create table if not exists bank_%d (
+  col1 varchar(3) DEFAULT NULL,
+  col2 varchar(2) DEFAULT NULL,
+  col3 varchar(180) NOT NULL,
+  col4 datetime NOT NULL,
+  col5 varchar(2) DEFAULT NULL,
+  col6 varchar(90) DEFAULT NULL,
+  col7 varchar(2) DEFAULT NULL,
+  col8 varchar(60) DEFAULT NULL,
+  col9 varchar(14) DEFAULT NULL,
+  col10 decimal(2,0) DEFAULT NULL,
+  col11 decimal(4,0) DEFAULT NULL,
+  col12 varchar(60) DEFAULT NULL,
+  col13 decimal(2,0) DEFAULT NULL,
+  col14 varchar(18) DEFAULT NULL,
+  col15 varchar(14) DEFAULT NULL,
+  col16 varchar(20) DEFAULT NULL,
+  col17 varchar(180) DEFAULT NULL,
+  col18 varchar(1) DEFAULT NULL,
+  col19 varchar(1) DEFAULT NULL,
+  col20 varchar(1) DEFAULT NULL,
+  col21 varchar(80) DEFAULT NULL,
+  col22 varchar(4) DEFAULT NULL,
+  col23 decimal(15,0) DEFAULT NULL,
+  col24 varchar(5) DEFAULT NULL,
+  col25 varchar(26) DEFAULT NULL,
+  col26 varchar(2) DEFAULT NULL,
+  col27 datetime DEFAULT NULL,
+  col28 decimal(3,0) DEFAULT NULL,
+  col29 decimal(3,0) DEFAULT NULL,
+  col30 decimal(3,0) DEFAULT NULL,
+  auto_id bigint(20) NOT NULL AUTO_INCREMENT,
+  KEY idx1 (col14),
+  KEY idx2 (col27,col24,col22),
+  KEY idx3 (col3,col24,col4),
+  KEY idx4 (col21,col23),
+  KEY idx5 (col15),
+  PRIMARY KEY (auto_id,col3,col4) /*T![clustered_index] NONCLUSTERED */,
+  KEY idx6 (col3)
+) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin
+`
+
+const createBankTablePartition = `PARTITION BY RANGE COLUMNS(col4)
+(PARTITION p_202107 VALUES LESS THAN ('2021-08-01'),
+ PARTITION p_202108 VALUES LESS THAN ('2021-09-01'),
+ PARTITION p_202109 VALUES LESS THAN ('2021-10-01'),
+ PARTITION p_202110 VALUES LESS THAN ('2021-11-01'),
+ PARTITION p_202111 VALUES LESS THAN ('2021-12-01'),
+ PARTITION p_202112 VALUES LESS THAN ('2022-01-01'),
+ PARTITION p_202201 VALUES LESS THAN ('2022-02-01'),
+ PARTITION p_202202 VALUES LESS THAN ('2022-03-01'),
+ PARTITION p_202203 VALUES LESS THAN ('2022-04-01'),
+ PARTITION p_202204 VALUES LESS THAN ('2022-05-01'),
+ PARTITION p_202205 VALUES LESS THAN ('2022-06-01'),
+ PARTITION p_202206 VALUES LESS THAN ('2022-07-01'),
+ PARTITION p_202207 VALUES LESS THAN ('2022-08-01'),
+ PARTITION p_202208 VALUES LESS THAN ('2022-09-01'),
+ PARTITION p_202209 VALUES LESS THAN ('2022-10-01'),
+ PARTITION p_202210 VALUES LESS THAN ('2022-11-01'),
+ PARTITION p_202211 VALUES LESS THAN ('2022-12-01'),
+ PARTITION p_202212 VALUES LESS THAN ('2023-01-01'),
+ PARTITION p_202301 VALUES LESS THAN ('2023-02-01'),
+ PARTITION p_202302 VALUES LESS THAN ('2023-03-01'),
+ PARTITION p_202303 VALUES LESS THAN ('2023-04-01'),
+ PARTITION p_202304 VALUES LESS THAN ('2023-05-01'),
+ PARTITION p_202305 VALUES LESS THAN ('2023-06-01'),
+ PARTITION p_202306 VALUES LESS THAN ('2023-07-01'),
+ PARTITION p_202307 VALUES LESS THAN ('2023-08-01'),
+ PARTITION p_202308 VALUES LESS THAN ('2023-09-01'),
+ PARTITION p_202309 VALUES LESS THAN ('2023-10-01'),
+ PARTITION p_202310 VALUES LESS THAN ('2023-11-01'),
+ PARTITION p_202311 VALUES LESS THAN ('2023-12-01'),
+ PARTITION p_202312 VALUES LESS THAN ('2024-01-01'),
+ PARTITION p_202401 VALUES LESS THAN ('2024-02-01'),
+ PARTITION p_202402 VALUES LESS THAN ('2024-03-01'),
+ PARTITION p_202403 VALUES LESS THAN ('2024-04-01'),
+ PARTITION p_202404 VALUES LESS THAN ('2024-05-01'),
+ PARTITION p_202405 VALUES LESS THAN ('2024-06-01'),
+ PARTITION p_202406 VALUES LESS THAN ('2024-07-01'),
+ PARTITION p_202407 VALUES LESS THAN ('2024-08-01'),
+ PARTITION p_202408 VALUES LESS THAN ('2024-09-01'),
+ PARTITION p_202409 VALUES LESS THAN ('2024-10-01'),
+ PARTITION p_202410 VALUES LESS THAN ('2024-11-01'),
+ PARTITION p_202411 VALUES LESS THAN ('2024-12-01'),
+ PARTITION p_202412 VALUES LESS THAN ('2025-01-01'),
+ PARTITION p_202501 VALUES LESS THAN ('2025-02-01'),
+ PARTITION p_202502 VALUES LESS THAN ('2025-03-01'),
+ PARTITION p_202503 VALUES LESS THAN ('2025-04-01'),
+ PARTITION p_202504 VALUES LESS THAN ('2025-05-01'),
+ PARTITION p_202505 VALUES LESS THAN ('2025-06-01'),
+ PARTITION p_202506 VALUES LESS THAN ('2025-07-01'),
+ PARTITION p_202507 VALUES LESS THAN ('2025-08-01'),
+ PARTITION p_202508 VALUES LESS THAN ('2025-09-01'),
+ PARTITION p_202509 VALUES LESS THAN ('2025-10-01'),
+ PARTITION p_202510 VALUES LESS THAN ('2025-11-01'),
+ PARTITION p_202511 VALUES LESS THAN ('2025-12-01'),
+ PARTITION p_202512 VALUES LESS THAN ('2026-01-01'),
+ PARTITION p_202601 VALUES LESS THAN ('2026-02-01'),
+ PARTITION p_202602 VALUES LESS THAN ('2026-03-01'),
+ PARTITION p_202603 VALUES LESS THAN ('2026-04-01'),
+ PARTITION p_202604 VALUES LESS THAN ('2026-05-01'),
+ PARTITION p_202605 VALUES LESS THAN ('2026-06-01'),
+ PARTITION p_202606 VALUES LESS THAN ('2026-07-01'),
+ PARTITION p_202607 VALUES LESS THAN ('2026-08-01'),
+ PARTITION p_202608 VALUES LESS THAN ('2026-09-01'),
+ PARTITION p_202609 VALUES LESS THAN ('2026-10-01'),
+ PARTITION p_202610 VALUES LESS THAN ('2026-11-01'),
+ PARTITION p_202611 VALUES LESS THAN ('2026-12-01'),
+ PARTITION p_202612 VALUES LESS THAN ('2027-01-01'),
+ PARTITION p_202701 VALUES LESS THAN ('2027-02-01'),
+ PARTITION p_202702 VALUES LESS THAN ('2027-03-01'),
+ PARTITION p_202703 VALUES LESS THAN ('2027-04-01'))
+`
+
+type BankWorkload struct {
+	isPartitioned bool
+}
+
+func NewBankWorkload(isPartitioned bool) schema.Workload {
+	return &BankWorkload{isPartitioned: isPartitioned}
+}
+
+func (c *BankWorkload) BuildCreateTableStatement(n int) string {
+	createSQL := fmt.Sprintf(createBankTableBase, n)
+	if c.isPartitioned {
+		return createSQL + createBankTablePartition + ";"
+	}
+	return createSQL + ";"
+}
+
+func (c *BankWorkload) BuildInsertSql(tableN int, batchSize int) string {
+	if batchSize <= 0 {
+		return ""
+	}
+
+	tableName := getBankTableName(tableN)
+	var buf bytes.Buffer
+	buf.WriteString(fmt.Sprintf(
+		"insert into %s (col1,col2,col3,col4,col5,col6,col7,col8,col9,col10,col11,col12,col13,col14,col15,col16,col17,col18,col19,col20,col21,col22,col23,col24,col25,col26,col27,col28,col29,col30) values",
+		tableName,
+	))
+
+	for i := 0; i < batchSize; i++ {
+		if i > 0 {
+			buf.WriteString(",")
+		}
+
+		n := rand.Int63()
+		col1Value := "A01"
+		col2Value := "B2"
+		col3Value := fmt.Sprintf("acct-%d", n)
+		col4Value := randomBankDatetime()
+
+		col5Value := fmt.Sprintf("%02d", rand.Intn(100))
+		col6Value := fmt.Sprintf("desc-%d", n%1000000)
+		col7Value := fmt.Sprintf("%02d", rand.Intn(100))
+		col8Value := fmt.Sprintf("branch-%d", n%1000000)
+		col9Value := fmt.Sprintf("%014d", n%100000000000000)
+		col10Value := rand.Intn(100)
+		col11Value := rand.Intn(10000)
+		col12Value := fmt.Sprintf("note-%d", n%1000000)
+		col13Value := rand.Intn(100)
+		col14Value := "acct"
+		col15Value := fmt.Sprintf("i%013d", n%10000000000000)
+		col16Value := fmt.Sprintf("type-%d", n%100000)
+		col17Value := fmt.Sprintf("memo-%d", n)
+		col18Value := fmt.Sprintf("%d", rand.Intn(2))
+		col19Value := fmt.Sprintf("%d", rand.Intn(2))
+		col20Value := fmt.Sprintf("%d", rand.Intn(2))
+		col21Value := fmt.Sprintf("customer-%d", n%1000000)
+		col22Value := "A001"
+		col23Value := n % 1000000000000000
+		col24Value := "B0001"
+		col25Value := fmt.Sprintf("ref-%d", n%1000000000000000000)
+		col26Value := "E1"
+		col27Value := randomBankDatetime()
+		col28Value := rand.Intn(1000)
+		col29Value := rand.Intn(1000)
+		col30Value := rand.Intn(1000)
+
+		buf.WriteString(fmt.Sprintf(
+			"('%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d,'%s',%d,'%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,'%s','%s','%s','%s',%d,%d,%d)",
+			col1Value,
+			col2Value,
+			col3Value,
+			col4Value,
+			col5Value,
+			col6Value,
+			col7Value,
+			col8Value,
+			col9Value,
+			col10Value,
+			col11Value,
+			col12Value,
+			col13Value,
+			col14Value,
+			col15Value,
+			col16Value,
+			col17Value,
+			col18Value,
+			col19Value,
+			col20Value,
+			col21Value,
+			col22Value,
+			col23Value,
+			col24Value,
+			col25Value,
+			col26Value,
+			col27Value,
+			col28Value,
+			col29Value,
+			col30Value,
+		))
+	}
+	return buf.String()
+}
+
+func (c *BankWorkload) BuildUpdateSql(opts schema.UpdateOption) string {
+	if opts.Batch <= 0 {
+		return ""
+	}
+
+	tableName := getBankTableName(opts.TableIndex)
+	startTime, endTime := randomBankMonthRange()
+	newCol30 := rand.Intn(1000)
+	newCol15 := fmt.Sprintf("u%013d", rand.Int63n(10000000000000))
+	newCol27 := randomBankDatetime()
+
+	return fmt.Sprintf(
+		`UPDATE %[1]s
+SET col30 = %[2]d, col15 = '%[3]s', col27 = '%[4]s'
+WHERE auto_id IN (
+  SELECT auto_id FROM (
+    SELECT auto_id FROM %[1]s
+    WHERE col4 >= '%[5]s' AND col4 < '%[6]s'
+    ORDER BY auto_id DESC LIMIT %[7]d
+  ) t
+)`,
+		tableName,
+		newCol30,
+		newCol15,
+		newCol27,
+		startTime,
+		endTime,
+		opts.Batch,
+	)
+}
+
+func (c *BankWorkload) BuildDeleteSql(opts schema.DeleteOption) string {
+	if opts.Batch <= 0 {
+		return ""
+	}
+
+	deleteType := rand.Intn(3)
+	tableName := getBankTableName(opts.TableIndex)
+
+	switch deleteType {
+	case 0:
+		// Strategy 1: Delete the newest rows by auto_id
+		return fmt.Sprintf(
+			`DELETE FROM %[1]s
+WHERE auto_id IN (
+  SELECT auto_id FROM (
+    SELECT auto_id FROM %[1]s ORDER BY auto_id DESC LIMIT %[2]d
+  ) t
+)`,
+			tableName, opts.Batch,
+		)
+
+	case 1:
+		// Strategy 2: Range delete by partition key (col4)
+		startTime, endTime := randomBankMonthRange()
+		return fmt.Sprintf(
+			"DELETE FROM %s WHERE col4 >= '%s' AND col4 < '%s' LIMIT %d",
+			tableName, startTime, endTime, opts.Batch,
+		)
+
+	case 2:
+		// Strategy 3: Conditional delete by indexed columns
+		return fmt.Sprintf(
+			"DELETE FROM %s WHERE col14 = 'acct' AND col22 = 'A001' LIMIT %d",
+			tableName, opts.Batch,
+		)
+
+	default:
+		return ""
+	}
+}
+
+func (c *BankWorkload) BuildDDLSql(opts schema.DDLOption) string {
+	tableName := getBankTableName(opts.TableIndex)
+	return fmt.Sprintf("truncate table %s;", tableName)
+}
+
+func getBankTableName(n int) string {
+	return fmt.Sprintf("bank_%d", n)
+}
+
+func randomBankDatetime() string {
+	// bank partitions cover [< 2027-04-01), so keep generated timestamps within [2021-07, 2027-03].
+	const (
+		startYear  = 2021
+		startMonth = 7
+		endYear    = 2027
+		endMonth   = 3
+	)
+	startTotal := startYear*12 + (startMonth - 1)
+	endTotal := endYear*12 + (endMonth - 1)
+
+	total := startTotal + rand.Intn(endTotal-startTotal+1)
+	year := total / 12
+	month := total%12 + 1
+
+	day := rand.Intn(28) + 1
+	hour := rand.Intn(24)
+	minute := rand.Intn(60)
+	second := rand.Intn(60)
+	return fmt.Sprintf("%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, minute, second)
+}
+
+func randomBankMonthRange() (start string, end string) {
+	// Align with the partition boundary to increase the chance of partition pruning.
+	const (
+		startYear  = 2021
+		startMonth = 7
+		endYear    = 2027
+		endMonth   = 3
+	)
+	startTotal := startYear*12 + (startMonth - 1)
+	endTotal := endYear*12 + (endMonth - 1)
+
+	total := startTotal + rand.Intn(endTotal-startTotal+1)
+	year := total / 12
+	month := total%12 + 1
+	start = fmt.Sprintf("%04d-%02d-01 00:00:00", year, month)
+
+	next := total + 1
+	endYearValue := next / 12
+	endMonthValue := next%12 + 1
+	end = fmt.Sprintf("%04d-%02d-01 00:00:00", endYearValue, endMonthValue)
+	return start, end
+}

From 140bce04707eecee4396a5e3b2735223180f79e7 Mon Sep 17 00:00:00 2001
From: wlwilliamx <wlwilliamx@gmail.com>
Date: Thu, 11 Jun 2026 11:35:58 +0800
Subject: [PATCH 2/2] tests: resolve nextgen startup cherry-pick conflict

Signed-off-by: wlwilliamx <wlwilliamx@gmail.com>
---
 tests/integration_tests/_utils/start_tidb_cluster_nextgen | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/integration_tests/_utils/start_tidb_cluster_nextgen b/tests/integration_tests/_utils/start_tidb_cluster_nextgen
index 189f1d71a6..fee2547fcd 100755
--- a/tests/integration_tests/_utils/start_tidb_cluster_nextgen
+++ b/tests/integration_tests/_utils/start_tidb_cluster_nextgen
@@ -358,13 +358,10 @@ check_port_available "$DOWN_TIKV_WORKER_HOST" "$DOWN_TIKV_WORKER_PORT" "Downstre
 echo "Waiting for next-gen keyspace pre-allocation to settle..."
 sleep 30
 
-<<<<<<< HEAD
-=======
 # NOTE: TiDB config keys are section-sensitive. Keep `socket` and
 # `max-server-connections` at root level, and keep tuning knobs like
 # `run-auto-analyze` / `server-memory-quota` under `[performance]`. Otherwise
 # TiDB will report "invalid configuration options" and silently ignore them.
->>>>>>> bef9fba03 (tests: fix next gen integration TiDB startup flakiness (#4278))
 touch "$OUT_DIR/upstream-tidb-system.toml"
 if [ -f "$tidb_config" ]; then
 	cat "$tidb_config" >>"$OUT_DIR/upstream-tidb-system.toml"