From: Adam C. Emerson <aemerson@redhat.com>
Date: Sun, 13 Dec 2020 23:54:28 +0000 (-0500)
Subject: rgw: vector<rgw_data_change_log_entry> not list
X-Git-Tag: v18.0.0~787^2~124
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0d129050370ef7e46efa90e4fd12b0cc72823c9;p=ceph.git

rgw: vector<rgw_data_change_log_entry> not list

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 990c7a4f643f..22de528042c7 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -280,7 +280,7 @@ public:
 struct read_remote_data_log_response {
   string marker;
   bool truncated;
-  list<rgw_data_change_log_entry> entries;
+  vector<rgw_data_change_log_entry> entries;
 
   read_remote_data_log_response() : truncated(false) {}
 
@@ -300,7 +300,7 @@ class RGWReadRemoteDataLogShardCR : public RGWCoroutine {
   int shard_id;
   const std::string& marker;
   string *pnext_marker;
-  list<rgw_data_change_log_entry> *entries;
+  vector<rgw_data_change_log_entry> *entries;
   bool *truncated;
 
   read_remote_data_log_response response;
@@ -309,7 +309,7 @@ class RGWReadRemoteDataLogShardCR : public RGWCoroutine {
 public:
   RGWReadRemoteDataLogShardCR(RGWDataSyncCtx *_sc, int _shard_id,
                               const std::string& marker, string *pnext_marker,
-                              list<rgw_data_change_log_entry> *_entries,
+                              vector<rgw_data_change_log_entry> *_entries,
                               bool *_truncated)
     : RGWCoroutine(_sc->cct), sc(_sc), sync_env(_sc->env),
       shard_id(_shard_id), marker(marker), pnext_marker(pnext_marker),
@@ -1414,8 +1414,8 @@ class RGWDataSyncShardCR : public RGWCoroutine {
   std::optional<RGWDataSyncShardMarkerTrack> marker_tracker;
 
   std::string next_marker;
-  list<rgw_data_change_log_entry> log_entries;
-  list<rgw_data_change_log_entry>::iterator log_iter;
+  vector<rgw_data_change_log_entry> log_entries;
+  vector<rgw_data_change_log_entry>::iterator log_iter;
   bool truncated = false;
 
   ceph::mutex inc_lock = ceph::make_mutex("RGWDataSyncShardCR::inc_lock");
@@ -3281,7 +3281,7 @@ class RGWReadPendingBucketShardsCoroutine : public RGWCoroutine {
   int count;
 
   std::string next_marker;
-  list<rgw_data_change_log_entry> log_entries;
+  vector<rgw_data_change_log_entry> log_entries;
   bool truncated;
 
 public: