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

fix: include pagination.key at reverse mode (backport #20939) #20954

Merged
merged 3 commits into from
Jul 15, 2024
Merged

fix: include pagination.key at reverse mode (backport #20939) #20954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14fbde2
fix: include pagination.key at reverse mode (#20939)
beer-1 Jul 15, 2024
98d4541
fix
facundomedica Jul 15, 2024
2c81215
Update CHANGELOG.md
julienrbrt Jul 15, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ Ref: https://keepachangelog.com/en/1.0.0/

## [Unreleased]

## Bug Fixes

* [#20939](https://github.com/cosmos/cosmos-sdk/pull/20939) Fix collection reverse iterator to include `pagination.key` in the result.

## [v0.50.8](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8) - 2024-07-15

## Features
Expand Down
10 changes: 5 additions & 5 deletions types/query/collections_pagination.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,11 @@ func encodeCollKey[K, V any, C Collection[K, V]](coll C, key K) ([]byte, error)
func getCollIter[K, V any, C Collection[K, V]](ctx context.Context, coll C, prefix, start []byte, reverse bool) (collections.Iterator[K, V], error) {
// TODO: maybe can be simplified
if reverse {
var end []byte
if prefix != nil {
start = storetypes.PrefixEndBytes(append(prefix, start...))
end = prefix
}
// if we are in reverse mode, we need to increase the start key
// to include the start key in the iteration.
start = storetypes.PrefixEndBytes(append(prefix, start...))
end := prefix

return coll.IterateRaw(ctx, end, start, collections.OrderDescending)
}
var end []byte
Expand Down
10 changes: 10 additions & 0 deletions types/query/collections_pagination_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,16 @@ func TestCollectionPagination(t *testing.T) {
},
expResults: createResults(299, 200),
},
"with key and reverse": {
req: &PageRequest{
Key: encodeKey(199),
Reverse: true,
},
expResp: &PageResponse{
NextKey: encodeKey(99),
},
expResults: createResults(199, 100),
},
"with offset and count total": {
req: &PageRequest{
Offset: 50,
Expand Down
Loading