RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #176 from dachary/wip-4597

Browse Source 
fix nspace assignment in LFNIndex::lfn_parse_object_name

Reviewed-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Sage Weil 2013-04-04 08:52:56 -07:00
commit 5b4cb53781
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/os/LFNIndex.cc
View File

@ -1073,6 +1073,7 @@ bool LFNIndex::lfn_parse_object_name(const string &long_name, hobject_t *out) {
pool = strtoull(pstring.c_str(), NULL, 16);
(*out) = hobject_t(name, key, snap, hash, (int64_t)pool);
out->nspace = ns;
return true;
}

29
src/test/os/TestLFNIndex.cc
View File

@ -131,6 +131,35 @@ TEST_F(TestHASH_INDEX_TAG_2, generate_and_parse_name) {
"\\dA_KEY_head_ABABABAB");
}
class TestHOBJECT_WITH_POOL : public TestWrapLFNIndex, public ::testing::Test {
public:
TestHOBJECT_WITH_POOL() : TestWrapLFNIndex(coll_t("ABC"), "PATH", CollectionIndex::HOBJECT_WITH_POOL) {
}
};
TEST_F(TestHOBJECT_WITH_POOL, generate_and_parse_name) {
const vector<string> path;
std::string mangled_name;
const std::string key("KEY");
uint64_t hash = 0xABABABAB;
uint64_t pool = 0xCDCDCDCD;
{
std::string name(".XA/B_\\C.D");
name[1] = '\0';
hobject_t hoid(object_t(name), key, CEPH_NOSNAP, hash, pool);
hoid.nspace = "NSPACE";
test_generate_and_parse(hoid, "\\.\\nA\\sB\\u\\\\C.D_KEY_head_ABABABAB_NSPACE_cdcdcdcd");
}
{
hobject_t hoid(object_t("DIR_A"), key, CEPH_NOSNAP, hash, pool);
hoid.nspace = "NSPACE";
test_generate_and_parse(hoid, "\\dA_KEY_head_ABABABAB_NSPACE_cdcdcdcd");
}
}
class TestLFNIndex : public TestWrapLFNIndex, public ::testing::Test {
public:
TestLFNIndex() : TestWrapLFNIndex(coll_t("ABC"), "PATH", CollectionIndex::HASH_INDEX_TAG) {