Merge #49555 #49559

49555: sql/catalog: rename ObjectDescriptor to Descriptor r=lucy-zhang,rohany a=ajwerner We're trying to define Object as a member of a schema. Today that's not really true because Objects are currently members of databases and not schemas but we'll get there. Descriptor is the general term for all entities which are in the catalog, resolvable by a name, and live in the descriptor table. Release note: None 49559: workload: rename leftover vectorize option 'auto' to 'on' r=yuzefovich a=yuzefovich Release note: None Co-authored-by: Andrew Werner <[email protected]> Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · May 26, 2020 · e3f2142 · e3f2142
3 parents 33a86b2 + 873fe5e + dc2583e
commit e3f2142
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/pkg/sql/catalog/accessor.go b/pkg/sql/catalog/accessor.go
@@ -40,5 +40,5 @@ type Accessor interface {
 	// descriptor and that of its parent database. If the object is not
 	// found and flags.required is true, an error is returned, otherwise
 	// a nil reference is returned.
-	GetObjectDesc(ctx context.Context, txn *kv.Txn, settings *cluster.Settings, codec keys.SQLCodec, db, schema, object string, flags tree.ObjectLookupFlags) (ObjectDescriptor, error)
+	GetObjectDesc(ctx context.Context, txn *kv.Txn, settings *cluster.Settings, codec keys.SQLCodec, db, schema, object string, flags tree.ObjectLookupFlags) (Descriptor, error)
 }
diff --git a/pkg/sql/catalog/accessors/logical_schema_accessors.go b/pkg/sql/catalog/accessors/logical_schema_accessors.go
@@ -95,7 +95,7 @@ func (l *LogicalSchemaAccessor) GetObjectDesc(
 	codec keys.SQLCodec,
 	db, schema, object string,
 	flags tree.ObjectLookupFlags,
-) (catalog.ObjectDescriptor, error) {
+) (catalog.Descriptor, error) {
 	switch flags.DesiredObjectKind {
 	case tree.TypeObject:
 		// TODO(ajwerner): Change this function if we ever expose non-table objects

diff --git a/pkg/sql/catalog/accessors/physical_schema_accessors.go b/pkg/sql/catalog/accessors/physical_schema_accessors.go
@@ -110,7 +110,7 @@ func (a *CachedPhysicalAccessor) GetObjectDesc(
 	codec keys.SQLCodec,
 	db, schema, object string,
 	flags tree.ObjectLookupFlags,
-) (catalog.ObjectDescriptor, error) {
+) (catalog.Descriptor, error) {
 	switch flags.DesiredObjectKind {
 	case tree.TypeObject:
 		// TypeObjects are not caches so fall through to the underlying physical

diff --git a/pkg/sql/catalog/catalog.go b/pkg/sql/catalog/catalog.go
@@ -15,8 +15,8 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/sqlbase"
 )
 
-// ObjectDescriptor provides table information for results from a name lookup.
-type ObjectDescriptor interface {
+// Descriptor provides table information for results from a name lookup.
+type Descriptor interface {
 	tree.NameResolutionResult
 
 	// DatabaseDesc returns the underlying database descriptor, or nil if the
@@ -43,15 +43,15 @@ type VirtualSchemas interface {
 
 // VirtualSchema represents a collection of VirtualObjects.
 type VirtualSchema interface {
-	Desc() ObjectDescriptor
+	Desc() Descriptor
 	NumTables() int
 	VisitTables(func(object VirtualObject))
 	GetObjectByName(name string) (VirtualObject, error)
 }
 
 // VirtualObject is a virtual schema object.
 type VirtualObject interface {
-	Desc() ObjectDescriptor
+	Desc() Descriptor
 }
 
 // TableEntry is the value type of FkTableMetadata: An optional table

diff --git a/pkg/sql/catalog/catalogkv/physical_accessor.go b/pkg/sql/catalog/catalogkv/physical_accessor.go
@@ -161,7 +161,7 @@ func (a UncachedPhysicalAccessor) GetObjectDesc(
 	codec keys.SQLCodec,
 	db, schema, object string,
 	flags tree.ObjectLookupFlags,
-) (catalog.ObjectDescriptor, error) {
+) (catalog.Descriptor, error) {
 	// Look up the database ID.
 	dbID, err := GetDatabaseID(ctx, txn, codec, db, flags.Required)
 	if err != nil || dbID == sqlbase.InvalidID {

diff --git a/pkg/sql/catalog/resolver/resolver.go b/pkg/sql/catalog/resolver/resolver.go
@@ -144,7 +144,7 @@ func ResolveExistingObject(
 		return nil, prefix, nil
 	}
 
-	obj := descI.(catalog.ObjectDescriptor)
+	obj := descI.(catalog.Descriptor)
 	switch lookupFlags.DesiredObjectKind {
 	case tree.TypeObject:
 		if obj.TypeDesc() == nil {

diff --git a/pkg/sql/virtual_schema.go b/pkg/sql/virtual_schema.go
@@ -290,7 +290,7 @@ type virtualSchemaEntry struct {
 	allTableNames   map[string]struct{}
 }
 
-func (v virtualSchemaEntry) Desc() catalog.ObjectDescriptor {
+func (v virtualSchemaEntry) Desc() catalog.Descriptor {
 	return v.desc
 }
 
@@ -322,7 +322,7 @@ type virtualDefEntry struct {
 	validWithNoDatabaseContext bool
 }
 
-func (e virtualDefEntry) Desc() catalog.ObjectDescriptor {
+func (e virtualDefEntry) Desc() catalog.Descriptor {
 	return sqlbase.NewImmutableTableDescriptor(*e.desc)
 }
 

diff --git a/pkg/workload/tpcds/tpcds.go b/pkg/workload/tpcds/tpcds.go
@@ -66,7 +66,7 @@ var tpcdsMeta = workload.Meta{
 				`Note that --queries-to-omit flag has a higher precedence`)
 		g.flags.DurationVar(&g.queryTimeLimit, `query-time-limit`, 5*time.Minute,
 			`Time limit for a single run of a query`)
-		g.flags.StringVar(&g.vectorize, `vectorize`, `auto`,
+		g.flags.StringVar(&g.vectorize, `vectorize`, `on`,
 			`Set vectorize session variable`)
 		g.connFlags = workload.NewConnFlags(&g.flags)
 		return g

diff --git a/pkg/workload/tpch/tpch.go b/pkg/workload/tpch/tpch.go
@@ -105,7 +105,7 @@ var tpchMeta = workload.Meta{
 		g.flags.BoolVar(&g.disableChecks, `disable-checks`, false,
 			"Disable checking the output against the expected rows (default false). "+
 				"Note that the checks are only supported for scale factor 1")
-		g.flags.StringVar(&g.vectorize, `vectorize`, `auto`,
+		g.flags.StringVar(&g.vectorize, `vectorize`, `on`,
 			`Set vectorize session variable`)
 		g.flags.BoolVar(&g.verbose, `verbose`, false,
 			`Prints out the queries being run as well as histograms`)