mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-08 16:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

mutation_partition: Use default value for row_limit in query()

Browse Source
This commit is contained in:
Tomasz Grabiec
2015-06-25 21:49:08 +02:00
parent 1b4a72de14
commit 3fc951e807
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database.cc
View File

@@ -1019,7 +1019,7 @@ column_family::query(const query::read_command& cmd, const std::vector<query::pa
return qs.reader().then([this, &qs](mutation_opt mo) {
if (mo) {
auto p_builder = qs.builder.add_partition(mo->key());
mo->partition().query(*_schema, qs.cmd.slice, qs.limit, p_builder);
mo->partition().query(p_builder, *_schema, qs.cmd.slice, qs.limit);
p_builder.finish();
qs.limit -= p_builder.row_count();
} else {

6
mutation_partition.cc
View File

@@ -270,10 +270,10 @@ bool has_any_live_data(const row& cells, tombstone tomb, ColumnDefResolver&& id_
}
void
mutation_partition::query(const schema& s,
mutation_partition::query(query::result::partition_writer& pw,
const schema& s,
const query::partition_slice& slice,
uint32_t limit,
query::result::partition_writer& pw) const
uint32_t limit) const
{
auto regular_column_resolver = [&s] (column_id id) -> const column_definition& {
return s.regular_column_at(id);

2
mutation_partition.hh
View File

@@ -273,5 +273,5 @@ public:
tombstone tombstone_for_row(const schema& schema, const rows_entry& e) const;
boost::iterator_range<rows_type::const_iterator> range(const schema& schema, const query::range<clustering_key_prefix>& r) const;
// Returns at most "limit" rows. The limit must be greater than 0.
void query(const schema& s, const query::partition_slice& slice, uint32_t limit, query::result::partition_writer& pw) const;
void query(query::result::partition_writer& pw, const schema& s, const query::partition_slice& slice, uint32_t limit = query::max_rows) const;
};