From 141ea49e05072f70daf481bda53303adc2820afa Mon Sep 17 00:00:00 2001
From: Duarte Nunes <duarte@scylladb.com>
Date: Mon, 1 Aug 2016 15:32:06 +0000
Subject: [PATCH] storage_proxy: Enforce partition_limit

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>
---
 service/storage_proxy.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc
index c5a7e2f146..2d5aec1c5b 100644
--- a/service/storage_proxy.cc
+++ b/service/storage_proxy.cc
@@ -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));