tree: remove DOidWrapper support for DInt

Initially, in 9c9b045, when we added
DOidWrapper thingy in the first place, we supported Oid type using it.
Soon afterwards in d2526b3 we
introduced separate DOid datum to support the Oid type, so we removed
that usage of DOidWrapper, which made the relevant code redundant. This
commit removes it.

Release note: None

Author: yuzefovich

pkg/backup/compaction_job.go

@@ -161,11 +161,11 @@ func maybeStartCompactionJob(
 		if err != nil {
 			return err
 		}
-		idDatum, ok := tree.AsDInt(datums[0])
+		idDatum, ok := datums[0].(*tree.DInt)
 		if !ok {
 			return errors.Newf("expected job ID: unexpected result type %T", datums[0])
 		}
-		jobID = jobspb.JobID(idDatum)
+		jobID = jobspb.JobID(*idDatum)
 
 		scheduledJob := jobs.ScheduledJobTxn(txn)
 		backupSchedule, args, err := getScheduledBackupExecutionArgsFromSchedule(

pkg/backup/schedule_exec.go

@@ -544,12 +544,12 @@ func getBackupFnTelemetry(
 			return jobspb.BackupDetails{}, errors.New("expected job ID as first column of result")
 		}
 
-		jobID, ok := tree.AsDInt(jobIDDatum)
+		jobID, ok := jobIDDatum.(*tree.DInt)
 		if !ok {
 			return jobspb.BackupDetails{}, errors.New("expected job ID as first column of result")
 		}
 
-		job, err := registry.LoadJobWithTxn(ctx, jobspb.JobID(jobID), txn)
+		job, err := registry.LoadJobWithTxn(ctx, jobspb.JobID(*jobID), txn)
 		if err != nil {
 			return jobspb.BackupDetails{}, errors.Wrap(err, "failed to load dry-run backup job")
 		}

pkg/crosscluster/logical/sql_row_reader.go

@@ -116,7 +116,7 @@ func (r *sqlRowReader) ReadRows(
 			return nil, errors.AssertionFailedf("expected %d columns, got %d", len(r.columns)+3, len(row))
 		}
 
-		rowIndex, ok := tree.AsDInt(row[0])
+		rowIndex, ok := row[0].(*tree.DInt)
 		if !ok {
 			return nil, errors.AssertionFailedf("expected column 0 to be the row index")
 		}
@@ -138,7 +138,7 @@ func (r *sqlRowReader) ReadRows(
 			return nil, err
 		}
 
-		result[int(rowIndex)-1] = priorRow{
+		result[int(*rowIndex)-1] = priorRow{
 			row:              row[prefixColumns:],
 			logicalTimestamp: logicalTimestamp,
 			isLocal:          isLocal,

pkg/jobs/utils.go

@@ -171,11 +171,11 @@ func JobCoordinatorID(
 	if row == nil {
 		return 0, errors.Errorf("coordinator not found for job %d", jobID)
 	}
-	coordinatorID, ok := tree.AsDInt(row[0])
+	coordinatorID, ok := row[0].(*tree.DInt)
 	if !ok {
 		return 0, errors.AssertionFailedf("expected coordinator ID to be an int, got %T", row[0])
 	}
-	return int32(coordinatorID), nil
+	return int32(*coordinatorID), nil
 }
 
 // getJobTypeStrs is a helper function that returns a string representation of

pkg/multitenant/mtinfo/info.go

@@ -36,11 +36,11 @@ func GetTenantInfoFromSQLRow(
 	}
 	info = &mtinfopb.TenantInfo{}
 
-	idval, ok := tree.AsDInt(row[0])
+	idval, ok := row[0].(*tree.DInt)
 	if !ok {
 		return tid, nil, errors.AssertionFailedf("tenant ID: expected int, got %T", row[0])
 	}
-	tid, err = roachpb.MakeTenantID(uint64(idval))
+	tid, err = roachpb.MakeTenantID(uint64(*idval))
 	if err != nil {
 		return tid, nil, errors.NewAssertionErrorWithWrappedErrf(err, "%v", idval)
 	}
@@ -92,14 +92,14 @@ func GetTenantInfoFromSQLRow(
 		return tid, nil, errors.AssertionFailedf("%v: unhandled: %d", tid, info.ProtoInfo.DeprecatedDataState)
 	}
 	if len(row) > 3 && row[3] != tree.DNull {
-		val, ok := tree.AsDInt(row[3])
+		val, ok := row[3].(*tree.DInt)
 		if !ok {
 			return tid, nil, errors.AssertionFailedf("%v: data state: expected int, got %T", tid, row[3])
 		}
-		if val < 0 || mtinfopb.TenantDataState(val) > mtinfopb.MaxDataState {
+		if *val < 0 || mtinfopb.TenantDataState(*val) > mtinfopb.MaxDataState {
 			return tid, nil, errors.AssertionFailedf("%v: invalid data state: %d", tid, val)
 		} else {
-			info.DataState = mtinfopb.TenantDataState(val)
+			info.DataState = mtinfopb.TenantDataState(*val)
 		}
 	}
 
@@ -112,14 +112,14 @@ func GetTenantInfoFromSQLRow(
 		info.ServiceMode = mtinfopb.ServiceModeNone
 	}
 	if len(row) > 4 && row[4] != tree.DNull {
-		val, ok := tree.AsDInt(row[4])
+		val, ok := row[4].(*tree.DInt)
 		if !ok {
 			return tid, nil, errors.AssertionFailedf("%v: service mode: expected int, got %T", tid, row[4])
 		}
-		if val < 0 || mtinfopb.TenantServiceMode(val) > mtinfopb.MaxServiceMode {
+		if *val < 0 || mtinfopb.TenantServiceMode(*val) > mtinfopb.MaxServiceMode {
 			return tid, nil, errors.AssertionFailedf("%v: invalid service mode: %d", tid, val)
 		} else {
-			info.ServiceMode = mtinfopb.TenantServiceMode(val)
+			info.ServiceMode = mtinfopb.TenantServiceMode(*val)
 		}
 	}
 

pkg/server/admin.go

@@ -3510,11 +3510,11 @@ func (rs resultScanner) ScanIndex(row tree.Datums, index int, dst interface{}) e
 		*d = &val
 
 	case *int64:
-		s, ok := tree.AsDInt(src)
+		s, ok := src.(*tree.DInt)
 		if !ok {
 			return errors.Errorf("source type assertion failed")
 		}
-		*d = int64(s)
+		*d = int64(*s)
 
 	case **int64:
 		s, ok := src.(*tree.DInt)
@@ -3534,11 +3534,11 @@ func (rs resultScanner) ScanIndex(row tree.Datums, index int, dst interface{}) e
 			return errors.Errorf("source type assertion failed")
 		}
 		for i := 0; i < s.Len(); i++ {
-			id, ok := tree.AsDInt(s.Array[i])
+			id, ok := s.Array[i].(*tree.DInt)
 			if !ok {
 				return errors.Errorf("source type assertion failed on index %d", i)
 			}
-			*d = append(*d, int64(id))
+			*d = append(*d, int64(*id))
 		}
 
 	case *[]descpb.ID:
@@ -3547,11 +3547,11 @@ func (rs resultScanner) ScanIndex(row tree.Datums, index int, dst interface{}) e
 			return errors.Errorf("source type assertion failed")
 		}
 		for i := 0; i < s.Len(); i++ {
-			id, ok := tree.AsDInt(s.Array[i])
+			id, ok := s.Array[i].(*tree.DInt)
 			if !ok {
 				return errors.Errorf("source type assertion failed on index %d", i)
 			}
-			*d = append(*d, descpb.ID(id))
+			*d = append(*d, descpb.ID(*id))
 		}
 
 	case *time.Time:

pkg/sql/catalog/schematelemetry/schematelemetrycontroller/controller.go

@@ -270,9 +270,9 @@ func GetSchemaTelemetryScheduleID(
 		return 0, errors.AssertionFailedf("unexpectedly received %d columns", len(row))
 	}
 	// Defensively check the type.
-	v, ok := tree.AsDInt(row[0])
+	v, ok := row[0].(*tree.DInt)
 	if !ok {
 		return 0, errors.AssertionFailedf("unexpectedly received non-integer value %v", row[0])
 	}
-	return jobspb.ScheduleID(v), nil
+	return jobspb.ScheduleID(*v), nil
 }

pkg/sql/control_jobs.go

@@ -61,12 +61,12 @@ func (n *controlJobsNode) startExec(params runParams) error {
 			continue
 		}
 
-		jobID, ok := tree.AsDInt(jobIDDatum)
+		jobID, ok := jobIDDatum.(*tree.DInt)
 		if !ok {
 			return errors.AssertionFailedf("%q: expected *DInt, found %T", jobIDDatum, jobIDDatum)
 		}
 
-		if err := reg.UpdateJobWithTxn(params.ctx, jobspb.JobID(jobID), params.p.InternalSQLTxn(),
+		if err := reg.UpdateJobWithTxn(params.ctx, jobspb.JobID(*jobID), params.p.InternalSQLTxn(),
 			func(txn isql.Txn, md jobs.JobMetadata, ju *jobs.JobUpdater) error {
 				if err := jobsauth.Authorize(params.ctx, params.p,
 					md.ID, md.Payload.UsernameProto.Decode(), jobsauth.ControlAccess, globalPrivileges); err != nil {

pkg/sql/crdb_internal.go

@@ -7940,8 +7940,8 @@ CREATE TABLE crdb_internal.cluster_locks (
 	indexes: []virtualIndex{
 		{
 			populate: genPopulateClusterLocksWithIndex("table_id" /* idxColumnName */, func(filters *clusterLocksFilters, idxConstraint tree.Datum) {
-				if tableID, ok := tree.AsDInt(idxConstraint); ok {
-					filters.tableID = (*int64)(&tableID)
+				if tableID, ok := idxConstraint.(*tree.DInt); ok {
+					filters.tableID = (*int64)(tableID)
 				}
 			}),
 		},

pkg/sql/paramparse/paramparse.go

@@ -100,15 +100,15 @@ func DatumAsInt(
 	if err != nil {
 		return 0, err
 	}
-	iv, ok := tree.AsDInt(val)
+	iv, ok := val.(*tree.DInt)
 	if !ok {
 		err = pgerror.Newf(pgcode.InvalidParameterValue,
 			"parameter %q requires an integer value", name)
 		err = errors.WithDetailf(err,
 			"%s is a %s", value, errors.Safe(val.ResolvedType()))
 		return 0, err
 	}
-	return int64(iv), nil
+	return int64(*iv), nil
 }
 
 // DatumAsString transforms a tree.TypedExpr containing a Datum into a string.