]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
hobject_t: modify operator<<
authorSage Weil <sage@redhat.com>
Fri, 12 Dec 2014 00:25:49 +0000 (16:25 -0800)
committerDavid Zafman <dzafman@redhat.com>
Thu, 25 Feb 2016 20:50:23 +0000 (12:50 -0800)
Put the most significant fields to the left so that it matches the sort
order.  Also use unambiguous separator when the nspace is present
(like we do with the key).

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ecdc8f697acf1627b35a83663c219a3bb0ada453)

src/common/hobject.cc

index 866c9928316f406c59d6a75c6f4921e2083a8ccf..c3a1694af37229241234df49685ae6bdcb8b1acf 100644 (file)
@@ -195,11 +195,13 @@ ostream& operator<<(ostream& out, const hobject_t& o)
 {
   if (o.is_max())
     return out << "MAX";
+  out << o.pool << '/';
   out << std::hex << o.get_hash() << std::dec;
+  if (o.nspace.length())
+    out << ":" << o.nspace;
   if (o.get_key().length())
     out << "." << o.get_key();
   out << "/" << o.oid << "/" << o.snap;
-  out << "/" << o.nspace << "/" << o.pool;
   return out;
 }