sqlbase: lift interface methods from SchemaDescriptor

Release note: None
ajwerner · Jun 8, 2020 · bc641f9 · bc641f9
1 parent 8b1ae3e
commit bc641f9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/pkg/sql/catalog/catalogkv/catalogkv.go b/pkg/sql/catalog/catalogkv/catalogkv.go
@@ -111,7 +111,7 @@ func GetDescriptorByID(
 	case typ != nil:
 		return sqlbase.NewImmutableTypeDescriptor(typ), nil
 	case schema != nil:
-		return schema, nil
+		return sqlbase.NewImmutableSchemaDescriptor(desc), nil
 	default:
 		return nil, nil
 	}

diff --git a/pkg/sql/sqlbase/schema_desc.go b/pkg/sql/sqlbase/schema_desc.go
@@ -65,42 +65,39 @@ func NewInitialSchemaDescriptor(id ID, name string) *ImmutableSchemaDescriptor {
 }
 
 // GetAuditMode implements the DescriptorProto interface.
-func (desc *SchemaDescriptor) GetAuditMode() TableDescriptor_AuditMode {
+func (desc *ImmutableSchemaDescriptor) GetAuditMode() TableDescriptor_AuditMode {
 	return TableDescriptor_DISABLED
 }
 
 // TypeName implements the DescriptorProto interface.
-func (desc *SchemaDescriptor) TypeName() string {
+func (desc *ImmutableSchemaDescriptor) TypeName() string {
 	return "schema"
 }
 
 // SchemaDesc implements the ObjectDescriptor interface.
-func (desc *SchemaDescriptor) DatabaseDesc() *DatabaseDescriptor {
+func (desc *ImmutableSchemaDescriptor) DatabaseDesc() *DatabaseDescriptor {
 	return nil
 }
 
 // SchemaDesc implements the ObjectDescriptor interface.
-func (desc *SchemaDescriptor) SchemaDesc() *SchemaDescriptor {
-	return desc
+func (desc *ImmutableSchemaDescriptor) SchemaDesc() *SchemaDescriptor {
+	return &desc.SchemaDescriptor
 }
 
 // TableDesc implements the ObjectDescriptor interface.
-func (desc *SchemaDescriptor) TableDesc() *TableDescriptor {
+func (desc *ImmutableSchemaDescriptor) TableDesc() *TableDescriptor {
 	return nil
 }
 
 // TypeDesc implements the ObjectDescriptor interface.
-func (desc *SchemaDescriptor) TypeDesc() *TypeDescriptor {
+func (desc *ImmutableSchemaDescriptor) TypeDesc() *TypeDescriptor {
 	return nil
 }
 
 // DescriptorProto wraps a SchemaDescriptor in a Descriptor.
-//
-// TODO(ajwerner): Lift this into the SchemaDescriptorInterface
-// implementations.
-func (desc *SchemaDescriptor) DescriptorProto() *Descriptor {
+func (desc *ImmutableSchemaDescriptor) DescriptorProto() *Descriptor {
 	return wrapDescriptor(desc)
 }
 
 // NameResolutionResult implements the ObjectDescriptor interface.
-func (desc *SchemaDescriptor) NameResolutionResult() {}
+func (desc *ImmutableSchemaDescriptor) NameResolutionResult() {}
diff --git a/pkg/sql/sqlbase/system_test.go b/pkg/sql/sqlbase/system_test.go
@@ -23,7 +23,7 @@ func TestShouldSplitAtDesc(t *testing.T) {
 		NewImmutableTableDescriptor(TableDescriptor{ViewQuery: "SELECT"}): false,
 		NewInitialDatabaseDescriptor(42, "db"):                            false,
 		NewMutableCreatedTypeDescriptor(&TypeDescriptor{}):                false,
-		&SchemaDescriptor{}: false,
+		NewImmutableSchemaDescriptor(SchemaDescriptor{}):                  false,
 	} {
 		var rawDesc roachpb.Value
 		require.NoError(t, rawDesc.SetProto(inner.DescriptorProto()))