Skip to content

datastore: allow pagination tokens larger than 32 bits #7201

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

Open
pujitha24 wants to merge 3 commits into
base: main
Choose a base branch
from
+29 −4
Open

datastore: allow pagination tokens larger than 32 bits #7201

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c82a773
datastore: allow pagination tokens larger than 32 bits
pujitha24 Aug 6, 2026
8f9db19
Merge remote-tracking branch 'upstream/main' into auto/issue-5501
pujitha24 Aug 9, 2026
21c7521
datastore: skip 32-bit pagination token regression test on postgres
pujitha24 Aug 10, 2026
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: 4 additions & 4 deletions pkg/server/datastore/sqlstore/sqlstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2032,7 +2032,7 @@ func buildListAttestedNodesQueryCTE(req *datastore.ListAttestedNodesRequest, dbT

// Filter by pagination token
if req.Pagination != nil && req.Pagination.Token != "" {
token, err := strconv.ParseUint(req.Pagination.Token, 10, 32)
token, err := strconv.ParseUint(req.Pagination.Token, 10, 64)
if err != nil {
return "", nil, status.Errorf(codes.InvalidArgument, "could not parse token '%v'", req.Pagination.Token)
}
Expand Down Expand Up @@ -2275,7 +2275,7 @@ FROM attested_node_entries N

// Filter by pagination token
if req.Pagination != nil && req.Pagination.Token != "" {
token, err := strconv.ParseUint(req.Pagination.Token, 10, 32)
token, err := strconv.ParseUint(req.Pagination.Token, 10, 64)
if err != nil {
return status.Errorf(codes.InvalidArgument, "could not parse token '%v'", req.Pagination.Token)
}
Expand Down Expand Up @@ -3819,7 +3819,7 @@ func appendListRegistrationEntriesFilterQuery(filterExp string, builder *strings
}

if len(req.Pagination.Token) > 0 {
token, err := strconv.ParseUint(req.Pagination.Token, 10, 32)
token, err := strconv.ParseUint(req.Pagination.Token, 10, 64)
if err != nil {
return false, nil, status.Errorf(codes.InvalidArgument, "could not parse token '%v'", req.Pagination.Token)
}
Expand Down Expand Up @@ -4083,7 +4083,7 @@ func applyPagination(p *datastore.Pagination, entryTx *gorm.DB) (*gorm.DB, error
entryTx = entryTx.Order("id asc").Limit(p.PageSize)

if len(p.Token) > 0 {
id, err := strconv.ParseUint(p.Token, 10, 32)
id, err := strconv.ParseUint(p.Token, 10, 64)
if err != nil {
return nil, status.Errorf(codes.InvalidArgument, "could not parse token '%v'", p.Token)
}
Expand Down
14 changes: 14 additions & 0 deletions pkg/server/datastore/sqltest/datastore_suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,20 @@ func (s *Suite) TestListBundlesWithPagination() {
PageSize: 2,
},
},
{
// Regression test: tokens beyond 32 bits must parse successfully,
// since the underlying ID column is not limited to 32 bits.
name: "token larger than 32 bits",
expectedList: []*common.Bundle{},
pagination: &datastore.Pagination{
Token: "5000000000",
PageSize: 2,
},
expectedPagination: &datastore.Pagination{
Token: "",
PageSize: 2,
},
},
}
for _, test := range tests {
s.T().Run(test.name, func(t *testing.T) {
Expand Down
Loading