Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ghobject_t: use ! instead of @ as a separator #7595

Merged
merged 1 commit into from Feb 12, 2016
Merged

ghobject_t: use ! instead of @ as a separator #7595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/common/hobject.cc
View file
Open in desktop
Expand Up @@ -499,7 +499,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;
Expand All @@ -516,12 +516,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);
Expand All @@ -532,13 +532,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);
Expand Down
18 changes: 9 additions & 9 deletions src/test/osd/types.cc
View file
Open in desktop
Expand Up @@ -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
};

Expand Down