Index: service/datastore/query.go |
diff --git a/service/datastore/query.go b/service/datastore/query.go |
index 2e60b90cda8e90ce8fe0b95f88a21635cd6d3dcd..8c15f9b5a57a64d08275a448f91a09fed281ec1d 100644 |
--- a/service/datastore/query.go |
+++ b/service/datastore/query.go |
@@ -569,6 +569,11 @@ func (q *Query) Finalize() (*FinalizedQuery, error) { |
ineqFiltHighIncl: q.ineqFiltHighIncl, |
ineqFiltHighSet: q.ineqFiltHighSet, |
} |
+ // If a starting cursor is provided, ignore the offset, as it would have been |
+ // accounted for in the query that produced the cursor. |
+ if ret.start != nil { |
+ ret.offset = nil |
+ } |
if q.project != nil { |
ret.project = q.project.ToSlice() |