removes IndexPath from BlockRef

Signed-off-by: Owen Diehl <[email protected]>
owen-d · Feb 1, 2024 · 8c52cf3 · 8c52cf3
1 parent 8dc8ea7
commit 8c52cf3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 11 deletions.
diff --git a/pkg/bloomgateway/util_test.go b/pkg/bloomgateway/util_test.go
@@ -344,7 +344,6 @@ func createBlocks(t *testing.T, tenant string, n int, from, through model.Time,
 		}
 		block := bloomshipper.BlockRef{
 			Ref:       ref,
-			IndexPath: "index.tsdb.gz",
 			BlockPath: fmt.Sprintf("block-%d", i),
 		}
 		meta := bloomshipper.Meta{
@@ -459,7 +458,6 @@ func createBlockRefsFromBlockData(t *testing.T, tenant string, data []bloomshipp
 				EndTimestamp:   0,
 				Checksum:       0,
 			},
-			IndexPath: fmt.Sprintf("index-%d", i),
 			BlockPath: fmt.Sprintf("block-%d", i),
 		})
 	}

diff --git a/pkg/storage/stores/shipper/bloomshipper/client.go b/pkg/storage/stores/shipper/bloomshipper/client.go
@@ -69,7 +69,6 @@ func (r Ref) Interval() Interval {
 
 type BlockRef struct {
 	Ref
-	IndexPath string
 	BlockPath string
 }
 

diff --git a/pkg/storage/stores/shipper/bloomshipper/client_test.go b/pkg/storage/stores/shipper/bloomshipper/client_test.go
@@ -265,7 +265,6 @@ func Test_BloomClient_PutBlocks(t *testing.T) {
 				EndTimestamp:   Date(2023, time.September, 21, 6, 0, 0),
 				Checksum:       1,
 			},
-			IndexPath: uuid.New().String(),
 		},
 		Data: awsio.ReadSeekNopCloser{ReadSeeker: bytes.NewReader([]byte(blockForFirstFolderData))},
 	}
@@ -281,7 +280,6 @@ func Test_BloomClient_PutBlocks(t *testing.T) {
 				EndTimestamp:   Date(2023, time.September, 24, 6, 0, 0),
 				Checksum:       2,
 			},
-			IndexPath: uuid.New().String(),
 		},
 		Data: awsio.ReadSeekNopCloser{ReadSeeker: bytes.NewReader([]byte(blockForSecondFolderData))},
 	}
@@ -305,7 +303,6 @@ func Test_BloomClient_PutBlocks(t *testing.T) {
 	require.Equal(t, blockForFirstFolder.StartTimestamp, firstResultBlock.StartTimestamp)
 	require.Equal(t, blockForFirstFolder.EndTimestamp, firstResultBlock.EndTimestamp)
 	require.Equal(t, blockForFirstFolder.Checksum, firstResultBlock.Checksum)
-	require.Equal(t, blockForFirstFolder.IndexPath, firstResultBlock.IndexPath)
 	folder1 := bloomClient.storageConfig.NamedStores.Filesystem["folder-1"].Directory
 	savedFilePath := filepath.Join(folder1, path)
 	require.FileExists(t, savedFilePath)
@@ -329,7 +326,6 @@ func Test_BloomClient_PutBlocks(t *testing.T) {
 	require.Equal(t, blockForSecondFolder.StartTimestamp, secondResultBlock.StartTimestamp)
 	require.Equal(t, blockForSecondFolder.EndTimestamp, secondResultBlock.EndTimestamp)
 	require.Equal(t, blockForSecondFolder.Checksum, secondResultBlock.Checksum)
-	require.Equal(t, blockForSecondFolder.IndexPath, secondResultBlock.IndexPath)
 	folder2 := bloomClient.storageConfig.NamedStores.Filesystem["folder-2"].Directory
 
 	savedFilePath = filepath.Join(folder2, path)
@@ -359,7 +355,6 @@ func Test_BloomClient_DeleteBlocks(t *testing.T) {
 				EndTimestamp:   Date(2023, time.September, 24, 6, 0, 0),
 				Checksum:       2,
 			},
-			IndexPath: uuid.New().String(),
 		},
 		{
 			Ref: Ref{
@@ -370,7 +365,6 @@ func Test_BloomClient_DeleteBlocks(t *testing.T) {
 				EndTimestamp:   Date(2023, time.September, 21, 6, 0, 0),
 				Checksum:       1,
 			},
-			IndexPath: uuid.New().String(),
 		},
 	}
 	err := bloomClient.DeleteBlocks(context.Background(), blocksToDelete)
@@ -556,7 +550,6 @@ func createMetaEntity(
 					StartTimestamp: startTimestamp,
 					EndTimestamp:   endTimestamp,
 				},
-				IndexPath: uuid.New().String(),
 				BlockPath: uuid.New().String(),
 			},
 		},
@@ -569,7 +562,6 @@ func createMetaEntity(
 					StartTimestamp: startTimestamp,
 					EndTimestamp:   endTimestamp,
 				},
-				IndexPath: uuid.New().String(),
 				BlockPath: uuid.New().String(),
 			},
 		},
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,6 @@ func (r Ref) Interval() Interval { @@
     type BlockRef struct {
     	Ref
-    	IndexPath string
     	BlockPath string
     }
@@ Expand Down @@