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

rgw: translate object marker to raw format

Browse Source 
Fixes: #4600
Object marker should be treated as an object, so that name is formatted
correctly when getting the raw oid.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Yehuda Sadeh 2013-03-31 00:02:15 -07:00 committed by caleb miles
parent be6961bd28
commit b083dece36
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rgw/rgw_rados.cc
View File

@ -728,24 +728,17 @@ int RGWRados::list_objects(rgw_bucket& bucket, int max, string& prefix, string&
bool get_content_type, string& ns, bool *is_truncated, RGWAccessListFilter *filter)
{
int count = 0;
string cur_marker = marker;
bool truncated;
string ns_prefix;
if (bucket_is_system(bucket)) {
return -EINVAL;
}
result.clear();
if (!ns.empty()) {
ns_prefix = "_";
ns_prefix += ns + "_";
if (cur_marker < ns_prefix) {
cur_marker = ns_prefix;
} else if (cur_marker.substr(0, ns.size()) > ns_prefix) {
truncated = false;
goto done;
}
}
rgw_obj marker_obj;
marker_obj.set_ns(ns);
marker_obj.set_obj(marker);
string cur_marker = marker_obj.object;
do {
std::map<string, RGWObjEnt> ent_map;