RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: simple manifest compaction

Browse Source 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2016-10-13 15:57:46 -07:00
parent 81070d3424
commit df534b413c
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/rgw/rgw_common.h
View File

@ -992,6 +992,9 @@ struct rgw_bucket {
bool operator<(const rgw_bucket& b) const {
return name.compare(b.name) < 0;
}
bool operator==(const rgw_bucket& b) const {
return (name == b.name) && (bucket_id == b.bucket_id);
}
};
WRITE_CLASS_ENCODER(rgw_bucket)

47
src/rgw/rgw_rados.h
View File

@ -346,7 +346,7 @@ protected:
uint64_t obj_size;
rgw_obj obj;
rgw_raw_obj head_obj;
rgw_raw_obj head_obj; /* in-memory only, calculated from obj */
uint64_t head_size;
uint64_t max_head_size;
@ -421,7 +421,7 @@ public:
}
void encode(bufferlist& bl) const {
ENCODE_START(6, 3, bl);
ENCODE_START(6, 6, bl);
::encode(obj_size, bl);
::encode(objs, bl);
::encode(explicit_objs, bl);
@ -430,9 +430,16 @@ public:
::encode(max_head_size, bl);
::encode(prefix, bl);
::encode(rules, bl);
::encode(tail_bucket, bl);
::encode(tail_instance, bl);
::encode(head_obj, bl);
bool encode_tail_bucket = !(tail_bucket == obj.bucket);
::encode(encode_tail_bucket, bl);
if (encode_tail_bucket) {
::encode(tail_bucket, bl);
}
bool encode_tail_instance = (tail_instance != obj.get_instance());
::encode(encode_tail_instance, bl);
if (encode_tail_instance) {
::encode(tail_instance, bl);
}
ENCODE_FINISH(bl);
}
@ -471,20 +478,36 @@ public:
}
if (struct_v >= 4) {
::decode(tail_bucket, bl);
if (struct_v < 6) {
::decode(tail_bucket, bl);
} else {
bool need_to_decode;
::decode(need_to_decode, bl);
if (need_to_decode) {
::decode(tail_bucket, bl);
} else {
tail_bucket = obj.bucket;
}
}
}
if (struct_v >= 5) {
::decode(tail_instance, bl);
if (struct_v < 6) {
::decode(tail_instance, bl);
} else {
bool need_to_decode;
::decode(need_to_decode, bl);
if (need_to_decode) {
::decode(tail_instance, bl);
} else {
tail_instance = obj.get_instance();
}
}
} else { // old object created before 'tail_instance' field added to manifest
tail_instance = obj.get_instance();
}
if (struct_v >= 6) {
::decode(head_obj, bl);
} else {
rgw_obj_to_raw(obj, &head_obj);
}
rgw_obj_to_raw(obj, &head_obj);
update_iterators();
DECODE_FINISH(bl);