backupccl: remove index/bytes columns from backup/restore return stmt

pkg/backup/backup_job.go

@@ -1023,8 +1023,6 @@ func (b *backupResumer) ReportResults(ctx context.Context, resultsCh chan<- tree
 		tree.NewDString(string(jobs.StatusSucceeded)),
 		tree.NewDFloat(tree.DFloat(1.0)),
 		tree.NewDInt(tree.DInt(b.backupStats.Rows)),
-		tree.NewDInt(tree.DInt(b.backupStats.IndexEntries)),
-		tree.NewDInt(tree.DInt(b.backupStats.DataSize)),
 	}:
 		return nil
 	}

pkg/backup/backup_planning.go

@@ -376,7 +376,7 @@ func backupTypeCheck(
 	if detached {
 		header = jobs.DetachedJobExecutionResultHeader
 	} else {
-		header = jobs.BulkJobExecutionResultHeader
+		header = jobs.BackupRestoreJobResultHeader
 	}
 	if err := exprutil.TypeCheck(
 		ctx, "BACKUP", p.SemaCtx(),
@@ -740,7 +740,7 @@ func backupPlanHook(
 	if detached {
 		return fn, jobs.DetachedJobExecutionResultHeader, nil, false, nil
 	}
-	return fn, jobs.BulkJobExecutionResultHeader, nil, false, nil
+	return fn, jobs.BackupRestoreJobResultHeader, nil, false, nil
 }
 
 func logAndSanitizeKmsURIs(ctx context.Context, kmsURIs ...string) error {

pkg/backup/backup_test.go

@@ -853,17 +853,13 @@ func TestBackupRestoreNegativePrimaryKey(t *testing.T) {
 	sqlDB.Exec(t, `CREATE UNIQUE INDEX id2 ON data.bank (id)`)
 
 	var unused string
-	var exportedRows, exportedIndexEntries int
+	var exportedRows int
 	sqlDB.QueryRow(t, `BACKUP DATABASE data INTO $1`, localFoo+"/alteredPK").Scan(
-		&unused, &unused, &unused, &exportedRows, &exportedIndexEntries, &unused,
+		&unused, &unused, &unused, &exportedRows,
 	)
 	if exportedRows != numAccounts {
 		t.Fatalf("expected %d rows, got %d", numAccounts, exportedRows)
 	}
-	expectedIndexEntries := numAccounts * 2 // Indexes id2 and balance_idx
-	if exportedIndexEntries != expectedIndexEntries {
-		t.Fatalf("expected %d index entries, got %d", expectedIndexEntries, exportedIndexEntries)
-	}
 }
 
 func backupAndRestore(
@@ -893,9 +889,7 @@ func backupAndRestore(
 		})
 
 		var unused string
-		var exported struct {
-			rows, idx, bytes int64
-		}
+		var exportedRows int64
 
 		backupURIFmtString, backupURIArgs := uriFmtStringAndArgs(backupURIs, 0)
 		backupQuery := fmt.Sprintf("BACKUP DATABASE data INTO %s", backupURIFmtString)
@@ -907,19 +901,10 @@ func backupAndRestore(
 		}
 		queryArgs := append(backupURIArgs, kmsURIArgs...)
 		sqlDB.QueryRow(t, backupQuery, queryArgs...).Scan(
-			&unused, &unused, &unused, &exported.rows, &exported.idx, &exported.bytes,
+			&unused, &unused, &unused, &exportedRows,
 		)
-		// When numAccounts == 0, our approxBytes formula breaks down because
-		// backups of no data still contain the system.users and system.descriptor
-		// tables. Just skip the check in this case.
-		if numAccounts > 0 {
-			approxBytes := int64(backupRestoreRowPayloadSize * numAccounts)
-			if max := approxBytes * 3; exported.bytes < approxBytes || exported.bytes > max {
-				t.Errorf("expected data size in [%d,%d] but was %d", approxBytes, max, exported.bytes)
-			}
-		}
-		if expected := int64(numAccounts * 1); exported.rows != expected {
-			t.Fatalf("expected %d rows for %d accounts, got %d", expected, numAccounts, exported.rows)
+		if expected := int64(numAccounts * 1); exportedRows != expected {
+			t.Fatalf("expected %d rows for %d accounts, got %d", expected, numAccounts, exportedRows)
 		}
 
 		found := false
@@ -1011,22 +996,13 @@ func verifyRestoreData(
 ) {
 
 	var unused string
-	var restored struct {
-		rows, idx, bytes int64
-	}
+	var restoredRows int64
 	sqlDB.QueryRow(t, restoreQuery, restoreURIArgs...).Scan(
-		&unused, &unused, &unused, &restored.rows, &restored.idx, &restored.bytes,
+		&unused, &unused, &unused, &restoredRows,
 	)
 
-	approxBytes := int64(backupRestoreRowPayloadSize * numAccounts)
-	if max := approxBytes * 3; restored.bytes < approxBytes || restored.bytes > max {
-		t.Errorf("expected data size in [%d,%d] but was %d", approxBytes, max, restored.bytes)
-	}
-	if expected := int64(numAccounts); restored.rows != expected {
-		t.Fatalf("expected %d rows for %d accounts, got %d", expected, numAccounts, restored.rows)
-	}
-	if expected := int64(numAccounts); restored.idx != expected {
-		t.Fatalf("expected %d idx rows for %d accounts, got %d", expected, numAccounts, restored.idx)
+	if expected := int64(numAccounts); restoredRows != expected {
+		t.Fatalf("expected %d rows for %d accounts, got %d", expected, numAccounts, restoredRows)
 	}
 
 	var rowCount int64
@@ -8675,8 +8651,7 @@ func TestRestoreJobEventLogging(t *testing.T) {
 
 	var jobID int64
 	var unused interface{}
-	sqlDB.QueryRow(t, restoreQuery).Scan(&jobID, &unused, &unused, &unused, &unused,
-		&unused)
+	sqlDB.QueryRow(t, restoreQuery).Scan(&jobID, &unused, &unused, &unused)
 
 	expectedStatus := []string{string(jobs.StatusSucceeded), string(jobs.StatusRunning)}
 	expectedRecoveryEvent := eventpb.RecoveryEvent{

pkg/backup/backuptestutils/testutils.go

@@ -225,7 +225,7 @@ func VerifyBackupRestoreStatementResult(
 		return err
 	}
 	if a, e := columns, []string{
-		"job_id", "status", "fraction_completed", "rows", "index_entries", "bytes",
+		"job_id", "status", "fraction_completed", "rows",
 	}; !reflect.DeepEqual(e, a) {
 		return errors.Errorf("unexpected columns:\n%s", strings.Join(pretty.Diff(e, a), "\n"))
 	}
@@ -247,7 +247,7 @@ func VerifyBackupRestoreStatementResult(
 		return errors.New("zero rows in result")
 	}
 	if err := rows.Scan(
-		&actualJob.id, &actualJob.status, &actualJob.fractionCompleted, &unused, &unused, &unused,
+		&actualJob.id, &actualJob.status, &actualJob.fractionCompleted, &unused,
 	); err != nil {
 		return err
 	}

pkg/backup/restore_job.go

@@ -2195,8 +2195,6 @@ func (r *restoreResumer) ReportResults(ctx context.Context, resultsCh chan<- tre
 				tree.NewDString(string(jobs.StatusSucceeded)),
 				tree.NewDFloat(tree.DFloat(1.0)),
 				tree.NewDInt(tree.DInt(r.restoreStats.Rows)),
-				tree.NewDInt(tree.DInt(r.restoreStats.IndexEntries)),
-				tree.NewDInt(tree.DInt(r.restoreStats.DataSize)),
 			}
 		}
 	}():

pkg/backup/restore_old_sequences_test.go

@@ -90,7 +90,7 @@ func restoreOldSequencesTest(exportDir string, isSchemaOnly bool) func(t *testin
 			restoreQuery = restoreQuery + ", schema_only"
 		}
 		sqlDB.QueryRow(t, restoreQuery, localFoo).Scan(
-			&unused, &unused, &unused, &importedRows, &unused, &unused,
+			&unused, &unused, &unused, &importedRows,
 		)
 		totalRows := 4
 		if isSchemaOnly {

pkg/backup/restore_planning.go

@@ -1189,7 +1189,7 @@ func restoreTypeCheck(
 	} else if restoreStmt.Options.ExperimentalOnline {
 		header = jobs.OnlineRestoreJobExecutionResultHeader
 	} else {
-		header = jobs.BulkJobExecutionResultHeader
+		header = jobs.BackupRestoreJobResultHeader
 	}
 	return true, header, nil
 }
@@ -1426,7 +1426,7 @@ func restorePlanHook(
 	} else if restoreStmt.Options.ExperimentalOnline {
 		header = jobs.OnlineRestoreJobExecutionResultHeader
 	} else {
-		header = jobs.BulkJobExecutionResultHeader
+		header = jobs.BackupRestoreJobResultHeader
 	}
 	return fn, header, nil, false, nil
 }

pkg/ccl/telemetryccl/telemetry_logging_test.go

@@ -358,8 +358,10 @@ func TestBulkJobTelemetryLogging(t *testing.T) {
 
 		if strings.Contains(tc.query, "WITH detached") {
 			err = db.DB.QueryRowContext(ctx, tc.query).Scan(&jobID)
-		} else {
+		} else if strings.HasPrefix(tc.query, "IMPORT") {
 			err = db.DB.QueryRowContext(ctx, tc.query).Scan(&jobID, &unused, &unused, &unused, &unused, &unused)
+		} else {
+			err = db.DB.QueryRowContext(ctx, tc.query).Scan(&jobID, &unused, &unused, &unused)
 		}
 		if err != nil {
 			t.Errorf("unexpected error executing query `%s`: %v", tc.query, err)

pkg/jobs/resultcols.go

@@ -21,6 +21,13 @@ var BulkJobExecutionResultHeader = colinfo.ResultColumns{
 	{Name: "bytes", Typ: types.Int},
 }
 
+var BackupRestoreJobResultHeader = colinfo.ResultColumns{
+	{Name: "job_id", Typ: types.Int},
+	{Name: "status", Typ: types.String},
+	{Name: "fraction_completed", Typ: types.Float},
+	{Name: "rows", Typ: types.Int},
+}
+
 // OnlineRestoreJobExecutionResultHeader is the header for an online restore
 // job, which provides a header different from the usual bulk job execution
 var OnlineRestoreJobExecutionResultHeader = colinfo.ResultColumns{
@@ -31,7 +38,7 @@ var OnlineRestoreJobExecutionResultHeader = colinfo.ResultColumns{
 	{Name: "background_download_job_id", Typ: types.Int},
 }
 
-// DetachedJobExecutionResultHeader is a the header for various job commands when
+// DetachedJobExecutionResultHeader is the header for various job commands when
 // job executes in detached mode (i.e. the caller doesn't wait for job completion).
 var DetachedJobExecutionResultHeader = colinfo.ResultColumns{
 	{Name: "job_id", Typ: types.Int},