From 0cdbc97614726cc7c1e0647713a1ae51e64790de Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 23 Dec 2013 13:14:43 -0800 Subject: [PATCH] librados: mark old get_version() as deprecated Use the newly-discovered (for me) deprecated attribute to mark the old get_version() method and point users toward get_version64(). And fix a couple of users in the kvstore code! Signed-off-by: Sage Weil --- src/include/rados/librados.hpp | 2 +- src/key_value_store/kv_flat_btree_async.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp index 2582167c2fea2..1804a5805d7fd 100644 --- a/src/include/rados/librados.hpp +++ b/src/include/rados/librados.hpp @@ -103,7 +103,7 @@ namespace librados bool is_complete_and_cb(); bool is_safe_and_cb(); int get_return_value(); - int get_version(); ///< DEPRECATED get_version() only returns 32-bits + int get_version() __attribute__ ((deprecated ("use get_version64"))); uint64_t get_version64(); void release(); AioCompletionImpl *pc; diff --git a/src/key_value_store/kv_flat_btree_async.cc b/src/key_value_store/kv_flat_btree_async.cc index 7faf077ac33b0..709d880a956c9 100644 --- a/src/key_value_store/kv_flat_btree_async.cc +++ b/src/key_value_store/kv_flat_btree_async.cc @@ -672,7 +672,7 @@ int KvFlatBtreeAsync::read_object(const string &obj, object_data * odata) { return err; } odata->unwritable = string(unw_bl.c_str(), unw_bl.length()) == "1"; - odata->version = obj_aioc->get_version(); + odata->version = obj_aioc->get_version64(); odata->size = odata->omap.size(); obj_aioc->release(); return 0; @@ -697,7 +697,7 @@ int KvFlatBtreeAsync::read_object(const string &obj, rebalance_args * args) { bufferlist::iterator it = outbl.begin(); args->decode(it); args->odata.name = obj; - args->odata.version = a->get_version(); + args->odata.version = a->get_version64(); a->release(); return err; } @@ -2095,7 +2095,7 @@ bool KvFlatBtreeAsync::is_consistent() { } } if (atoi(string(un.c_str(), un.length()).c_str()) != 1 && - aioc->get_version() != (int)dit->version) { + aioc->get_version64() != dit->version) { cerr << "Not consistent! object " << dit->obj << " has been " << " modified since the client died was not cleaned up." << std::endl; @@ -2251,7 +2251,7 @@ string KvFlatBtreeAsync::str() { //return ret.str(); } all_sizes[indexer] = all_maps[indexer].size(); - all_versions[indexer] = aioc->get_version(); + all_versions[indexer] = aioc->get_version64(); indexer++; aioc->release(); } -- 2.39.5