From b215d8e50c6d7de6979c9bd5caeb781816319eab Mon Sep 17 00:00:00 2001 From: neverchanje Date: Thu, 29 Nov 2018 20:30:37 +0800 Subject: [PATCH] remove functions useless in class replica --- src/dist/replication/lib/replica.cpp | 9 --------- src/dist/replication/lib/replica.h | 4 ---- src/dist/replication/lib/replica_check.cpp | 13 ------------- 3 files changed, 26 deletions(-) diff --git a/src/dist/replication/lib/replica.cpp b/src/dist/replication/lib/replica.cpp index 632b1c90b2..a74e8e6e07 100644 --- a/src/dist/replication/lib/replica.cpp +++ b/src/dist/replication/lib/replica.cpp @@ -353,15 +353,6 @@ mutation_ptr replica::new_mutation(decree decree) return mu; } -bool replica::group_configuration(/*out*/ partition_configuration &config) const -{ - if (partition_status::PS_PRIMARY != status()) - return false; - - config = _primary_states.membership; - return true; -} - decree replica::last_durable_decree() const { return _app->last_durable_decree(); } decree replica::last_flushed_decree() const { return _app->last_flushed_decree(); } diff --git a/src/dist/replication/lib/replica.h b/src/dist/replication/lib/replica.h index 3a0c5dd4f7..5a001e586f 100644 --- a/src/dist/replication/lib/replica.h +++ b/src/dist/replication/lib/replica.h @@ -126,7 +126,6 @@ class replica : public serverlet, public ref_counter, public replica_ba // // routine for testing purpose only // - void send_group_check_once_for_test(int delay_milliseconds); void inject_error(error_code err); // @@ -142,10 +141,7 @@ class replica : public serverlet, public ref_counter, public replica_ba decree last_durable_decree() const; decree last_flushed_decree() const; const std::string &dir() const { return _dir; } - bool group_configuration(/*out*/ partition_configuration &config) const; uint64_t create_time_milliseconds() const { return _create_time_ms; } - uint64_t last_config_change_time_milliseconds() const { return _last_config_change_time_ms; } - uint64_t last_checkpoint_generate_time_ms() const { return _last_checkpoint_generate_time_ms; } const char *name() const { return replica_name(); } mutation_log_ptr private_log() const { return _private_log; } const replication_options *options() const { return _options; } diff --git a/src/dist/replication/lib/replica_check.cpp b/src/dist/replication/lib/replica_check.cpp index 41703ebd11..d5bdc9ec56 100644 --- a/src/dist/replication/lib/replica_check.cpp +++ b/src/dist/replication/lib/replica_check.cpp @@ -213,19 +213,6 @@ void replica::on_group_check_reply(error_code err, } } -// for testing purpose only -void replica::send_group_check_once_for_test(int delay_milliseconds) -{ - dassert(_options->group_check_disabled, ""); - - _primary_states.group_check_task = - tasking::enqueue(LPC_GROUP_CHECK, - &_tracker, - [this] { broadcast_group_check(); }, - get_gpid().thread_hash(), - std::chrono::milliseconds(delay_milliseconds)); -} - void replica::inject_error(error_code err) { tasking::enqueue(LPC_REPLICATION_ERROR,