From e50d8b68950a2cfeefadadcba962602372e191e2 Mon Sep 17 00:00:00 2001 From: Calle Wilund Date: Tue, 12 Jan 2016 13:55:35 +0000 Subject: [PATCH] paging bugfix: Ensure limit for single page is min(page size, limit left) Fixes #752 We set row limit for query to be min of page size/remaining in limit, but if we have a multinode query we might end up with more rows than asked for, so must do this again in post-processing. Message-Id: <1452606935-12899-2-git-send-email-calle@scylladb.com> --- service/pager/query_pagers.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/pager/query_pagers.cc b/service/pager/query_pagers.cc index 9dcf00da56..bafbcd62aa 100644 --- a/service/pager/query_pagers.cc +++ b/service/pager/query_pagers.cc @@ -279,7 +279,7 @@ private: } }; - myvisitor v(*this, page_size, builder, *_schema, *_selection); + myvisitor v(*this, std::min(page_size, _max), builder, *_schema, *_selection); query::result_view::consume(results->buf(), _cmd->slice, v); _max = _max - v.included_rows;