From bb0b2b4290efa520d613f1143719474de5f47e17 Mon Sep 17 00:00:00 2001 From: yuwmao Date: Wed, 4 Dec 2024 14:50:08 +0800 Subject: [PATCH] Rename snapshot_data to snapshot_obj --- conanfile.py | 2 +- src/lib/homestore_backend/replication_state_machine.cpp | 8 ++++---- src/lib/homestore_backend/replication_state_machine.hpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conanfile.py b/conanfile.py index aab7060..1801c99 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,7 +9,7 @@ class HomeObjectConan(ConanFile): name = "homeobject" - version = "2.1.14" + version = "2.1.15" homepage = "https://github.com/eBay/HomeObject" description = "Blob Store built on HomeReplication" diff --git a/src/lib/homestore_backend/replication_state_machine.cpp b/src/lib/homestore_backend/replication_state_machine.cpp index a730a49..793700d 100644 --- a/src/lib/homestore_backend/replication_state_machine.cpp +++ b/src/lib/homestore_backend/replication_state_machine.cpp @@ -231,8 +231,8 @@ std::shared_ptr< homestore::snapshot_context > ReplicationStateMachine::last_sna return snp; } -int ReplicationStateMachine::read_snapshot_data(std::shared_ptr< homestore::snapshot_context > context, - std::shared_ptr< homestore::snapshot_data > snp_data) { +int ReplicationStateMachine::read_snapshot_obj(std::shared_ptr< homestore::snapshot_context > context, + std::shared_ptr< homestore::snapshot_obj > snp_data) { HSHomeObject::PGBlobIterator* pg_iter = nullptr; auto s = dynamic_pointer_cast< homestore::nuraft_snapshot_context >(context)->nuraft_snapshot(); @@ -316,8 +316,8 @@ int ReplicationStateMachine::read_snapshot_data(std::shared_ptr< homestore::snap return 0; } -void ReplicationStateMachine::write_snapshot_data(std::shared_ptr< homestore::snapshot_context > context, - std::shared_ptr< homestore::snapshot_data > snp_data) { +void ReplicationStateMachine::write_snapshot_obj(std::shared_ptr< homestore::snapshot_context > context, + std::shared_ptr< homestore::snapshot_obj > snp_data) { RELEASE_ASSERT(context != nullptr, "Context null"); RELEASE_ASSERT(snp_data != nullptr, "Snapshot data null"); auto s = dynamic_pointer_cast< homestore::nuraft_snapshot_context >(context)->nuraft_snapshot(); diff --git a/src/lib/homestore_backend/replication_state_machine.hpp b/src/lib/homestore_backend/replication_state_machine.hpp index eb74eac..39466a0 100644 --- a/src/lib/homestore_backend/replication_state_machine.hpp +++ b/src/lib/homestore_backend/replication_state_machine.hpp @@ -180,10 +180,10 @@ class ReplicationStateMachine : public homestore::ReplDevListener { homestore::AsyncReplResult<> create_snapshot(std::shared_ptr< homestore::snapshot_context > context) override; virtual bool apply_snapshot(std::shared_ptr< homestore::snapshot_context > context) override; virtual std::shared_ptr< homestore::snapshot_context > last_snapshot() override; - virtual int read_snapshot_data(std::shared_ptr< homestore::snapshot_context > context, - std::shared_ptr< homestore::snapshot_data > snp_data) override; - virtual void write_snapshot_data(std::shared_ptr< homestore::snapshot_context > context, - std::shared_ptr< homestore::snapshot_data > snp_data) override; + virtual int read_snapshot_obj(std::shared_ptr< homestore::snapshot_context > context, + std::shared_ptr< homestore::snapshot_obj > snp_data) override; + virtual void write_snapshot_obj(std::shared_ptr< homestore::snapshot_context > context, + std::shared_ptr< homestore::snapshot_obj > snp_data) override; virtual void free_user_snp_ctx(void*& user_snp_ctx) override; private: