diff --git a/src/replica/mutation.h b/src/replica/mutation.h index 190d425e397..d5b7f238adb 100644 --- a/src/replica/mutation.h +++ b/src/replica/mutation.h @@ -207,7 +207,6 @@ class replica; class mutation_queue { public: - explicit mutation_queue() {} mutation_queue(gpid gpid, int max_concurrent_op = 2, bool batch_write_disabled = false); ~mutation_queue() diff --git a/src/replica/mutation_log.cpp b/src/replica/mutation_log.cpp index 0b8b2efea97..c08ec6c5e2f 100644 --- a/src/replica/mutation_log.cpp +++ b/src/replica/mutation_log.cpp @@ -327,14 +327,14 @@ void mutation_log_private::commit_pending_mutations(log_file_ptr &lf, mutation_log::mutation_log(const std::string &dir, int32_t max_log_file_mb, gpid gpid, replica *r) { _dir = dir; - _is_private = true; + _is_private = (gpid.value() != 0); _max_log_file_size_in_bytes = static_cast(max_log_file_mb) * 1024L * 1024L; _min_log_file_size_in_bytes = _max_log_file_size_in_bytes / 10; _owner_replica = r; _private_gpid = gpid; if (r) { - // CHECK_EQ(_private_gpid, r->get_gpid()); + CHECK_EQ(_private_gpid, r->get_gpid()); } mutation_log::init_states(); } diff --git a/src/replica/replica.cpp b/src/replica/replica.cpp index 5a9c508e47e..62cd71ae94b 100644 --- a/src/replica/replica.cpp +++ b/src/replica/replica.cpp @@ -266,14 +266,6 @@ DSN_DECLARE_int32(checkpoint_max_interval_hours); const std::string replica::kAppInfo = ".app-info"; -replica::replica() - : serverlet("replica"), - replica_base(), - _primary_states(), - _potential_secondary_states(this) -{ -} - replica::replica(replica_stub *stub, gpid gpid, const app_info &app, @@ -602,10 +594,6 @@ bool replica::verbose_commit_log() const { return _stub->_verbose_commit_log; } void replica::close() { - if (status() == partition_status::PS_INVALID) { - return; - } - CHECK_PREFIX_MSG(status() == partition_status::PS_ERROR || status() == partition_status::PS_INACTIVE || _disk_migrator->status() == disk_migration_status::IDLE || diff --git a/src/replica/replica.h b/src/replica/replica.h index a5f407600ce..72ba5a54419 100644 --- a/src/replica/replica.h +++ b/src/replica/replica.h @@ -311,7 +311,6 @@ class replica : public serverlet, public ref_counter, public replica_ba bool need_restore, bool is_duplication_follower = false); - explicit replica(); error_code initialize_on_new(); error_code initialize_on_load(); error_code init_app_and_prepare_list(bool create_new); diff --git a/src/replica/replica_base.h b/src/replica/replica_base.h index 9677307307a..8909197a642 100644 --- a/src/replica/replica_base.h +++ b/src/replica/replica_base.h @@ -46,8 +46,6 @@ struct replica_base { } - explicit replica_base() {} - gpid get_gpid() const { return _gpid; } const char *replica_name() const { return _name.c_str(); } diff --git a/src/replica/replica_context.h b/src/replica/replica_context.h index 88fce667e3c..32da41d38ba 100644 --- a/src/replica/replica_context.h +++ b/src/replica/replica_context.h @@ -89,7 +89,6 @@ typedef std::unordered_map<::dsn::rpc_address, remote_learner_state> learner_map class primary_context { public: - explicit primary_context() {} primary_context(gpid gpid, int max_concurrent_2pc_count = 1, bool batch_write_disabled = false) : next_learning_version(0), write_queue(gpid, max_concurrent_2pc_count, batch_write_disabled), diff --git a/src/tools/mutation_log_tool.cpp b/src/tools/mutation_log_tool.cpp index 85a6143aa3b..b68a4979b53 100644 --- a/src/tools/mutation_log_tool.cpp +++ b/src/tools/mutation_log_tool.cpp @@ -126,7 +126,6 @@ bool mutation_log_tool::dump( }, nullptr); mlog->close(); - delete rep; if (err != dsn::ERR_OK) { output << fmt::format("ERROR: dump mutation log failed, err = {}\n", err); return false;