if cl.MaxPageSize > 0 && len(resp.Items) >= cl.MaxPageSize {
break
}
- if options.Limit >= 0 && len(resp.Items) >= options.Limit {
+ if options.Limit >= 0 && int64(len(resp.Items)) >= options.Limit {
break
}
if cl.matchFilters(c, options.Filters) {
type listTrial struct {
count string
- limit int
- offset int
+ limit int64
+ offset int64
order []string
filters []arvados.Filter
selectfields []string
func (s *CollectionListSuite) TestCollectionListMultiSiteWithCount(c *check.C) {
for _, count := range []string{"", "exact"} {
+ s.SetUpTest(c) // Reset backends / call counters
s.test(c, listTrial{
count: count,
limit: -1,
}
func (s *CollectionListSuite) TestCollectionListMultiSiteWithLimit(c *check.C) {
- for _, limit := range []int{0, 1, 2} {
+ for _, limit := range []int64{0, 1, 2} {
+ s.SetUpTest(c) // Reset backends / call counters
s.test(c, listTrial{
count: "none",
limit: limit,
filters: []arvados.Filter{
- {"uuid", "in", []string{s.uuids[0][0], s.uuids[1][0]}},
+ {"uuid", "in", []string{s.uuids[0][0], s.uuids[1][0], s.uuids[2][0]}},
{"uuid", "is_a", "teapot"},
},
expectCalls: []int{0, 0, 0},
}
}
+func (s *CollectionListSuite) TestCollectionListMultiSiteWithHighLimit(c *check.C) {
+ uuids := []string{s.uuids[0][0], s.uuids[1][0], s.uuids[2][0]}
+ for _, limit := range []int64{3, 4, 1234567890} {
+ s.SetUpTest(c) // Reset backends / call counters
+ s.test(c, listTrial{
+ count: "none",
+ limit: limit,
+ filters: []arvados.Filter{
+ {"uuid", "in", uuids},
+ },
+ expectUUIDs: uuids,
+ expectCalls: []int{1, 1, 1},
+ })
+ }
+}
+
func (s *CollectionListSuite) TestCollectionListMultiSiteWithOffset(c *check.C) {
s.test(c, listTrial{
count: "none",