ghobject_t: use # instead of ! as a separator

! (and @) confuse less's search (/ then ! is magic).  # behaves
as expected.

Tried to fix this in 30b257c66b9d35d2f32221f76a391d18ead65756 and
failed :(.

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

diff --git a/src/common/hobject.cc b/src/common/hobject.cc
index a58a2f015774f59f830eac9cb1cd87c57183df74..51403d7c1a37e0fd94d85a7c6b08ff6b760038d8 100644 (file)
--- a/src/common/hobject.cc
+++ b/src/common/hobject.cc
@@ -541,7 +541,7 @@ ostream& operator<<(ostream& out, const ghobject_t& o)
     return out << "GHMAX";
   if (o.shard_id != shard_id_t::NO_SHARD)
     out << std::hex << o.shard_id << std::dec;
-  out << '!' << o.hobj << '!';
+  out << '#' << o.hobj << '#';
   if (o.generation != ghobject_t::NO_GEN)
     out << std::hex << (unsigned long long)(o.generation) << std::dec;
   return out;
@@ -558,12 +558,12 @@ bool ghobject_t::parse(const string& s)
     return true;
   }
 
-  // look for shard! prefix
+  // look for shard# prefix
   const char *start = s.c_str();
   const char *p;
   int sh = shard_id_t::NO_SHARD;
   for (p = start; *p && isxdigit(*p); ++p) ;
-  if (!*p && *p != '!')
+  if (!*p && *p != '#')
     return false;
   if (p > start) {
     int r = sscanf(s.c_str(), "%x", &sh);
@@ -574,13 +574,13 @@ bool ghobject_t::parse(const string& s)
     ++start;
   }
 
-  // look for !generation suffix
+  // look for #generation suffix
   long long unsigned g = NO_GEN;
   const char *last = start + strlen(start) - 1;
   p = last;
   while (isxdigit(*p))
     p--;
-  if (*p != '!')
+  if (*p != '#')
     return false;
   if (p < last) {
     sscanf(p + 1, "%llx", &g);

diff --git a/src/test/osd/types.cc b/src/test/osd/types.cc
index 371319bccce30997a6d2eca81c75095e55a4e7be..907d30681ed4042aade509ba06eb15e44ae2b9e7 100644 (file)
--- a/src/test/osd/types.cc
+++ b/src/test/osd/types.cc
@@ -1442,15 +1442,15 @@ TEST(ghobject_t, parse) {
   const char *v[] = {
     "GHMIN",
     "GHMAX",
-    "13!0:00000000::::head!",
-    "13!0:00000000::::head!deadbeef",
-    "!-1:60c2fa6d:::inc_osdmap.1:333!deadbeef",
-    "!-1:60c2fa6d:::inc%02osdmap.1:333!deadbeef",
-    "!-1:60c2fa6d:::inc_osdmap.1:333!",
-    "1!MIN!deadbeefff",
-    "1!MAX!",
-    "!MAX!123",
-    "!-40:00000000:nspace::obj:head!",
+    "13#0:00000000::::head#",
+    "13#0:00000000::::head#deadbeef",
+    "#-1:60c2fa6d:::inc_osdmap.1:333#deadbeef",
+    "#-1:60c2fa6d:::inc%02osdmap.1:333#deadbeef",
+    "#-1:60c2fa6d:::inc_osdmap.1:333#",
+    "1#MIN#deadbeefff",
+    "1#MAX#",
+    "#MAX#123",
+    "#-40:00000000:nspace::obj:head#",
     NULL
   };