From 5fcfbd76a9cc489fcf33d08f2065090dd946d21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= Date: Wed, 19 Aug 2020 14:15:09 -0700 Subject: [PATCH] sstables: Delete duplicated code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason date_tiered_compaction_strategy had its own identical copy of get_value. Signed-off-by: Rafael Ávila de Espíndola Message-Id: <20200819211509.106594-1-espindola@scylladb.com> --- sstables/compaction_strategy.cc | 6 +++--- sstables/date_tiered_compaction_strategy.hh | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/sstables/compaction_strategy.cc b/sstables/compaction_strategy.cc index 159c8860d760..599af7e5ae0d 100644 --- a/sstables/compaction_strategy.cc +++ b/sstables/compaction_strategy.cc @@ -915,15 +915,15 @@ date_tiered_manifest::create_sst_and_min_timestamp_pairs(const std::vector& options) { using namespace cql3::statements; - auto tmp_value = get_value(options, TIMESTAMP_RESOLUTION_KEY); + auto tmp_value = sstables::compaction_strategy_impl::get_value(options, TIMESTAMP_RESOLUTION_KEY); auto target_unit = tmp_value ? tmp_value.value() : DEFAULT_TIMESTAMP_RESOLUTION; - tmp_value = get_value(options, MAX_SSTABLE_AGE_KEY); + tmp_value = sstables::compaction_strategy_impl::get_value(options, MAX_SSTABLE_AGE_KEY); auto fractional_days = property_definitions::to_double(MAX_SSTABLE_AGE_KEY, tmp_value, DEFAULT_MAX_SSTABLE_AGE_DAYS); int64_t max_sstable_age_in_hours = std::lround(fractional_days * 24); max_sstable_age = duration_conversor::convert(target_unit, std::chrono::hours(max_sstable_age_in_hours)); - tmp_value = get_value(options, BASE_TIME_KEY); + tmp_value = sstables::compaction_strategy_impl::get_value(options, BASE_TIME_KEY); auto base_time_seconds = property_definitions::to_long(BASE_TIME_KEY, tmp_value, DEFAULT_BASE_TIME_SECONDS); base_time = duration_conversor::convert(target_unit, std::chrono::seconds(base_time_seconds)); } diff --git a/sstables/date_tiered_compaction_strategy.hh b/sstables/date_tiered_compaction_strategy.hh index aedcd57e7bb8..1501ef2af304 100644 --- a/sstables/date_tiered_compaction_strategy.hh +++ b/sstables/date_tiered_compaction_strategy.hh @@ -97,13 +97,6 @@ public: date_tiered_compaction_strategy_options(); private: - static std::optional get_value(const std::map& options, const sstring& name) { - auto it = options.find(name); - if (it == options.end()) { - return std::nullopt; - } - return it->second; - } friend class date_tiered_manifest; };