cls_journal: EntryPositions is now represented as a list

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/cls/journal/cls_journal_types.cc b/src/cls/journal/cls_journal_types.cc
index 65c0d98dc59e3f52e6a2de4aa7d60c158cafc0d0..eea018b7f0760ea3337fda02c8cf8cfdd559f9fd 100644 (file)
--- a/src/cls/journal/cls_journal_types.cc
+++ b/src/cls/journal/cls_journal_types.cc
@@ -45,8 +45,9 @@ bool ObjectSetPosition::operator<(const ObjectSetPosition& rhs) const {
     rhs_tids[it->tag] = it->tid;
   }
 
-  for (size_t i=0; i<entry_positions.size(); ++i) {
-    const EntryPosition &entry_position = entry_positions[i];
+  for (EntryPositions::const_iterator it = entry_positions.begin();
+       it != entry_positions.end(); ++it) {
+    const EntryPosition &entry_position = *it;
     if (entry_position.tid < rhs_tids[entry_position.tag]) {
       return true;
     }
@@ -71,9 +72,10 @@ void ObjectSetPosition::decode(bufferlist::iterator& iter) {
 void ObjectSetPosition::dump(Formatter *f) {
   f->dump_unsigned("object_number", object_number);
   f->open_array_section("entry_positions");
-  for (size_t i = 0; i < entry_positions.size(); ++i) {
+  for (EntryPositions::iterator it = entry_positions.begin();
+       it != entry_positions.end(); ++it) {
     f->open_object_section("entry_position");
-    entry_positions[i].dump(f);
+    it->dump(f);
     f->close_section();
   }
   f->close_section();
@@ -134,8 +136,10 @@ std::ostream &operator<<(std::ostream &os,
                          const ObjectSetPosition &object_set_position) {
   os << "[object_number=" << object_set_position.object_number << ", "
      << "positions=[";
-  for (size_t i=0; i<object_set_position.entry_positions.size(); ++i) {
-    os << object_set_position.entry_positions[i];
+  for (EntryPositions::const_iterator it =
+         object_set_position.entry_positions.begin();
+       it != object_set_position.entry_positions.end(); ++it) {
+    os << *it;
   }
   os << "]]";
   return os;

diff --git a/src/cls/journal/cls_journal_types.h b/src/cls/journal/cls_journal_types.h
index a44a0f3969191c063d2504c71502c597e31bc7f0..2b50ac61413a99685958eefb9e5bd7226f2ba6c8 100644 (file)
--- a/src/cls/journal/cls_journal_types.h
+++ b/src/cls/journal/cls_journal_types.h
@@ -8,8 +8,8 @@
 #include "include/buffer.h"
 #include "include/encoding.h"
 #include <iosfwd>
+#include <list>
 #include <string>
-#include <vector>
 
 namespace ceph {
 class Formatter;
@@ -37,7 +37,7 @@ struct EntryPosition {
   static void generate_test_instances(std::list<EntryPosition *> &o);
 };
 
-typedef std::vector<EntryPosition> EntryPositions;
+typedef std::list<EntryPosition> EntryPositions;
 
 struct ObjectSetPosition {
   uint64_t object_number;