From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Aug 2015 22:40:59 +0000 (-0400)
Subject: common/hobject: rename get_bitreverse_key* -> get_bitwise_key*
X-Git-Tag: v9.1.0~324^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4afb08413ed1e675636c7f06575b5dd6f151c729;p=ceph.git

common/hobject: rename get_bitreverse_key* -> get_bitwise_key*

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/hobject.cc b/src/common/hobject.cc
index 1795cab0f35f..e651047510cd 100644
--- a/src/common/hobject.cc
+++ b/src/common/hobject.cc
@@ -259,9 +259,9 @@ int cmp_bitwise(const hobject_t& l, const hobject_t& r)
     return -1;
   if (l.pool > r.pool)
     return 1;
-  if (l.get_bitreverse_key() < r.get_bitreverse_key())
+  if (l.get_bitwise_key() < r.get_bitwise_key())
     return -1;
-  if (l.get_bitreverse_key() > r.get_bitreverse_key())
+  if (l.get_bitwise_key() > r.get_bitwise_key())
     return 1;
   if (l.nspace < r.nspace)
     return -1;
diff --git a/src/common/hobject.h b/src/common/hobject.h
index 2d1c3c7e4228..e92cc6e182dd 100644
--- a/src/common/hobject.h
+++ b/src/common/hobject.h
@@ -219,11 +219,11 @@ public:
   }
 
   // newer bit-reversed key
-  uint64_t get_bitreverse_key_u32() const {
+  uint32_t get_bitwise_key_u32() const {
     assert(!max);
     return hash_reverse_bits;
   }
-  uint64_t get_bitreverse_key() const {
+  uint64_t get_bitwise_key() const {
     return max ? 0x100000000ull : hash_reverse_bits;
   }
 
@@ -235,6 +235,10 @@ public:
     hash = _reverse_nibbles(value);
     build_hash_cache();
   }
+  void set_bitwise_key_u32(uint32_t value) {
+    hash = _reverse_bits(value);
+    build_hash_cache();
+  }
 
   const string& get_effective_key() const {
     if (key.length())
diff --git a/src/os/GenericObjectMap.cc b/src/os/GenericObjectMap.cc
index 7df0fb05c766..8567d30af29e 100644
--- a/src/os/GenericObjectMap.cc
+++ b/src/os/GenericObjectMap.cc
@@ -133,7 +133,7 @@ string GenericObjectMap::header_key(const coll_t &cid, const ghobject_t &oid)
 
   t = buf;
   snprintf(t, end - t, "%.*X", (int)(sizeof(oid.hobj.get_hash())*2),
-           oid.hobj.get_bitreverse_key_u32());
+           (uint32_t)oid.hobj.get_bitwise_key_u32());
   full_name += string(buf);
   full_name.append(GHOBJECT_KEY_SEP_S);