From f30fe7bd17ecac8d2895ff4c4f389e41ab408299 Mon Sep 17 00:00:00 2001 From: Vladimir Krivopalov Date: Fri, 12 Oct 2018 19:10:30 -0700 Subject: [PATCH] sstables: Factor out code resetting values for a new partition. Signed-off-by: Vladimir Krivopalov Message-Id: <83a3a4ce6942b036be447bcfeb66142828e75293.1539396572.git.vladimir@scylladb.com> (cherry picked from commit 926b6430fd812bc0f5f39ba949df167ddd1e7c9a) --- sstables/mp_row_consumer.hh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sstables/mp_row_consumer.hh b/sstables/mp_row_consumer.hh index a6eea031ec..e9d5378a71 100644 --- a/sstables/mp_row_consumer.hh +++ b/sstables/mp_row_consumer.hh @@ -897,6 +897,14 @@ class mp_row_consumer_m : public consumer_m { return proceed(!_reader->is_buffer_full()); } + inline void reset_for_new_partition() { + _is_mutation_end = true; + _in_progress_row.reset(); + _stored_row.reset(); + _stored_tombstone.reset(); + _mf_filter.reset(); + } + public: /* @@ -1238,22 +1246,14 @@ public: virtual proceed consume_partition_end() override { sstlog.trace("mp_row_consumer_m {}: consume_partition_end()", this); - _is_mutation_end = true; - _in_progress_row.reset(); - _stored_row.reset(); - _stored_tombstone.reset(); - _mf_filter.reset(); + reset_for_new_partition(); return proceed::no; } virtual void reset(sstables::indexable_element el) override { sstlog.trace("mp_row_consumer_m {}: reset({})", this, static_cast(el)); if (el == indexable_element::partition) { - _is_mutation_end = true; - _in_progress_row.reset(); - _stored_row.reset(); - _stored_tombstone.reset(); - _mf_filter.reset(); + reset_for_new_partition(); } else { _is_mutation_end = false; }