osd: PGLSResponse -> pg_ls_response_t

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 3614ddec12a06ea5e719a94070714775c6e8749e..76328e596776df46985e541cc0040697e324bd88 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1402,7 +1402,6 @@ noinst_HEADERS = \
         osd/OSDMap.h\
         osd/ObjectVersioner.h\
         osd/PG.h\
-        osd/PGLS.h\
         osd/ReplicatedPG.h\
         osd/Watch.h\
         osd/osd_types.h\

diff --git a/src/librados.cc b/src/librados.cc
index d9cd8adb38c3af577c45157295d7d979dff80896..fe0a2b647396fcc427485bf00d86d70d8958d316 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -29,7 +29,6 @@ using namespace std;
 #include "mon/MonMap.h"
 #include "mds/MDS.h"
 #include "osd/OSDMap.h"
-#include "osd/PGLS.h"
 
 #include "msg/SimpleMessenger.h"
 

diff --git a/src/osd/PGLS.h b/src/osd/PGLS.h
deleted file mode 100644 (file)
index f405a67..0000000
--- a/src/osd/PGLS.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef CEPH_PGLS_H
-#define CEPH_PGLS_H
-
-
-#include "include/types.h"
-#include "os/ObjectStore.h"
-
-struct PGLSResponse {
-  collection_list_handle_t handle; 
-  list<pair<object_t, string> > entries;
-
-  void encode(bufferlist& bl) const {
-    __u8 v = 1;
-    ::encode(v, bl);
-    ::encode(handle, bl);
-    ::encode(entries, bl);
-  }
-  void decode(bufferlist::iterator& bl) {
-    __u8 v;
-    ::decode(v, bl);
-    assert(v == 1);
-    ::decode(handle, bl);
-    ::decode(entries, bl);
-  }
-};
-
-WRITE_CLASS_ENCODER(PGLSResponse)
-
-
-#endif

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d4da60218700d80ff770e4f3537b174bca60b2d6..397653bb4c912e0a644fa74fc4ba3d2e58052230 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -14,7 +14,6 @@
 #include "PG.h"
 #include "ReplicatedPG.h"
 #include "OSD.h"
-#include "PGLS.h"
 
 #include "common/errno.h"
 #include "common/perf_counters.h"
@@ -297,7 +296,7 @@ void ReplicatedPG::do_pg_op(MOSDOp *op)
         dout(10) << " pgls pg=" << op->get_pg() << " count " << p->op.pgls.count << dendl;
        // read into a buffer
         vector<hobject_t> sentries;
-        PGLSResponse response;
+        pg_ls_response_t response;
        try {
          ::decode(response.handle, bp);
        }

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index f178f680f7860aebf94fba7ba2aa45f12cab22d6..0b3ebe00a994d238e1c30a51577a3c9caead9168 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -1275,6 +1275,49 @@ WRITE_CLASS_ENCODER(pg_missing_t)
 ostream& operator<<(ostream& out, const pg_missing_t::item& i);
 ostream& operator<<(ostream& out, const pg_missing_t& missing);
 
+/**
+ * pg list objects response format
+ *
+ */
+struct pg_ls_response_t {
+  collection_list_handle_t handle; 
+  list<pair<object_t, string> > entries;
+
+  void encode(bufferlist& bl) const {
+    __u8 v = 1;
+    ::encode(v, bl);
+    ::encode(handle, bl);
+    ::encode(entries, bl);
+  }
+  void decode(bufferlist::iterator& bl) {
+    __u8 v;
+    ::decode(v, bl);
+    assert(v == 1);
+    ::decode(handle, bl);
+    ::decode(entries, bl);
+  }
+  void dump(Formatter *f) const {
+    f->dump_stream("handle") << handle;
+    f->open_array_section("entries");
+    for (list<pair<object_t, string> >::const_iterator p = entries.begin(); p != entries.end(); ++p) {
+      f->open_object_section("object");
+      f->dump_stream("object") << p->first;
+      f->dump_string("key", p->second);
+      f->close_section();
+    }
+    f->close_section();
+  }
+  static void generate_test_instances(list<pg_ls_response_t*>& o) {
+    o.push_back(new pg_ls_response_t);
+    o.push_back(new pg_ls_response_t);
+    o.back()->handle = hobject_t(object_t("hi"), "key", 1, 2);
+    o.back()->entries.push_back(make_pair(object_t("one"), string()));
+    o.back()->entries.push_back(make_pair(object_t("two"), string("twokey")));
+  }
+};
+
+WRITE_CLASS_ENCODER(pg_ls_response_t)
+
 
 // -----------------------------------------
 

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index cd357af627e364e7e262fa44cc09ad4927743605..81119875e54dc6ccbe445063e5bbeb1946f6883e 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -14,7 +14,6 @@
 
 #include "Objecter.h"
 #include "osd/OSDMap.h"
-#include "osd/PGLS.h"
 
 #include "mon/MonClient.h"
 
@@ -1339,7 +1338,7 @@ void Objecter::_list_reply(ListContext *list_context, bufferlist *bl, Context *f
   ldout(cct, 10) << "_list_reply" << dendl;
 
   bufferlist::iterator iter = bl->begin();
-  PGLSResponse response;
+  pg_ls_response_t response;
   bufferlist extra_info;
   ::decode(response, iter);
   if (!iter.end()) {

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 0445429bba9adfb7edd4d962f6ebeb5bf24ffab5..e04db795539913b154739eea3c8c3bd86e576bae 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -11,9 +11,6 @@ TYPE(OSDMap)
 TYPE(PG::Interval)
 TYPE(PG::OndiskLog)
 
-#include "osd/PGLS.h"
-//TYPE(PGLSResponse)
-
 #include "osd/osd_types.h"
 TYPE(osd_stat_t)
 TYPE(OSDSuperblock)
@@ -30,6 +27,7 @@ TYPE(pg_log_entry_t)
 TYPE(pg_log_t)
 TYPE(pg_missing_t::item)
 TYPE(pg_missing_t)
+TYPE(pg_ls_response_t)
 TYPE(watch_info_t)
 TYPE(object_info_t)