sql: remove separate scanVisilibity struct

This commit removes `sql.scanVisibility` in favor of protobuf-generated
`execinfrapb.ScanVisibility`. It also introduces prettier aliases for
the two values into `execinfra` package that are now used throughout the
code.

Release note: None

pkg/sql/colexec/colbatch_scan.go

@@ -116,7 +116,7 @@ func newColBatchScan(
 
 	limitHint := execinfra.LimitHint(spec.LimitHint, post)
 
-	returnMutations := spec.Visibility == execinfrapb.ScanVisibility_PUBLIC_AND_NOT_PUBLIC
+	returnMutations := spec.Visibility == execinfra.ScanVisibilityPublicAndNotPublic
 	typs := spec.Table.ColumnTypesWithMutations(returnMutations)
 	evalCtx := flowCtx.NewEvalCtx()
 	// Before we can safely use types from the table descriptor, we need to
@@ -182,7 +182,7 @@ func initCRowFetcher(
 	}
 
 	cols := immutDesc.Columns
-	if scanVisibility == execinfrapb.ScanVisibility_PUBLIC_AND_NOT_PUBLIC {
+	if scanVisibility == execinfra.ScanVisibilityPublicAndNotPublic {
 		cols = immutDesc.ReadableColumns
 	}
 	tableArgs := row.FetcherTableArgs{

pkg/sql/colexec/execplan.go

@@ -650,7 +650,7 @@ func NewColOperator(
 			// still responsible for doing the cancellation check on their own while
 			// performing long operations.
 			result.Op = NewCancelChecker(result.Op)
-			returnMutations := core.TableReader.Visibility == execinfrapb.ScanVisibility_PUBLIC_AND_NOT_PUBLIC
+			returnMutations := core.TableReader.Visibility == execinfra.ScanVisibilityPublicAndNotPublic
 			result.ColumnTypes = core.TableReader.Table.ColumnTypesWithMutations(returnMutations)
 		case core.Aggregator != nil:
 			if err := checkNumIn(inputs, 1); err != nil {

pkg/sql/delete.go

@@ -176,9 +176,9 @@ func (d *deleteNode) processSourceRow(params runParams, sourceVals tree.Datums)
 	// If result rows need to be accumulated, do it.
 	if d.run.rows != nil {
 		// The new values can include all columns, the construction of the
-		// values has used publicAndNonPublicColumns so the values may
-		// contain additional columns for every newly dropped column not
-		// visible. We do not want them to be available for RETURNING.
+		// values has used execinfra.ScanVisibilityPublicAndNotPublic so the
+		// values may contain additional columns for every newly dropped column
+		// not visible. We do not want them to be available for RETURNING.
 		//
 		// d.run.rows.NumCols() is guaranteed to only contain the requested
 		// public columns.

pkg/sql/distsql_physical_planner.go

@@ -888,7 +888,7 @@ func initTableReaderSpec(
 		Table:             *n.desc.TableDesc(),
 		Reverse:           n.reverse,
 		IsCheck:           n.isCheck,
-		Visibility:        n.colCfg.visibility.toDistSQLScanVisibility(),
+		Visibility:        n.colCfg.visibility,
 		LockingStrength:   n.lockingStrength,
 		LockingWaitPolicy: n.lockingWaitPolicy,
 
@@ -926,14 +926,16 @@ func initTableReaderSpec(
 
 // scanNodeOrdinal returns the index of a column with the given ID.
 func tableOrdinal(
-	desc *sqlbase.ImmutableTableDescriptor, colID sqlbase.ColumnID, visibility scanVisibility,
+	desc *sqlbase.ImmutableTableDescriptor,
+	colID sqlbase.ColumnID,
+	visibility execinfrapb.ScanVisibility,
 ) int {
 	for i := range desc.Columns {
 		if desc.Columns[i].ID == colID {
 			return i
 		}
 	}
-	if visibility == publicAndNonPublicColumns {
+	if visibility == execinfra.ScanVisibilityPublicAndNotPublic {
 		offset := len(desc.Columns)
 		for i, col := range desc.MutationColumns() {
 			if col.ID == colID {
@@ -1107,7 +1109,7 @@ func (dsp *DistSQLPlanner) createTableReaders(
 	p.ResultRouters = make([]physicalplan.ProcessorIdx, len(spanPartitions))
 	p.Processors = make([]physicalplan.Processor, 0, len(spanPartitions))
 
-	returnMutations := n.colCfg.visibility == publicAndNonPublicColumns
+	returnMutations := n.colCfg.visibility == execinfra.ScanVisibilityPublicAndNotPublic
 
 	for i, sp := range spanPartitions {
 		var tr *execinfrapb.TableReaderSpec
@@ -1833,7 +1835,7 @@ func (dsp *DistSQLPlanner) createPlanForIndexJoin(
 	joinReaderSpec := execinfrapb.JoinReaderSpec{
 		Table:             *n.table.desc.TableDesc(),
 		IndexIdx:          0,
-		Visibility:        n.table.colCfg.visibility.toDistSQLScanVisibility(),
+		Visibility:        n.table.colCfg.visibility,
 		LockingStrength:   n.table.lockingStrength,
 		LockingWaitPolicy: n.table.lockingWaitPolicy,
 	}
@@ -1900,7 +1902,7 @@ func (dsp *DistSQLPlanner) createPlanForLookupJoin(
 	joinReaderSpec := execinfrapb.JoinReaderSpec{
 		Table:             *n.table.desc.TableDesc(),
 		Type:              n.joinType,
-		Visibility:        n.table.colCfg.visibility.toDistSQLScanVisibility(),
+		Visibility:        n.table.colCfg.visibility,
 		LockingStrength:   n.table.lockingStrength,
 		LockingWaitPolicy: n.table.lockingWaitPolicy,
 		MaintainOrdering:  len(n.reqOrdering) > 0,

pkg/sql/execinfra/scanbase.go

@@ -10,7 +10,10 @@
 
 package execinfra
 
-import "github.com/cockroachdb/cockroach/pkg/sql/sqlbase"
+import (
+	"github.com/cockroachdb/cockroach/pkg/sql/execinfrapb"
+	"github.com/cockroachdb/cockroach/pkg/sql/sqlbase"
+)
 
 // ParallelScanResultThreshold is the number of results up to which, if the
 // maximum number of results returned by a scan is known, the table reader
@@ -32,3 +35,9 @@ func ScanShouldLimitBatches(maxResults uint64, limitHint int64, flowCtx *FlowCtx
 	}
 	return true
 }
+
+// Prettier aliases for execinfrapb.ScanVisibility values.
+const (
+	ScanVisibilityPublic             = execinfrapb.ScanVisibility_PUBLIC
+	ScanVisibilityPublicAndNotPublic = execinfrapb.ScanVisibility_PUBLIC_AND_NOT_PUBLIC
+)