From 0fad6c01ae3d77ed71dc21fa12538057b62170dd Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 2 May 2019 12:41:16 -0400 Subject: [PATCH] immutable_object_cache: Remove pessimizing moves Signed-off-by: Adam C. Emerson --- src/tools/immutable_object_cache/ObjectCacheStore.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/tools/immutable_object_cache/ObjectCacheStore.cc b/src/tools/immutable_object_cache/ObjectCacheStore.cc index 7c3864a157a..d89935424ef 100644 --- a/src/tools/immutable_object_cache/ObjectCacheStore.cc +++ b/src/tools/immutable_object_cache/ObjectCacheStore.cc @@ -100,8 +100,7 @@ int ObjectCacheStore::do_promote(std::string pool_nspace, << " snapshot: " << snap_id << dendl; int ret = 0; - std::string cache_file_name = std::move(get_cache_file_name(pool_nspace, - pool_id, snap_id, object_name)); + std::string cache_file_name = get_cache_file_name(pool_nspace, pool_id, snap_id, object_name); librados::IoCtx ioctx; { Mutex::Locker _locker(m_ioctx_map_lock); @@ -147,8 +146,7 @@ int ObjectCacheStore::handle_promote_callback(int ret, bufferlist* read_buf, ret = 0; } - std::string cache_file_path = std::move( - get_cache_file_path(cache_file_name, true)); + std::string cache_file_path = get_cache_file_path(cache_file_name, true); if (cache_file_path == "") { lderr(m_cct) << "fail to write cache file" << dendl; @@ -186,8 +184,7 @@ int ObjectCacheStore::lookup_object(std::string pool_nspace, << " in pool ID : " << pool_id << dendl; int pret = -1; - std::string cache_file_name = std::move(get_cache_file_name(pool_nspace, - pool_id, snap_id, object_name)); + std::string cache_file_name = get_cache_file_name(pool_nspace, pool_id, snap_id, object_name); cache_status_t ret = m_policy->lookup_object(cache_file_name); @@ -245,7 +242,7 @@ int ObjectCacheStore::do_evict(std::string cache_file) { return 0; } - std::string cache_file_path = std::move(get_cache_file_path(cache_file)); + std::string cache_file_path = get_cache_file_path(cache_file); ldout(m_cct, 20) << "evict cache: " << cache_file_path << dendl; -- 2.39.5