RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: encode rgw_obj::orig_obj

Browse Source 
We weren't encoding orig_obj, however, it's now needed so that we can
call get_index_key() on decoded objects. Only encode/decode it if ns or
instance are not empty.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2015-02-09 18:16:13 -08:00
parent f86fb9799e
commit 3e54acbc20
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rgw/rgw_common.h
View File

@ -1266,7 +1266,7 @@ public:
/*
* get the object's key name as being referred to by the bucket index.
*/
string get_index_key_name() {
string get_index_key_name() const {
if (ns.empty()) {
if (orig_obj.size() < 1 || orig_obj[0] != '_') {
return orig_obj;
@ -1279,7 +1279,7 @@ public:
return string(buf) + orig_obj;
};
void get_index_key(rgw_obj_key *key) {
void get_index_key(rgw_obj_key *key) const {
key->name = get_index_key_name();
key->instance = instance;
}
@ -1375,17 +1375,20 @@ public:
}
void encode(bufferlist& bl) const {
ENCODE_START(4, 3, bl);
ENCODE_START(5, 3, bl);
::encode(bucket.name, bl);
::encode(loc, bl);
::encode(ns, bl);
::encode(object, bl);
::encode(bucket, bl);
::encode(instance, bl);
if (!ns.empty() || !instance.empty()) {
::encode(orig_obj, bl);
}
ENCODE_FINISH(bl);
}
void decode(bufferlist::iterator& bl) {
DECODE_START_LEGACY_COMPAT_LEN(4, 3, 3, bl);
DECODE_START_LEGACY_COMPAT_LEN(5, 3, 3, bl);
::decode(bucket.name, bl);
::decode(loc, bl);
::decode(ns, bl);
@ -1394,6 +1397,19 @@ public:
::decode(bucket, bl);
if (struct_v >= 4)
::decode(instance, bl);
if (ns.empty() && instance.empty()) {
orig_obj = object;
} else {
if (struct_v >= 5) {
::decode(orig_obj, bl);
} else {
ssize_t pos = object.find('_', 1);
if (pos < 0) {
throw buffer::error();
}
orig_obj = object.substr(pos);
}
}
DECODE_FINISH(bl);
}
void dump(Formatter *f) const;