Merge #93276 #93287 #93291

93276: changefeedccl: Add vmodule to cdc/bank r=miretskiy a=miretskiy

Turn up verbose level in cdc/bank test
to try to narrow down the cause of timeout in #92546

Epic: None

Release note: None

93287: sql/logic: deflake upsert test r=ajwerner a=ajwerner

See this [bors flake](https://teamcity.cockroachdb.com/buildConfiguration/Cockroach_BazelEssentialCi/7890844?showRootCauses=false&expandBuildChangesSection=true&expandBuildProblemsSection=true&expandBuildTestsSection=true)

Epic: none

Release note: None

93291: build: fix little typo in generated `DEPS.bzl` r=healthy-pod a=rickystewart

Epic: None
Release note: None

Co-authored-by: Yevgeniy Miretskiy <yevgeniy@cockroachlabs.com>
Co-authored-by: Andrew Werner <awerner32@gmail.com>
Co-authored-by: Ricky Stewart <rickybstewart@gmail.com>

DEPS.bzl

@@ -2,7 +2,7 @@ load("@bazel_gazelle//:deps.bzl", "go_repository")
 
 # PRO-TIP: You can inject temorary changes to any of these dependencies by
 # by pointing to an alternate remote to clone from. Delete the `sha256`,
-# `strip_prefix`, and ` + `urls` parameters, and add `vcs = "git"` as well as a
+# `strip_prefix`, and `urls` parameters, and add `vcs = "git"` as well as a
 # custom `remote` and `commit`. For example:
 #     go_repository(
 #        name = "com_github_cockroachdb_sentry_go",

pkg/cmd/mirror/mirror.go

@@ -337,7 +337,7 @@ func dumpNewDepsBzl(
 
 # PRO-TIP: You can inject temorary changes to any of these dependencies by
 # by pointing to an alternate remote to clone from. Delete the ` + "`sha256`" + `,
-# ` + "`strip_prefix`, and ` + `urls`" + ` parameters, and add ` + "`vcs = \"git\"`" + ` as well as a
+# ` + "`strip_prefix`, and `urls` parameters, and add `vcs = \"git\"`" + ` as well as a
 # custom ` + "`remote` and `commit`" + `. For example:
 #     go_repository(
 #        name = "com_github_cockroachdb_sentry_go",

pkg/cmd/roachtest/tests/cdc.go

@@ -547,7 +547,11 @@ func runCDCBank(ctx context.Context, t test.Test, c cluster.Cluster) {
 	crdbNodes, workloadNode, kafkaNode := c.Range(1, c.Spec().NodeCount-1), c.Node(c.Spec().NodeCount), c.Node(c.Spec().NodeCount)
 	c.Put(ctx, t.Cockroach(), "./cockroach", crdbNodes)
 	c.Put(ctx, t.DeprecatedWorkload(), "./workload", workloadNode)
-	c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings(), crdbNodes)
+	startOpts := option.DefaultStartOpts()
+	startOpts.RoachprodOpts.ExtraArgs = append(startOpts.RoachprodOpts.ExtraArgs,
+		"--vmodule=changefeed=2",
+	)
+	c.Start(ctx, t.L(), startOpts, install.MakeClusterSettings(), crdbNodes)
 
 	kafka, cleanup := setupKafka(ctx, t, c, kafkaNode)
 	defer cleanup()

pkg/sql/logictest/testdata/logic_test/upsert

@@ -1317,8 +1317,23 @@ INSERT INTO generated_as_id_t (a, b) VALUES (1, 10) ON CONFLICT (a) DO UPDATE SE
 statement ok
 INSERT INTO generated_as_id_t (a, c) VALUES (1, 10) ON CONFLICT DO NOTHING
 
-query III rowsort
-SELECT * FROM generated_as_id_t ORDER BY a
+
+# Do this fancy query to deal with the fact that transaction restarts on the
+# insert may change the sequence values used for columns b and c. This query
+# just ensures that they have the expected offset from each other.
+query III
+  SELECT a,
+         b - b_min + 1 AS b,
+         c - c_min + 1 AS c
+    FROM generated_as_id_t,
+         (
+              SELECT b AS b_min,
+                     c AS c_min
+                FROM generated_as_id_t
+            ORDER BY a ASC
+               LIMIT 1
+         )
+ORDER BY a
 ----
 1  1  1
 2  2  2