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>
This commit is contained in:
Calle Wilund
2016-01-12 13:55:35 +00:00
committed by Avi Kivity
parent 9232ad927f
commit e50d8b6895

View File

@@ -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;