catprivilege: remove special cases for cluster restore

Release note: none.
cockroachdb · Aug 11, 2022 · b008287 · b008287
1 parent 71d277b
commit b008287
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 37 deletions.
diff --git a/pkg/ccl/backupccl/BUILD.bazel b/pkg/ccl/backupccl/BUILD.bazel
@@ -227,7 +227,6 @@ go_test(
         "//pkg/sql/catalog",
         "//pkg/sql/catalog/bootstrap",
         "//pkg/sql/catalog/catalogkeys",
-        "//pkg/sql/catalog/catprivilege",
         "//pkg/sql/catalog/descpb",
         "//pkg/sql/catalog/descs",
         "//pkg/sql/catalog/desctestutils",

diff --git a/pkg/ccl/backupccl/datadriven_test.go b/pkg/ccl/backupccl/datadriven_test.go
@@ -27,7 +27,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catalogkeys"
-	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catprivilege"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/systemschema"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/tabledesc"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
@@ -663,8 +662,7 @@ func TestDataDriven(t *testing.T) {
 					}
 					mut := dummyTable.NewBuilder().BuildCreatedMutable().(*tabledesc.Mutable)
 					mut.ID = id
-					mut.Name = fmt.Sprintf("%s_%d",
-						catprivilege.RestoreCopySystemTablePrefix, id)
+					mut.Name = fmt.Sprintf("%s_%d", "crdb_internal_copy", id)
 					tKey := catalogkeys.EncodeNameKey(codec, mut)
 					b := txn.NewBatch()
 					b.CPut(tKey, mut.GetID(), nil)

diff --git a/pkg/sql/catalog/catprivilege/fix.go b/pkg/sql/catalog/catprivilege/fix.go
@@ -11,9 +11,6 @@
 package catprivilege
 
 import (
-	"strings"
-
-	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/security/username"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
@@ -88,15 +85,6 @@ func MaybeFixPrivileges(
 	if systemPrivs != nil {
 		// System databases and tables have custom maximum allowed privileges.
 		allowedPrivilegesBits = systemPrivs.ToBitField()
-	} else if parentID == keys.SystemDatabaseID && strings.Contains(objectName, RestoreCopySystemTablePrefix) {
-		// Cluster restores move certain system tables to a higher ID to prevent
-		// conflicts with non-system descriptors that are going to be restored. The
-		// newly created tables in the system database must be given ReadWrite
-		// privileges to satisfy descriptor validation.
-		//
-		// TODO(adityamaru,dt): Remove once we fix the handling of dynamic system
-		// table IDs during restore.
-		allowedPrivilegesBits = privilege.ReadWriteData.ToBitField()
 	}
 
 	changed := false

diff --git a/pkg/sql/catalog/catprivilege/system.go b/pkg/sql/catalog/catprivilege/system.go
@@ -66,14 +66,7 @@ var (
 		catconstants.SystemExternalConnectionsTableName,
 	}
 
-	// RestoreCopySystemTablePrefix is the prefix of the table name that we give
-	// to the copy of the system table we are moving to a higher ID during
-	// restore.
-	//
-	// TODO(adityamaru,dt): Remove once we fix the handling of dynamic system
-	// table IDs during restore.
-	RestoreCopySystemTablePrefix = "crdb_internal_copy"
-	readWriteSystemSequences     = []catconstants.SystemTableName{
+	readWriteSystemSequences = []catconstants.SystemTableName{
 		catconstants.RoleIDSequenceName,
 	}
 

diff --git a/pkg/sql/catalog/catprivilege/validate.go b/pkg/sql/catalog/catprivilege/validate.go
@@ -12,9 +12,7 @@ package catprivilege
 
 import (
 	"reflect"
-	"strings"
 
-	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/privilege"
@@ -56,17 +54,6 @@ func allowedSuperuserPrivileges(objectNameKey catalog.NameKey) privilege.List {
 	if privs != nil {
 		return privs
 	}
-	// Cluster restores move certain system tables to a higher ID to prevent
-	// conflicts with non-system descriptors that are going to be restored. The
-	// newly created tables in the system database will be given ReadWrite
-	// privileges.
-	//
-	// TODO(adityamaru,dt): Remove once we fix the handling of dynamic system
-	// table IDs during restore.
-	if objectNameKey.GetParentID() == keys.SystemDatabaseID &&
-		strings.Contains(objectNameKey.GetName(), RestoreCopySystemTablePrefix) {
-		return privilege.ReadWriteData
-	}
 	return catpb.DefaultSuperuserPrivileges
 }