Merge #146191 #147863 #147906

146191: sql: always use cput for ldr primary key writes r=jeffswenson a=jeffswenson

This change reworks the SQL layer so that it always uses a CPUT with an
origin timestamp if the LDR origin timestamp option is set. This change
allows the classic and crud SQL writers to correctly implement LWW in
the presence of tombstones.

Note: the classic SQL writer only depends on the CPUT when inserting or
upserting over a tombstone. The crud SQL writer relies on the CPut of
inserts, updates, and deletes.

Release note: none
Fixes: #146117

147863: Remove label-merged-pr command r=jlinder a=rail

This command is not used.

Release note: none
Epic: none

147906: workload/schemachange: allow self deps in tableHasDependencies for DROP TABLE r=spilchen a=spilchen

This is a follow-up from #147834, which didn't have a complete fix. It was flagging DROP TABLE as having a dependency, when in fact it had a self-dependency, but it doesn't block the DROP TABLE (seen in this occurrence #147514 (comment))

 
This change updates tableHasDependencies to optionally include self-referencing dependencies when skipSelfRef is false. This is needed for DROP TABLE, where self-dependencies (e.g., from triggers) are safe to ignore because they are cleaned up as part of the drop.

In contrast, RENAME TABLE must still block on these, since the dependent reference would not be updated by the rename.

The function now takes a skipSelfRef flag to distinguish these cases, and excludes only self-dependencies when skipSelfRef is true.

Informs #147514

Epic: None
Release note: none

Co-authored-by: Jeff Swenson <[email protected]>
Co-authored-by: Rail Aliiev <[email protected]>
Co-authored-by: Matt Spilchen <[email protected]>

Author: 4 people

pkg/BUILD.bazel

@@ -143,7 +143,6 @@ ALL_TESTS = [
     "//pkg/cmd/docs-issue-generation:docs-issue-generation_test",
     "//pkg/cmd/drtprod/cli/commands:commands_test",
     "//pkg/cmd/github-pull-request-make:github-pull-request-make_test",
-    "//pkg/cmd/label-merged-pr:label-merged-pr_test",
     "//pkg/cmd/microbench-ci:microbench-ci_test",
     "//pkg/cmd/mirror/go:go_test",
     "//pkg/cmd/publish-artifacts:publish-artifacts_test",
@@ -1183,9 +1182,6 @@ GO_TARGETS = [
     "//pkg/cmd/gossipsim:gossipsim",
     "//pkg/cmd/gossipsim:gossipsim_lib",
     "//pkg/cmd/import-tools:import-tools",
-    "//pkg/cmd/label-merged-pr:label-merged-pr",
-    "//pkg/cmd/label-merged-pr:label-merged-pr_lib",
-    "//pkg/cmd/label-merged-pr:label-merged-pr_test",
     "//pkg/cmd/microbench-ci:microbench-ci",
     "//pkg/cmd/microbench-ci:microbench-ci_lib",
     "//pkg/cmd/microbench-ci:microbench-ci_test",

pkg/cmd/dev/build.go

@@ -88,7 +88,6 @@ var buildTargetMapping = map[string]string{
 	"execgen":              "//pkg/sql/colexec/execgen/cmd/execgen:execgen",
 	"gofmt":                "@com_github_cockroachdb_gostdlib//cmd/gofmt:gofmt",
 	"goimports":            "@com_github_cockroachdb_gostdlib//x/tools/cmd/goimports:goimports",
-	"label-merged-pr":      "//pkg/cmd/label-merged-pr:label-merged-pr",
 	"geos":                 geosTarget,
 	"langgen":              "//pkg/sql/opt/optgen/cmd/langgen:langgen",
 	"libgeos":              geosTarget,