diff options
| author | Greg Farnum <greg@inktank.com> | 2013-10-17 15:24:31 -0700 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-10-17 15:24:31 -0700 |
| commit | 001833c7743b6ead24de9e0d218deacb55be2978 (patch) | |
| tree | 721d18326b36d0ea973abef55fff4f2e3595191a | |
| parent | d8c9c9541d739358c9c3bf103b5a21ce13973260 (diff) | |
| download | ceph-001833c7743b6ead24de9e0d218deacb55be2978.tar.gz | |
OSD: object_copy_data_t should take advantage of bufferlist-based getattrs
Now we don't need to do the silly bufferlist-bufferptr non-magic.
Signed-off-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 2 | ||||
| -rw-r--r-- | src/osd/osd_types.cc | 6 | ||||
| -rw-r--r-- | src/osd/osd_types.h | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 7242f217b84..6dd88979f1e 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -4302,7 +4302,7 @@ int ReplicatedPG::fill_in_copy_get(bufferlist::iterator& bp, OSDOp& osd_op, reply_obj.category = oi.category; // attrs - map<string,bufferptr>& out_attrs = reply_obj.in_attrs; + map<string,bufferlist>& out_attrs = reply_obj.attrs; if (!cursor.attr_complete) { result = osd->store->getattrs(coll, soid, out_attrs, true); if (result < 0) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index dabfaf08ce5..27bb94c9411 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -2528,7 +2528,7 @@ void object_copy_data_t::encode_classic(bufferlist& bl) const { ::encode(size, bl); ::encode(mtime, bl); - ::encode(in_attrs, bl); + ::encode(attrs, bl); ::encode(data, bl); ::encode(omap, bl); ::encode(cursor, bl); @@ -2550,7 +2550,7 @@ void object_copy_data_t::encode(bufferlist& bl) const ::encode(size, bl); ::encode(mtime, bl); ::encode(category, bl); - ::encode(in_attrs, bl); + ::encode(attrs, bl); ::encode(data, bl); ::encode(omap, bl); ::encode(cursor, bl); @@ -2586,7 +2586,6 @@ void object_copy_data_t::generate_test_instances(list<object_copy_data_t*>& o) o.back()->size = 1234; o.back()->mtime.set_from_double(1234); bufferptr bp("there", 5); - o.back()->in_attrs["hello"] = bp; bufferlist bl; bl.push_back(bp); o.back()->attrs["hello"] = bl; @@ -2607,7 +2606,6 @@ void object_copy_data_t::dump(Formatter *f) const f->dump_stream("mtime") << mtime; /* we should really print out the attrs here, but bufferlist const-correctness prents that */ - f->dump_int("in_attrs_size", in_attrs.size()); f->dump_int("attrs_size", attrs.size()); f->dump_int("omap_size", omap.size()); f->dump_int("data_length", data.length()); diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 7ebe60716a1..94c72422591 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -1857,7 +1857,6 @@ struct object_copy_data_t { object_copy_cursor_t cursor; uint64_t size; utime_t mtime; - map<string, bufferptr> in_attrs; map<string, bufferlist> attrs; bufferlist data; map<string, bufferlist> omap; |