From 6db262446f7113b57eb7668d08e282f4bd83d0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Dziepak?= Date: Mon, 19 Dec 2016 09:49:32 +0000 Subject: [PATCH] storage_proxy: don't stop after result with no live rows mutation_result_merger merges results from different shards and stops as soon as a shard returned a short read or memory usage on the merging shard is too high. However, it should never stop unless at least one live rows is in the merged result. --- 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 2bffd3a6dc..0c63e15cf3 100644 --- a/service/storage_proxy.cc +++ b/service/storage_proxy.cc @@ -3586,7 +3586,7 @@ public: _partitions.emplace(key, std::move(partitions)); _short_read = partial_result->is_short_read(); if (_memory_accounter.update_and_check(partial_result->memory_usage()) && _short_read_allowed) { - _short_read = query::short_read::yes; + _short_read = _short_read || query::short_read(_row_count > 0); } } reconcilable_result get() && {