Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure consistent use of versions during pagination #591

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Ensure consistent use of versions during pagination #591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions gcsfs/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ async def _do_list_objects(
bucket, _path, generation = self.split_path(path)
_path = "" if not _path else _path.rstrip("/") + "/"
prefix = f"{_path}{prefix}" or None
versions = bool(versions or generation)

# Page size of 5000 is officially supported across GCS.
default_page_size = 5000
Expand Down Expand Up @@ -628,7 +629,6 @@ async def _do_list_objects(
delimiter=delimiter,
prefix=prefix,
versions=versions,
generation=generation,
page_size=default_page_size,
)

Expand All @@ -642,12 +642,11 @@ async def _do_list_objects(
end_offset=None,
prefix=prefix,
versions=versions,
generation=generation,
page_size=default_page_size,
)

async def _concurrent_list_objects_helper(
self, items, bucket, delimiter, prefix, versions, generation, page_size
self, items, bucket, delimiter, prefix, versions, page_size
):
"""
Lists objects using coroutines, using the object names from the inventory
Expand Down Expand Up @@ -696,7 +695,6 @@ async def _concurrent_list_objects_helper(
end_offset=end_offsets[i],
prefix=prefix,
versions=versions,
generation=generation,
page_size=page_size,
)
for i in range(0, len(start_offsets))
Expand All @@ -722,7 +720,6 @@ async def _sequential_list_objects_helper(
end_offset,
prefix,
versions,
generation,
page_size,
):
"""
Expand All @@ -742,7 +739,7 @@ async def _sequential_list_objects_helper(
endOffset=end_offset,
maxResults=page_size,
json_out=True,
versions="true" if versions or generation else None,
versions="true" if versions else None,
)

prefixes.extend(page.get("prefixes", []))
Expand All @@ -761,7 +758,7 @@ async def _sequential_list_objects_helper(
maxResults=page_size,
pageToken=next_page_token,
json_out=True,
versions="true" if generation else None,
versions="true" if versions else None,
)

assert page["kind"] == "storage#objects"
Expand Down
Loading