From 358bf88cf8d8f2fe8834c8d4bce3d02c4ead15ef Mon Sep 17 00:00:00 2001 From: Tomasz Grabiec Date: Tue, 20 Jun 2017 09:17:12 +0200 Subject: [PATCH] mutation_reader: Fix abort when streaming more than one range multi_range_mutation_reader uses fast_forward_to() to skip between ranges, so we always need to create the underlying reader with with mutation_reader::forwarding::yes if there is more than one range, irrespective of whether multi_range_mutation_reader itself will be forwarded or not. Fixes #2510. Introduced in commit 3018df1. Message-Id: <1497943032-18696-1-git-send-email-tgrabiec@scylladb.com> --- mutation_reader.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mutation_reader.cc b/mutation_reader.cc index 8b619a86e9..4f28c64891 100644 --- a/mutation_reader.cc +++ b/mutation_reader.cc @@ -285,7 +285,8 @@ public: mutation_reader::forwarding fwd_mr) : _ranges(ranges) , _current_range(_ranges.begin()) - , _reader(source(s, *_current_range, slice, pc, trace_state, fwd, fwd_mr)) + , _reader(source(s, *_current_range, slice, pc, trace_state, fwd, + _ranges.size() > 1 ? mutation_reader::forwarding::yes : fwd_mr)) { }