import ceph 16.2.6

[ceph.git] / ceph / src / rgw / rgw_datalog.h

diff --git a/ceph/src/rgw/rgw_datalog.h b/ceph/src/rgw/rgw_datalog.h
index 1ff714873367eb2e1359a11d49f2500e5dcbaa17..f609a02bf365c2d88fc7f2df6284516c357f997c 100644 (file)
--- a/ceph/src/rgw/rgw_datalog.h
+++ b/ceph/src/rgw/rgw_datalog.h
@@ -113,7 +113,7 @@ struct RGWDataChangesLogInfo {
 
 struct RGWDataChangesLogMarker {
   int shard = 0;
-  std::optional<std::string> marker;
+  std::string marker;
 
   RGWDataChangesLogMarker() = default;
 };
@@ -148,7 +148,7 @@ public:
   }
   int list(const DoutPrefixProvider *dpp, int shard, int max_entries,
           std::vector<rgw_data_change_log_entry>& entries,
-          std::optional<std::string_view> marker,
+          std::string_view marker,
           std::string* out_marker, bool* truncated);
   int trim_entries(const DoutPrefixProvider *dpp, int shard_id, std::string_view marker);
   void trim_entries(const DoutPrefixProvider *dpp, int shard_id, std::string_view marker,
@@ -232,7 +232,7 @@ public:
   int get_log_shard_id(rgw_bucket& bucket, int shard_id);
   int list_entries(const DoutPrefixProvider *dpp, int shard, int max_entries,
                   std::vector<rgw_data_change_log_entry>& entries,
-                  std::optional<std::string_view> marker,
+                  std::string_view marker,
                   std::string* out_marker, bool* truncated);
   int trim_entries(const DoutPrefixProvider *dpp, int shard_id, std::string_view marker);
   int trim_entries(const DoutPrefixProvider *dpp, int shard_id, std::string_view marker,