Folders are also considered for WalkWithObjects

Signed-off-by: gifi-siby <[email protected]>
milvus-io · Jan 10, 2025 · 1a3b062 · 1a3b062
1 parent 22b8f6a
commit 1a3b062
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/internal/storage/gcp_native_object_storage.go b/internal/storage/gcp_native_object_storage.go
@@ -170,10 +170,13 @@ func (gcs *GcpNativeObjectStorage) WalkWithObjects(ctx context.Context,
 			return checkObjectStorageError(prefix, err)
 		}
 		if objAttrs.Prefix != "" {
-			continue
-		}
-		if !walkFunc(&ChunkObjectInfo{FilePath: objAttrs.Name, ModifyTime: objAttrs.Updated}) {
-			return nil
+			if !walkFunc(&ChunkObjectInfo{FilePath: objAttrs.Prefix, ModifyTime: objAttrs.Updated}) {
+				return nil
+			}
+		} else if objAttrs.Name != "" {
+			if !walkFunc(&ChunkObjectInfo{FilePath: objAttrs.Name, ModifyTime: objAttrs.Updated}) {
+				return nil
+			}
 		}
 	}
 	return nil

diff --git a/internal/storage/gcp_native_object_storage_test.go b/internal/storage/gcp_native_object_storage_test.go
@@ -174,8 +174,8 @@ func TestGcpNativeObjectStorage(t *testing.T) {
 		}{
 			{true, "abc/", []string{"abc/e/d"}},
 			{true, "key_/", []string{"key_/1/1", "key_/2/3", "key_/test.txt"}},
-			{false, "abc/", []string{}},
-			{false, "key_/", []string{"key_/test.txt"}},
+			{false, "abc/", []string{"abc/e/"}},
+			{false, "key_/", []string{"key_/1/", "key_/2/", "key_/test.txt"}},
 		}
 
 		for _, test := range insertWithPrefixTests {