Merge pull request #140594 from cockroachdb/blathers/backport-release-25.1-140564

rafiss · web-flow · commit d414660c7bdd · 2025-02-06T12:06:10.000-05:00
release-25.1: catalog/externalcatalog: delete namespace entries during clean up
diff --git a/pkg/sql/catalog/externalcatalog/external_catalog.go b/pkg/sql/catalog/externalcatalog/external_catalog.go
@@ -256,6 +256,9 @@ func DropIngestedExternalCatalog(
 		if err := descsCol.WriteDescToBatch(ctx, kvTrace, t, b); err != nil {
 			return errors.Wrap(err, "writing dropping table to batch")
 		}
+		if err := descsCol.DeleteNamespaceEntryToBatch(ctx, kvTrace, t, b); err != nil {
+			return errors.Wrap(err, "writing namespace delete to batch")
+		}
 	}
 	return txn.KV().Run(ctx, b)
 }

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,9 @@ func DropIngestedExternalCatalog(`
`256`	`256`	`if err := descsCol.WriteDescToBatch(ctx, kvTrace, t, b); err != nil {`
`257`	`257`	`return errors.Wrap(err, "writing dropping table to batch")`
`258`	`258`	`}`
	`259`	`+ if err := descsCol.DeleteNamespaceEntryToBatch(ctx, kvTrace, t, b); err != nil {`
	`260`	`+ return errors.Wrap(err, "writing namespace delete to batch")`
	`261`	`+ }`
`259`	`262`	`}`
`260`	`263`	`return txn.KV().Run(ctx, b)`
`261`	`264`	`}`