librados: use std::string, not nstring, in c++ api

diff --git a/src/include/librados.h b/src/include/librados.h
index 5eb8c892a94b829cf42e1bd83b0b05ad24fab8b3..cd8086bd19e91685fa71c9b9fd925ff88972df3a 100644 (file)
--- a/src/include/librados.h
+++ b/src/include/librados.h
@@ -104,21 +104,21 @@ public:
 
   void set_snap(rados_pool_t pool, __u64 seq);
 
-  int create(rados_pool_t pool, const object_t& oid, bool exclusive);
+  int create(rados_pool_t pool, const std::string& oid, bool exclusive);
 
-  int write(rados_pool_t pool, const object_t& oid, off_t off, bufferlist& bl, size_t len);
-  int write_full(rados_pool_t pool, const object_t& oid, bufferlist& bl);
-  int read(rados_pool_t pool, const object_t& oid, off_t off, bufferlist& bl, size_t len);
-  int remove(rados_pool_t pool, const object_t& oid);
+  int write(rados_pool_t pool, const std::string& oid, off_t off, bufferlist& bl, size_t len);
+  int write_full(rados_pool_t pool, const std::string& oid, bufferlist& bl);
+  int read(rados_pool_t pool, const std::string& oid, off_t off, bufferlist& bl, size_t len);
+  int remove(rados_pool_t pool, const std::string& oid);
 
-  int getxattr(rados_pool_t pool, const object_t& oid, const char *name, bufferlist& bl);
-  int setxattr(rados_pool_t pool, const object_t& oid, const char *name, bufferlist& bl);
-  int getxattrs(rados_pool_t pool, const object_t& oid, map<nstring, bufferlist>& attrset);
-  int stat(rados_pool_t pool, const object_t& oid, __u64 *psize, time_t *pmtime);
+  int getxattr(rados_pool_t pool, const std::string& oid, const char *name, bufferlist& bl);
+  int setxattr(rados_pool_t pool, const std::string& oid, const char *name, bufferlist& bl);
+  int getxattrs(rados_pool_t pool, const std::string& oid, map<std::string, bufferlist>& attrset);
+  int stat(rados_pool_t pool, const std::string& oid, __u64 *psize, time_t *pmtime);
 
-  int tmap_update(rados_pool_t pool, const object_t& oid, bufferlist& cmdbl);
+  int tmap_update(rados_pool_t pool, const std::string& oid, bufferlist& cmdbl);
   
-  int exec(rados_pool_t pool, const object_t& oid, const char *cls, const char *method,
+  int exec(rados_pool_t pool, const std::string& oid, const char *cls, const char *method,
           bufferlist& inbl, bufferlist& outbl);
 
   struct ListCtx {
@@ -126,7 +126,7 @@ public:
     ListCtx() : ctx(NULL) {}
   };
 
-  int list(rados_pool_t pool, int max, std::list<object_t>& entries, Rados::ListCtx& ctx);
+  int list(rados_pool_t pool, int max, std::list<std::string>& entries, Rados::ListCtx& ctx);
   int list_pools(std::vector<std::string>& v);
   int get_pool_stats(std::vector<std::string>& v,
                     std::map<std::string,rados_pool_stat_t>& stats);
@@ -156,9 +156,9 @@ public:
     void release();
   };
 
-  int aio_read(rados_pool_t pool, const object_t& oid, off_t off, bufferlist *pbl, size_t len,
+  int aio_read(rados_pool_t pool, const std::string& oid, off_t off, bufferlist *pbl, size_t len,
               AioCompletion **pc);
-  int aio_write(rados_pool_t pool, const object_t& oid, off_t off, const bufferlist& bl, size_t len,
+  int aio_write(rados_pool_t pool, const std::string& oid, off_t off, const bufferlist& bl, size_t len,
                AioCompletion **pc);
 
 };

diff --git a/src/include/object.h b/src/include/object.h
index 1a3d5b0577e36a3f9382c88f5321044f98bad08f..75be694cf69fa8f5abe8192b993b123e1594523d 100644 (file)
--- a/src/include/object.h
+++ b/src/include/object.h
@@ -33,6 +33,7 @@ struct object_t {
   nstring name;
 
   object_t(const char *s = 0) : name(s) {}
+  object_t(const string& s) : name(s) {}
   void swap(object_t& o) {
     name.swap(o.name);
   }

diff --git a/src/librados.cc b/src/librados.cc
index 9311324e456ac8ebbbab4b6e2b785b01993bd9b9..44c217d9b363699fe3262bbb3db381ee3f646e37 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -124,7 +124,7 @@ public:
 
   int getxattr(PoolCtx& pool, const object_t& oid, const char *name, bufferlist& bl);
   int setxattr(PoolCtx& pool, const object_t& oid, const char *name, bufferlist& bl);
-  int getxattrs(PoolCtx& pool, const object_t& oid, map<nstring, bufferlist>& attrset);
+  int getxattrs(PoolCtx& pool, const object_t& oid, map<string, bufferlist>& attrset);
 
   int list_pools(std::vector<string>& ls);
   int get_pool_stats(std::vector<string>& ls, map<string,rados_pool_stat_t>& result);
@@ -1063,7 +1063,7 @@ int RadosClient::setxattr(PoolCtx& pool, const object_t& oid, const char *name,
   return bl.length();
 }
 
-int RadosClient::getxattrs(PoolCtx& pool, const object_t& oid, map<nstring, bufferlist>& attrset)
+int RadosClient::getxattrs(PoolCtx& pool, const object_t& oid, map<std::string, bufferlist>& attrset)
 {
   utime_t ut = g_clock.now();
 
@@ -1080,11 +1080,16 @@ int RadosClient::getxattrs(PoolCtx& pool, const object_t& oid, map<nstring, buff
 
   lock.Lock();
   ceph_object_layout layout = objecter->osdmap->make_object_layout(oid, pool.poolid);
+  map<nstring, bufferlist> aset;
   objecter->getxattrs(oid, layout, pool.snap_seq,
-                  attrset,
-                 0, onack);
+                     aset,
+                     0, onack);
   lock.Unlock();
 
+  attrset.clear();
+  for (map<nstring,bufferlist>::iterator p = aset.begin(); p != aset.end(); p++)
+    attrset[p->first.c_str()] = p->second;
+
   mylock.Lock();
   while (!done)
     cond.Wait(mylock);
@@ -1166,7 +1171,7 @@ int Rados::get_fs_stats(rados_statfs_t& result) {
   return client->get_fs_stats(result);
 }
 
-int Rados::list(rados_pool_t pool, int max, std::list<object_t>& entries, Rados::ListCtx& ctx)
+int Rados::list(rados_pool_t pool, int max, std::list<string>& entries, Rados::ListCtx& ctx)
 {
   if (!client)
     return -EINVAL;
@@ -1179,93 +1184,100 @@ int Rados::list(rados_pool_t pool, int max, std::list<object_t>& entries, Rados:
   }
 
   op = (Objecter::ListContext *) ctx.ctx;
-  return client->list(*(RadosClient::PoolCtx *)pool, max, entries, op);
+  std::list<object_t> e;
+  int r = client->list(*(RadosClient::PoolCtx *)pool, max, e, op);
+  while (!e.empty()) {
+    entries.push_back(e.front().name.c_str());
+    e.pop_front();
+  }
+  return r;
 }
 
-int Rados::create(rados_pool_t pool, const object_t& oid, bool exclusive)
+int Rados::create(rados_pool_t pool, const string& o, bool exclusive)
 {
   if (!client)
     return -EINVAL;
-
+  object_t oid(o);
   return client->create(*(RadosClient::PoolCtx *)pool, oid, exclusive);
 }
 
-int Rados::write(rados_pool_t pool, const object_t& oid, off_t off, bufferlist& bl, size_t len)
+int Rados::write(rados_pool_t pool, const string& o, off_t off, bufferlist& bl, size_t len)
 {
   if (!client)
     return -EINVAL;
-
+  object_t oid(o);
   return client->write(*(RadosClient::PoolCtx *)pool, oid, off, bl, len);
 }
 
-int Rados::write_full(rados_pool_t pool, const object_t& oid, bufferlist& bl)
+int Rados::write_full(rados_pool_t pool, const string& o, bufferlist& bl)
 {
   if (!client)
     return -EINVAL;
-
+  object_t oid(o);
   return client->write_full(*(RadosClient::PoolCtx *)pool, oid, bl);
 }
 
-int Rados::remove(rados_pool_t pool, const object_t& oid)
+int Rados::remove(rados_pool_t pool, const string& o)
 {
   if (!client)
     return -EINVAL;
-
+  object_t oid(o);
   return client->remove(*(RadosClient::PoolCtx *)pool, oid);
 }
 
-int Rados::read(rados_pool_t pool, const object_t& oid, off_t off, bufferlist& bl, size_t len)
+int Rados::read(rados_pool_t pool, const string& o, off_t off, bufferlist& bl, size_t len)
 {
   if (!client)
     return -EINVAL;
-
+  object_t oid(o);
   return client->read(*(RadosClient::PoolCtx *)pool, oid, off, bl, len);
 }
 
-int Rados::getxattr(rados_pool_t pool, const object_t& oid, const char *name, bufferlist& bl)
+int Rados::getxattr(rados_pool_t pool, const string& o, const char *name, bufferlist& bl)
 {
   if (!client)
     return -EINVAL;
-
+  object_t oid(o);
   return client->getxattr(*(RadosClient::PoolCtx *)pool, oid, name, bl);
 }
 
-int Rados::getxattrs(rados_pool_t pool, const object_t& oid, map<nstring, bufferlist>& attrset)
+int Rados::getxattrs(rados_pool_t pool, const string& o, map<std::string, bufferlist>& attrset)
 {
   if (!client)
     return -EINVAL;
-
+  object_t oid(o);
   return client->getxattrs(*(RadosClient::PoolCtx *)pool, oid, attrset);
 }
 
-int Rados::setxattr(rados_pool_t pool, const object_t& oid, const char *name, bufferlist& bl)
+int Rados::setxattr(rados_pool_t pool, const string& o, const char *name, bufferlist& bl)
 {
   if (!client)
     return -EINVAL;
-
+  object_t oid(o);
   return client->setxattr(*(RadosClient::PoolCtx *)pool, oid, name, bl);
 }
 
-int Rados::stat(rados_pool_t pool, const object_t& oid, __u64 *psize, time_t *pmtime)
+int Rados::stat(rados_pool_t pool, const string& o, __u64 *psize, time_t *pmtime)
 {
   if (!client)
     return -EINVAL;
-
+  object_t oid(o);
   return client->stat(*(RadosClient::PoolCtx *)pool, oid, psize, pmtime);
 }
 
-int Rados::tmap_update(rados_pool_t pool, const object_t& oid, bufferlist& cmdbl)
+int Rados::tmap_update(rados_pool_t pool, const string& o, bufferlist& cmdbl)
 {
   if (!client)
     return -EINVAL;
+  object_t oid(o);
   return client->tmap_update(*(RadosClient::PoolCtx *)pool, oid, cmdbl);
 }
-int Rados::exec(rados_pool_t pool, const object_t& oid, const char *cls, const char *method,
+int Rados::exec(rados_pool_t pool, const string& o, const char *cls, const char *method,
                bufferlist& inbl, bufferlist& outbl)
 {
   if (!client)
     return -EINVAL;
-
+  object_t oid(o);
   return client->exec(*(RadosClient::PoolCtx *)pool, oid, cls, method, inbl, outbl);
 }
 
@@ -1343,7 +1355,7 @@ int Rados::snap_get_stamp(rados_pool_t pool, rados_snap_t snapid, time_t *t)
 }
 
 // AIO
-int Rados::aio_read(rados_pool_t pool, const object_t& oid, off_t off, bufferlist *pbl, size_t len,
+int Rados::aio_read(rados_pool_t pool, const string& oid, off_t off, bufferlist *pbl, size_t len,
                    Rados::AioCompletion **pc)
 {
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
@@ -1355,7 +1367,7 @@ int Rados::aio_read(rados_pool_t pool, const object_t& oid, off_t off, bufferlis
   return r;
 }
 
-int Rados::aio_write(rados_pool_t pool, const object_t& oid, off_t off, const bufferlist& bl, size_t len,
+int Rados::aio_write(rados_pool_t pool, const string& oid, off_t off, const bufferlist& bl, size_t len,
                     AioCompletion **pc)
 {
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;

diff --git a/src/rados.cc b/src/rados.cc
index fef6c7cb498c62bd4fde118f5d30b0dbdcc65a7a..faffe5c8c248927c1c9c466d0e87897506666c15 100644 (file)
--- a/src/rados.cc
+++ b/src/rados.cc
@@ -205,7 +205,7 @@ int main(int argc, const char **argv)
 
     Rados::ListCtx ctx;
     while (1) {
-      list<object_t> vec;
+      list<string> vec;
       ret = rados.list(p, 1 << 10, vec, ctx);
       if (ret < 0) {
        cerr << "got error: " << strerror_r(-ret, buf, sizeof(buf)) << std::endl;
@@ -214,8 +214,8 @@ int main(int argc, const char **argv)
       if (vec.empty())
        break;
 
-      for (list<object_t>::iterator iter = vec.begin(); iter != vec.end(); ++iter)
-       *outstream << iter->name << std::endl;
+      for (list<string>::iterator iter = vec.begin(); iter != vec.end(); ++iter)
+       *outstream << *iter << std::endl;
     }
     if (!stdout)
       delete outstream;
@@ -235,7 +235,7 @@ int main(int argc, const char **argv)
   else if (strcmp(nargs[0], "get") == 0) {
     if (!pool || nargs.size() < 3)
       usage();
-    object_t oid(nargs[1]);
+    string oid(nargs[1]);
     ret = rados.read(p, oid, 0, outdata, 0);
     if (ret < 0) {
       cerr << "error reading " << pool << "/" << oid << ": " << strerror_r(-ret, buf, sizeof(buf)) << std::endl;
@@ -254,7 +254,7 @@ int main(int argc, const char **argv)
     if (!pool || nargs.size() < 3)
       usage();
 
-    object_t oid(nargs[1]);
+    string oid(nargs[1]);
 
     if (strcmp(nargs[2], "-") == 0) {
       char buf[256];
@@ -280,7 +280,7 @@ int main(int argc, const char **argv)
   else if (strcmp(nargs[0], "rm") == 0) {
     if (!pool || nargs.size() < 2)
       usage();
-    object_t oid(nargs[1]);
+    string oid(nargs[1]);
     ret = rados.remove(p, oid);
     if (ret < 0) {
       cerr << "error removing " << pool << "/" << oid << ": " << strerror_r(-ret, buf, sizeof(buf)) << std::endl;

diff --git a/src/radosacl.cc b/src/radosacl.cc
index 5d5dc710a5a229406c7a37f80a8cb11a6ed31315..608fc5d21be2287e35c55ae47ce8cb9c229b7d45 100644 (file)
--- a/src/radosacl.cc
+++ b/src/radosacl.cc
@@ -136,7 +136,7 @@ int main(int argc, const char **argv)
   snprintf(buf, 128, "%s", ctime(&tm));
   bl.append(buf, strlen(buf));
 
-  object_t oid("bar");
+  const char *oid = "bar";
 
   rados_pool_t pool;
   int r = rados.open_pool("data", &pool);

diff --git a/src/rbdtool.cc b/src/rbdtool.cc
index 26e6ab4adab3b4f7fbc63a9b8902bd8300c1ef85..e992862f8e7541ad91715a1552c6777027525ca8 100644 (file)
--- a/src/rbdtool.cc
+++ b/src/rbdtool.cc
@@ -109,10 +109,9 @@ int main(int argc, const char **argv)
   if (!opt_create && !opt_delete && !opt_list)
     usage();
 
-  string imgmd_str = imgname;
-  imgmd_str += RBD_SUFFIX;
-  object_t md_oid(imgmd_str.c_str());
-  object_t dir_oid(RBD_DIRECTORY);
+  string md_oid = imgname;
+  md_oid += RBD_SUFFIX;
+  string dir_oid = RBD_DIRECTORY;
 
   rados_pool_t pool;
 
@@ -203,7 +202,7 @@ int main(int argc, const char **argv)
       for (__u64 i=0; i<numseg; i++) {
        char o[RBD_MAX_SEG_NAME_SIZE];
        sprintf(o, "%s.%012llx", imgname, (unsigned long long)i);
-       object_t oid(o);
+       string oid = o;
        rados.remove(pool, oid);
        if ((i & 127) == 0) {
          cout << "\r\t" << i << "/" << numseg;

diff --git a/src/rgw/rgw_access.h b/src/rgw/rgw_access.h
index ce6ef38a4a7e1e66b5d67f06a012c03bb481b0eb..9c09fa2558d3e8a44daf5f6e6a6d8a04703cc4f7 100644 (file)
--- a/src/rgw/rgw_access.h
+++ b/src/rgw/rgw_access.h
@@ -40,12 +40,12 @@ public:
                            std::string& marker, std::vector<RGWObjEnt>& result, map<string, bool>& common_prefixes) = 0;
 
   /** Create a new bucket*/
-  virtual int create_bucket(std::string& id, std::string& bucket, map<nstring, bufferlist>& attrs, __u64 auid=0) = 0;
+  virtual int create_bucket(std::string& id, std::string& bucket, map<std::string, bufferlist>& attrs, __u64 auid=0) = 0;
   /** write an object to the storage device in the appropriate pool
     with the given stats */
   virtual int put_obj(std::string& id, std::string& bucket, std::string& obj, const char *data, size_t size,
                       time_t *mtime,
-                      map<nstring, bufferlist>& attrs) = 0;
+                      map<std::string, bufferlist>& attrs) = 0;
   /**
    * Copy an object.
    * id: unused (well, it's passed to put_obj)
@@ -66,7 +66,7 @@ public:
                       const time_t *unmod_ptr,
                       const char *if_match,
                       const char *if_nomatch,
-                      map<nstring, bufferlist>& attrs,
+                      map<std::string, bufferlist>& attrs,
                       struct rgw_err *err) = 0;
   /**
    * Delete a bucket.
@@ -109,14 +109,14 @@ public:
  *          (if get_data==false) length of the object
  */
   virtual int get_obj(std::string& bucket, std::string& obj, 
-            char **data, off_t ofs, off_t end,
-            map<nstring, bufferlist> *attrs,
-            const time_t *mod_ptr,
-            const time_t *unmod_ptr,
-            const char *if_match,
-            const char *if_nomatch,
-            bool get_data,
-            struct rgw_err *err) = 0;
+                     char **data, off_t ofs, off_t end,
+                     map<std::string, bufferlist> *attrs,
+                     const time_t *mod_ptr,
+                     const time_t *unmod_ptr,
+                     const char *if_match,
+                     const char *if_nomatch,
+                     bool get_data,
+                     struct rgw_err *err) = 0;
 
   /**
    * Get the attributes for an object.

diff --git a/src/rgw/rgw_fs.cc b/src/rgw/rgw_fs.cc
index 927432f340b933592876694dff7937792e2121d8..bbbbb3c94eb6dde3a6dc896675995d6fd219c4e7 100644 (file)
--- a/src/rgw/rgw_fs.cc
+++ b/src/rgw/rgw_fs.cc
@@ -145,7 +145,7 @@ int RGWFS::list_objects(string& id, string& bucket, int max, string& prefix, str
 }
 
 
-int RGWFS::create_bucket(std::string& id, std::string& bucket, map<nstring, bufferlist>& attrs, __u64 auid)
+int RGWFS::create_bucket(std::string& id, std::string& bucket, map<std::string, bufferlist>& attrs, __u64 auid)
 {
   int len = strlen(DIR_NAME) + 1 + bucket.size() + 1;
   char buf[len];
@@ -154,9 +154,9 @@ int RGWFS::create_bucket(std::string& id, std::string& bucket, map<nstring, buff
   if (mkdir(buf, 0755) < 0)
     return -errno;
 
-  map<nstring, bufferlist>::iterator iter;
+  map<std::string, bufferlist>::iterator iter;
   for (iter = attrs.begin(); iter != attrs.end(); ++iter) {
-    nstring name = iter->first;
+    const string& name = iter->first;
     bufferlist& bl = iter->second;
     
     if (bl.length()) {
@@ -174,7 +174,7 @@ int RGWFS::create_bucket(std::string& id, std::string& bucket, map<nstring, buff
 
 int RGWFS::put_obj(std::string& id, std::string& bucket, std::string& obj, const char *data, size_t size,
                   time_t *mtime,
-                  map<nstring, bufferlist>& attrs)
+                  map<string, bufferlist>& attrs)
 {
   int len = strlen(DIR_NAME) + 1 + bucket.size() + 1 + obj.size() + 1;
   char buf[len];
@@ -186,9 +186,9 @@ int RGWFS::put_obj(std::string& id, std::string& bucket, std::string& obj, const
     return -errno;
 
   int r;
-  map<nstring, bufferlist>::iterator iter;
+  map<string, bufferlist>::iterator iter;
   for (iter = attrs.begin(); iter != attrs.end(); ++iter) {
-    nstring name = iter->first;
+    const string& name = iter->first;
     bufferlist& bl = iter->second;
     
     if (bl.length()) {
@@ -235,25 +235,25 @@ int RGWFS::copy_obj(std::string& id, std::string& dest_bucket, std::string& dest
                const time_t *unmod_ptr,
                const char *if_match,
                const char *if_nomatch,
-               map<nstring, bufferlist>& attrs,
+               map<string, bufferlist>& attrs,
                struct rgw_err *err)
 {
   int ret;
   char *data;
 
-  map<nstring, bufferlist> attrset;
+  map<string, bufferlist> attrset;
   ret = get_obj(src_bucket, src_obj, &data, 0, -1, &attrset,
                 mod_ptr, unmod_ptr, if_match, if_nomatch, true, err);
   if (ret < 0)
     return ret;
 
-  map<nstring, bufferlist>::iterator iter;
+  map<string, bufferlist>::iterator iter;
   for (iter = attrs.begin(); iter != attrs.end(); ++iter) {
     attrset[iter->first] = iter->second;
   }
   attrs = attrset;
 
-  ret =  put_obj(id, dest_bucket, dest_obj, data, ret, mtime, attrs);
+  ret = put_obj(id, dest_bucket, dest_obj, data, ret, mtime, attrs);
 
   return ret;
 }
@@ -377,7 +377,7 @@ int RGWFS::set_attr(std::string& bucket, std::string& obj,
 
 int RGWFS::get_obj(std::string& bucket, std::string& obj, 
             char **data, off_t ofs, off_t end,
-            map<nstring, bufferlist> *attrs,
+            map<string, bufferlist> *attrs,
             const time_t *mod_ptr,
             const time_t *unmod_ptr,
             const char *if_match,

diff --git a/src/rgw/rgw_fs.h b/src/rgw/rgw_fs.h
index 0092d1fdbc2befa4df6d036613c37576941699d0..084c5fa5e94bfeeb8b43350325b6cec12ffa1522 100644 (file)
--- a/src/rgw/rgw_fs.h
+++ b/src/rgw/rgw_fs.h
@@ -13,10 +13,10 @@ public:
   int list_objects(std::string& id, std::string& bucket, int max, std::string& prefix, std::string& delim,
                    std::string& marker, std::vector<RGWObjEnt>& result, map<string, bool>& common_prefixes);
 
-  int create_bucket(std::string& id, std::string& bucket, map<nstring, bufferlist>& attrs, __u64 auid=0);
+  int create_bucket(std::string& id, std::string& bucket, map<std::string, bufferlist>& attrs, __u64 auid=0);
   int put_obj(std::string& id, std::string& bucket, std::string& obj, const char *data, size_t size,
               time_t *mtime,
-               map<nstring, bufferlist>& attrs);
+             map<std::string, bufferlist>& attrs);
   int copy_obj(std::string& id, std::string& dest_bucket, std::string& dest_obj,
                std::string& src_bucket, std::string& src_obj,
                time_t *mtime,
@@ -24,7 +24,7 @@ public:
                const time_t *unmod_ptr,
                const char *if_match,
                const char *if_nomatch,
-               map<nstring, bufferlist>& attrs,
+               map<std::string, bufferlist>& attrs,
                struct rgw_err *err);
   int delete_bucket(std::string& id, std::string& bucket);
   int delete_obj(std::string& id, std::string& bucket, std::string& obj);
@@ -38,7 +38,7 @@ public:
 
  int get_obj(std::string& bucket, std::string& obj, 
             char **data, off_t ofs, off_t end,
-            map<nstring, bufferlist> *attrs,
+            map<std::string, bufferlist> *attrs,
             const time_t *mod_ptr,
             const time_t *unmod_ptr,
             const char *if_match,

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index c18de46c04a3681eedd63dc01759f712a542e9a3..68406ce1558ef68087c39330ef39cc03f39fad5b 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -50,7 +50,7 @@ done:
  * attrs: will be filled up with attrs mapped as <attr_name, attr_contents>
  *
  */
-void get_request_metadata(struct req_state *s, map<nstring, bufferlist>& attrs)
+void get_request_metadata(struct req_state *s, map<string, bufferlist>& attrs)
 {
   map<string, string>::iterator iter;
   for (iter = s->x_amz_map.begin(); iter != s->x_amz_map.end(); ++iter) {
@@ -203,7 +203,7 @@ done:
 void RGWCreateBucket::execute()
 {
   RGWAccessControlPolicy policy;
-  map<nstring, bufferlist> attrs;
+  map<string, bufferlist> attrs;
   bufferlist aclbl;
 
   bool pol_ret = policy.create_canned(s->user.user_id, s->user.display_name, s->canned_acl);
@@ -331,7 +331,7 @@ void RGWPutObj::execute()
     policy.encode(aclbl);
 
     string md5_str(calc_md5);
-    map<nstring, bufferlist> attrs;
+    map<string, bufferlist> attrs;
     bufferlist bl;
     bl.append(md5_str.c_str(), md5_str.size() + 1);
     attrs[RGW_ATTR_ETAG] = bl;
@@ -395,7 +395,7 @@ int RGWCopyObj::init_common()
   RGWAccessControlPolicy dest_policy;
   bool ret;
   bufferlist aclbl;
-  map<nstring, bufferlist> attrs;
+  map<string, bufferlist> attrs;
   bufferlist bl;
   RGWAccessControlPolicy src_policy;
   string empty_str;

diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 88e186dd7ea349f6b337cbccf87d00e7af1db4e7..64a9283f96103a51adc124bb5fee58aa09524924 100644 (file)
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -19,7 +19,7 @@ using namespace std;
 struct req_state;
 
 /** Get the HTTP request metadata */
-extern void get_request_metadata(struct req_state *s, map<nstring, bufferlist>& attrs);
+extern void get_request_metadata(struct req_state *s, map<string, bufferlist>& attrs);
 /**
  * Get the ACL for an object off of disk. If you hold the req_state, use next
  * method.
@@ -56,7 +56,7 @@ protected:
   time_t unmod_time;
   time_t *mod_ptr;
   time_t *unmod_ptr;
-  map<nstring, bufferlist> attrs;
+  map<string, bufferlist> attrs;
   char *data;
   int ret;
   struct rgw_err err;
@@ -219,7 +219,7 @@ protected:
   time_t *mod_ptr;
   time_t *unmod_ptr;
   int ret;
-  map<nstring, bufferlist> attrs;
+  map<string, bufferlist> attrs;
   struct rgw_err err;
   string src_bucket;
   string src_object;

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 95dde4aa64d6c32e9145fc5df215879887982d48..788722f3cfd76d7b1575c4a81cb3ccbd89ed8cc8 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -131,10 +131,10 @@ static int open_pool(string& bucket, rados_pool_t *pool)
  *     here.
  */
 int RGWRados::list_objects(string& id, string& bucket, int max, string& prefix, string& delim,
-                          string& marker, vector<RGWObjEnt>& result, map<string, bool>& common_prefixes)
+                          string& marker, vector<RGWObjEnt>& result, map<string, bool>& common_prefixes)
 {
   rados_pool_t pool;
-  map<string, object_t> dir_map;
+  set<string> dir_set;
 
   int r = rados->open_pool(bucket.c_str(), &pool);
   if (r < 0)
@@ -145,37 +145,34 @@ int RGWRados::list_objects(string& id, string& bucket, int max, string& prefix,
 #define MAX_ENTRIES 1000
 
   do {
-    list<object_t> entries;
+    list<string> entries;
     r = rados->list(pool, MAX_ENTRIES, entries, ctx);
     if (r < 0)
       return r;
 
-    list<object_t>::iterator iter;
-    for (iter = entries.begin(); iter != entries.end(); ++iter) {
-      string name = iter->name.c_str();
-
+    for (list<string>::iterator iter = entries.begin(); iter != entries.end(); ++iter) {
       if (prefix.empty() ||
-          (name.compare(0, prefix.size(), prefix) == 0)) {
-        dir_map[name] = *iter;
+          (iter->compare(0, prefix.size(), prefix) == 0)) {
+        dir_set.insert(*iter);
       }
     }
   } while (r);
 
-  map<string, object_t>::iterator map_iter;
+  set<string>::iterator p;
   if (!marker.empty())
-    map_iter = dir_map.lower_bound(marker);
+    p = dir_set.lower_bound(marker);
   else
-    map_iter = dir_map.begin();
+    p = dir_set.begin();
 
   if (max < 0) {
-    max = dir_map.size();
+    max = dir_set.size();
   }
 
   result.clear();
   int i, count = 0;
-  for (i=0; i<max && map_iter != dir_map.end(); i++, ++map_iter) {
+  for (i=0; i<max && p != dir_set.end(); i++, ++p) {
     RGWObjEnt obj;
-    obj.name = map_iter->first;
+    obj.name = *p;
 
     if (!delim.empty()) {
       int delim_pos = obj.name.find(delim, prefix.size());
@@ -187,13 +184,13 @@ int RGWRados::list_objects(string& id, string& bucket, int max, string& prefix,
     }
 
     __u64 s;
-    if (rados->stat(pool, map_iter->second, &s, &obj.mtime) < 0)
+    if (rados->stat(pool, *p, &s, &obj.mtime) < 0)
       continue;
     obj.size = s;
 
     bufferlist bl; 
     obj.etag[0] = '\0';
-    if (rados->getxattr(pool, map_iter->second, RGW_ATTR_ETAG, bl) >= 0) {
+    if (rados->getxattr(pool, *p, RGW_ATTR_ETAG, bl) >= 0) {
       strncpy(obj.etag, bl.c_str(), sizeof(obj.etag));
       obj.etag[sizeof(obj.etag)-1] = '\0';
     }
@@ -209,21 +206,19 @@ int RGWRados::list_objects(string& id, string& bucket, int max, string& prefix,
  * if auid is set, it sets the auid of the underlying rados pool
  * returns 0 on success, -ERR# otherwise.
  */
-int RGWRados::create_bucket(std::string& id, std::string& bucket, map<nstring, bufferlist>& attrs, __u64 auid)
+int RGWRados::create_bucket(std::string& id, std::string& bucket, map<std::string, bufferlist>& attrs, __u64 auid)
 {
-  object_t bucket_oid(bucket.c_str());
-
-  int ret = rados->create(root_pool, bucket_oid, true);
+  int ret = rados->create(root_pool, bucket, true);
   if (ret < 0)
     return ret;
 
-  map<nstring, bufferlist>::iterator iter;
+  map<string, bufferlist>::iterator iter;
   for (iter = attrs.begin(); iter != attrs.end(); ++iter) {
-    nstring name = iter->first;
+    string name = iter->first;
     bufferlist& bl = iter->second;
     
     if (bl.length()) {
-      ret = rados->setxattr(root_pool, bucket_oid, name.c_str(), bl);
+      ret = rados->setxattr(root_pool, bucket, name.c_str(), bl);
       if (ret < 0) {
         delete_bucket(id, bucket);
         return ret;
@@ -247,9 +242,9 @@ int RGWRados::create_bucket(std::string& id, std::string& bucket, map<nstring, b
  * attrs: all the given attrs are written to bucket storage for the given object
  * Returns: 0 on success, -ERR# otherwise.
  */
-int RGWRados::put_obj(std::string& id, std::string& bucket, std::string& obj, const char *data, size_t size,
+int RGWRados::put_obj(std::string& id, std::string& bucket, std::string& oid, const char *data, size_t size,
                   time_t *mtime,
-                  map<nstring, bufferlist>& attrs)
+                  map<string, bufferlist>& attrs)
 {
   rados_pool_t pool;
 
@@ -257,11 +252,9 @@ int RGWRados::put_obj(std::string& id, std::string& bucket, std::string& obj, co
   if (r < 0)
     return r;
 
-  object_t oid(obj.c_str());
-
-  map<nstring, bufferlist>::iterator iter;
+  map<string, bufferlist>::iterator iter;
   for (iter = attrs.begin(); iter != attrs.end(); ++iter) {
-    nstring name = iter->first;
+    const string& name = iter->first;
     bufferlist& bl = iter->second;
 
     if (bl.length()) {
@@ -305,7 +298,7 @@ int RGWRados::copy_obj(std::string& id, std::string& dest_bucket, std::string& d
                const time_t *unmod_ptr,
                const char *if_match,
                const char *if_nomatch,
-               map<nstring, bufferlist>& attrs,  /* in/out */
+               map<string, bufferlist>& attrs,  /* in/out */
                struct rgw_err *err)
 {
   int ret;
@@ -313,14 +306,14 @@ int RGWRados::copy_obj(std::string& id, std::string& dest_bucket, std::string& d
 
   cerr << "copy " << src_bucket << ":" << src_obj << " => " << dest_bucket << ":" << dest_obj << std::endl;
 
-  map<nstring, bufferlist> attrset;
+  map<string, bufferlist> attrset;
   ret = get_obj(src_bucket, src_obj, &data, 0, -1, &attrset,
                 mod_ptr, unmod_ptr, if_match, if_nomatch, true, err);
 
   if (ret < 0)
     return ret;
 
-  map<nstring, bufferlist>::iterator iter;
+  map<string, bufferlist>::iterator iter;
   for (iter = attrs.begin(); iter != attrs.end(); ++iter) {
     attrset[iter->first] = iter->second;
   }
@@ -356,7 +349,7 @@ int RGWRados::delete_bucket(std::string& id, std::string& bucket)
  * obj: name of the object to delete
  * Returns: 0 on success, -ERR# otherwise.
  */
-int RGWRados::delete_obj(std::string& id, std::string& bucket, std::string& obj)
+int RGWRados::delete_obj(std::string& id, std::string& bucket, std::string& oid)
 {
   rados_pool_t pool;
 
@@ -364,8 +357,6 @@ int RGWRados::delete_obj(std::string& id, std::string& bucket, std::string& obj)
   if (r < 0)
     return r;
 
-  object_t oid(obj.c_str());
-
   r = rados->remove(pool, oid);
   if (r < 0)
     return r;
@@ -397,8 +388,7 @@ int RGWRados::get_attr(std::string& bucket, std::string& obj,
   if (r < 0)
     return r;
 
-  object_t oid(actual_obj.c_str());
-  r = rados->getxattr(pool, oid, name, dest);
+  r = rados->getxattr(pool, actual_obj, name, dest);
 
   if (r < 0)
     return r;
@@ -414,7 +404,7 @@ int RGWRados::get_attr(std::string& bucket, std::string& obj,
  * bl: the contents of the attr
  * Returns: 0 on success, -ERR# otherwise.
  */
-int RGWRados::set_attr(std::string& bucket, std::string& obj,
+int RGWRados::set_attr(std::string& bucket, std::string& oid,
                        const char *name, bufferlist& bl)
 {
   rados_pool_t pool;
@@ -423,7 +413,6 @@ int RGWRados::set_attr(std::string& bucket, std::string& obj,
   if (r < 0)
     return r;
 
-  object_t oid(obj.c_str());
   r = rados->setxattr(pool, oid, name, bl);
 
   if (r < 0)
@@ -455,9 +444,9 @@ int RGWRados::set_attr(std::string& bucket, std::string& obj,
  *          (if get_data==true) length of read data,
  *          (if get_data==false) length of the object
  */
-int RGWRados::get_obj(std::string& bucket, std::string& obj, 
+int RGWRados::get_obj(std::string& bucket, std::string& oid, 
             char **data, off_t ofs, off_t end,
-            map<nstring, bufferlist> *attrs,
+            map<string, bufferlist> *attrs,
             const time_t *mod_ptr,
             const time_t *unmod_ptr,
             const char *if_match,
@@ -472,14 +461,12 @@ int RGWRados::get_obj(std::string& bucket, std::string& obj,
   bufferlist bl;
 
   rados_pool_t pool;
-  map<nstring, bufferlist>::iterator iter;
+  map<string, bufferlist>::iterator iter;
 
   r = open_pool(bucket, &pool);
   if (r < 0)
     return r;
 
-  object_t oid(obj.c_str());
-
   r = rados->stat(pool, oid, &size, &mtime);
   if (r < 0)
     return r;
@@ -511,7 +498,7 @@ int RGWRados::get_obj(std::string& bucket, std::string& obj,
     }
   }
   if (if_match || if_nomatch) {
-    r = get_attr(bucket, obj, RGW_ATTR_ETAG, etag);
+    r = get_attr(bucket, oid, RGW_ATTR_ETAG, etag);
     if (r < 0)
       goto done;
 

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index e8eb67cfed07e4aeb610509c1b300d353bf6a170..ac4c5a015639e4a0d7a567200e2f79d3fb8da14e 100644 (file)
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -28,13 +28,12 @@ public:
    * create a bucket with name bucket and the given list of attrs
    * returns 0 on success, -ERR# otherwise.
    */
-  int create_bucket(std::string& id, std::string& bucket, map<nstring,
-                   bufferlist>& attrs, __u64 auid=0);
+  int create_bucket(std::string& id, std::string& bucket, map<std::string,bufferlist>& attrs, __u64 auid=0);
 
   /** Write/overwrite an object to the bucket storage. */
   int put_obj(std::string& id, std::string& bucket, std::string& obj, const char *data, size_t size,
               time_t *mtime,
-              map<nstring, bufferlist>& attrs);
+              map<std::string, bufferlist>& attrs);
   /** Copy an object, with many extra options */
   int copy_obj(std::string& id, std::string& dest_bucket, std::string& dest_obj,
                std::string& src_bucket, std::string& src_obj,
@@ -43,7 +42,7 @@ public:
                const time_t *unmod_ptr,
                const char *if_match,
                const char *if_nomatch,
-               map<nstring, bufferlist>& attrs,
+               map<std::string, bufferlist>& attrs,
                struct rgw_err *err);
   /** delete a bucket*/
   int delete_bucket(std::string& id, std::string& bucket);
@@ -62,7 +61,7 @@ public:
   /** Get data about an object out of RADOS and into memory. */
   int get_obj(std::string& bucket, std::string& obj, 
             char **data, off_t ofs, off_t end,
-            map<nstring, bufferlist> *attrs,
+            map<string, bufferlist> *attrs,
             const time_t *mod_ptr,
             const time_t *unmod_ptr,
             const char *if_match,

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 83e8bddbf8da851e69f229fe63a3915ac6e7b1c5..fe160d39fe58fb8718beb9b3411396307c0789a4 100644 (file)
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -202,7 +202,7 @@ int RGWGetObj_REST::send_response()
     dump_content_length(s, len);
   }
   if (!ret) {
-    map<nstring, bufferlist>::iterator iter = attrs.find(RGW_ATTR_ETAG);
+    map<string, bufferlist>::iterator iter = attrs.find(RGW_ATTR_ETAG);
     if (iter != attrs.end()) {
       bufferlist& bl = iter->second;
       if (bl.length()) {
@@ -354,7 +354,7 @@ void RGWCopyObj_REST::send_response()
   if (ret == 0) {
     open_section(s, "CopyObjectResult");
     dump_time(s, "LastModified", &mtime);
-    map<nstring, bufferlist>::iterator iter = attrs.find(RGW_ATTR_ETAG);
+    map<string, bufferlist>::iterator iter = attrs.find(RGW_ATTR_ETAG);
     if (iter != attrs.end()) {
       bufferlist& bl = iter->second;
       if (bl.length()) {

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 6d7000c41c52eb38108413faaec6b476f86ce0ed..5152b95fb2b831cbfaf0375766bbb16d16485c02 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -58,7 +58,7 @@ int rgw_store_user_info(RGWUserInfo& info)
   const char *data = bl.c_str();
   string md5;
   int ret;
-  map<nstring,bufferlist> attrs;
+  map<string,bufferlist> attrs;
 
   ret = rgwstore->put_obj(info.user_id, ui_bucket, info.user_id, data, bl.length(), NULL, attrs);
 
@@ -80,7 +80,7 @@ int rgw_store_user_info(RGWUserInfo& info)
   ui.encode(uid_bl);
   ret = rgwstore->put_obj(info.user_id, ui_email_bucket, info.user_email, uid_bl.c_str(), uid_bl.length(), NULL, attrs);
   if (ret == -ENOENT) {
-    map<nstring, bufferlist> attrs;
+    map<string, bufferlist> attrs;
     ret = rgwstore->create_bucket(info.user_id, ui_email_bucket, attrs);
     if (ret >= 0)
       ret = rgwstore->put_obj(info.user_id, ui_email_bucket, info.user_email, uid_bl.c_str(), uid_bl.length(), NULL, attrs);

diff --git a/src/testradospp.cc b/src/testradospp.cc
index e774f3ef452b8326b06b2f1178f4253f1ae7aca7..968ca79a3c9d1b52340fc119e5b4323239edd34e 100644 (file)
--- a/src/testradospp.cc
+++ b/src/testradospp.cc
@@ -48,7 +48,7 @@ int main(int argc, const char **argv)
   snprintf(buf, 128, "%s", ctime(&tm));
   bl.append(buf, strlen(buf));
 
-  object_t oid("bar");
+  const char *oid = "bar";
 
   rados_pool_t pool;
 
@@ -95,21 +95,21 @@ int main(int argc, const char **argv)
   Rados::ListCtx ctx;
   int entries;
   do {
-    list<object_t> vec;
+    list<string> vec;
     r = rados.list(pool, 2, vec, ctx);
     entries = vec.size();
     cout << "list result=" << r << " entries=" << entries << std::endl;
-    list<object_t>::iterator iter;
+    list<string>::iterator iter;
     for (iter = vec.begin(); iter != vec.end(); ++iter) {
       cout << *iter << std::endl;
     }
   } while (entries);
 
 
-  map<nstring, bufferlist> attrset;
+  map<string, bufferlist> attrset;
   rados.getxattrs(pool, oid, attrset);
 
-  map<nstring, bufferlist>::iterator it;
+  map<string, bufferlist>::iterator it;
   for (it = attrset.begin(); it != attrset.end(); ++it) {
     cout << "xattr: " << it->first << std::endl;
   }