Merge #71754 #72280

71754: backupccl: remove some used code r=adityamaru a=stevendanna

The baseURI variable was used by a function call that was removed in
28e4cea. The TODO still seems
relevant.

Release note: None

72280: sql: clarify !IsCanonical path wrt scan.ExactPrefix r=cucaroach a=cucaroach

Passing scan.ExactPrefix with other indexes is a little confusing, make
it clear that for non-canonical scans exactPrefix will always be zero.

Release note: None

Co-authored-by: Steven Danna <[email protected]>
Co-authored-by: Tommy Reilly <[email protected]>

pkg/ccl/backupccl/backup_planning.go

@@ -1160,19 +1160,16 @@ func backupPlanHook(
 		if err := checkForPreviousBackup(ctx, defaultStore, defaultURI); err != nil {
 			return err
 		}
-		// TODO (pbardea): For partitioned backups, also add verification for other
-		// stores we are writing to in addition to the default.
-		baseURI := collectionURI
-		if baseURI == "" {
-			baseURI = defaultURI
-		}
 
 		// Write backup manifest into a temporary checkpoint file.
 		// This accomplishes 2 purposes:
 		//  1. Persists large state needed for backup job completion.
 		//  2. Verifies we can write to destination location.
 		// This temporary checkpoint file gets renamed to real checkpoint
 		// file when the backup jobs starts execution.
+		//
+		// TODO (pbardea): For partitioned backups, also add verification for other
+		// stores we are writing to in addition to the default.
 		doWriteBackupManifestCheckpoint := func(ctx context.Context, jobID jobspb.JobID) error {
 			if err := writeBackupManifest(
 				ctx, p.ExecCfg().Settings, defaultStore, tempCheckpointFileNameForJob(jobID),

pkg/sql/opt/ordering/interesting_orderings.go

@@ -108,7 +108,8 @@ func interestingOrderingsForScan(scan *memo.ScanExpr) props.OrderingSet {
 		// the table's indexes. Add orderings for all of them.
 		ord = make(props.OrderingSet, 0, tab.IndexCount())
 		for i := 0; i < tab.IndexCount(); i++ {
-			addIndexOrdering(i, &scan.Relational().FuncDeps, scan.ExactPrefix)
+			// IsCanonical implies no constraints so exactPrefix is 0.
+			addIndexOrdering(i, &scan.Relational().FuncDeps, 0)
 		}
 	} else {
 		// This scan is not canonical, so we can only use the ordering implied by