kvpb: removed disused Path field from ExportResp

Release note: none. Epic: none.
cockroachdb · Nov 18, 2024 · d15a257 · d15a257
1 parent 83f3395
commit d15a257
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/pkg/ccl/backupccl/backup_processor.go b/pkg/ccl/backupccl/backup_processor.go
@@ -682,7 +682,6 @@ func runBackupProcessor(
 								// on-disk anywhere yet.
 								metadata: backuppb.BackupManifest_File{
 									Span:                    file.Span,
-									Path:                    file.Path,
 									EntryCounts:             entryCounts,
 									LocalityKV:              destLocalityKV,
 									ApproximatePhysicalSize: uint64(len(file.SST)),

diff --git a/pkg/kv/kvpb/api.proto b/pkg/kv/kvpb/api.proto
@@ -1954,7 +1954,7 @@ message ExportResponse {
         (gogoproto.nullable) = false,
         (gogoproto.customname) = "EndKeyTS"
     ];
-    string path = 2;
+    reserved 2;
 
     BulkOpSummary exported = 6 [(gogoproto.nullable) = false];
 

diff --git a/pkg/kv/kvserver/batcheval/cmd_export_test.go b/pkg/kv/kvserver/batcheval/cmd_export_test.go
@@ -76,16 +76,16 @@ func TestExportCmd(t *testing.T) {
 
 	exportAndSlurpOne := func(
 		t *testing.T, start hlc.Timestamp, mvccFilter kvpb.MVCCFilter, maxResponseSSTBytes int64,
-	) ([]string, []storage.MVCCKeyValue, kvpb.ResponseHeader) {
+	) (int, []storage.MVCCKeyValue, kvpb.ResponseHeader) {
 		res, pErr := export(t, start, mvccFilter, maxResponseSSTBytes)
 		if pErr != nil {
 			t.Fatalf("%+v", pErr)
 		}
 
-		var paths []string
+		var files int
 		var kvs []storage.MVCCKeyValue
 		for _, file := range res.(*kvpb.ExportResponse).Files {
-			paths = append(paths, file.Path)
+			files++
 			iterOpts := storage.IterOptions{
 				KeyTypes:   storage.IterKeyTypePointsOnly,
 				LowerBound: keys.LocalMax,
@@ -116,13 +116,13 @@ func TestExportCmd(t *testing.T) {
 			}
 		}
 
-		return paths, kvs, res.(*kvpb.ExportResponse).Header()
+		return files, kvs, res.(*kvpb.ExportResponse).Header()
 	}
 	type ExportAndSlurpResult struct {
 		end                      hlc.Timestamp
-		mvccLatestFiles          []string
+		mvccLatestFiles          int
 		mvccLatestKVs            []storage.MVCCKeyValue
-		mvccAllFiles             []string
+		mvccAllFiles             int
 		mvccAllKVs               []storage.MVCCKeyValue
 		mvccLatestResponseHeader kvpb.ResponseHeader
 		mvccAllResponseHeader    kvpb.ResponseHeader
@@ -143,9 +143,9 @@ func TestExportCmd(t *testing.T) {
 		mvccLatestFilesLen int, mvccLatestKVsLen int, mvccAllFilesLen int, mvccAllKVsLen int,
 	) {
 		t.Helper()
-		require.Len(t, res.mvccLatestFiles, mvccLatestFilesLen, "unexpected files in latest export")
+		require.Equal(t, res.mvccLatestFiles, mvccLatestFilesLen, "unexpected files in latest export")
 		require.Len(t, res.mvccLatestKVs, mvccLatestKVsLen, "unexpected kvs in latest export")
-		require.Len(t, res.mvccAllFiles, mvccAllFilesLen, "unexpected files in all export")
+		require.Equal(t, res.mvccAllFiles, mvccAllFilesLen, "unexpected files in all export")
 		require.Len(t, res.mvccAllKVs, mvccAllKVsLen, "unexpected kvs in all export")
 	}