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

Restore OPAQUE_MARKERS handling for list objects V1 #569

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Restore OPAQUE_MARKERS handling for list objects V1 #569

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
8 changes: 6 additions & 2 deletions src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,8 +1490,12 @@ private void handleBlobList(HttpServletRequest request,
if (Quirks.OPAQUE_MARKERS.contains(blobStoreType)) {
StorageMetadata sm = Streams.findLast(set.stream()).orElse(null);
if (sm != null) {
lastKeyToMarker.put(Maps.immutableEntry(containerName,
encodeBlob(encodingType, nextMarker)), nextMarker);
// TODO: verify if we need this handling at all for V2
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you verify this?

String lastKey = isListV2 ? encodeBlob(encodingType, nextMarker) : sm.getName();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gaul
As long as isListV2 works as intended it should be good. Regardless I'd want to test the changes.

Copy link
Contributor

@Decard6 Decard6 Mar 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good. The change doesn't break pagination with V2.

lastKeyToMarker.put(
Maps.immutableEntry(containerName, lastKey),
nextMarker
);
}
}
} else {
Expand Down
Loading