mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-01 04:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage_proxy: Enforce partition_limit

Browse Source 
This patch enforces the partition_limit at the
mutation_result_merger.

Ref #693

Signed-off-by: Duarte Nunes <duarte@scylladb.com>
Message-Id: <1470065526-3174-1-git-send-email-duarte@scylladb.com>
This commit is contained in:
Duarte Nunes
2016-08-01 15:32:06 +00:00
committed by Paweł Dziepak
parent 9f35e4d328
commit 141ea49e05
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/storage_proxy.cc
View File

@@ -3434,7 +3434,7 @@ public:
_runs.pop_back();
}
}
if (_runs.empty() || row_count >= _cmd->row_limit) {
if (_runs.empty() || row_count >= _cmd->row_limit || partitions.size() >= _cmd->partition_limit) {
ret = reconcilable_result(row_count, std::move(partitions));
}
return make_ready_future<std::experimental::optional<reconcilable_result>>(std::move(ret));