From: Kefu Chai <kchai@redhat.com>
Date: Sun, 14 Feb 2021 07:26:11 +0000 (+0800)
Subject: compressor/lz4: use optional<> instead of Tub<>
X-Git-Tag: v17.1.0~2896^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d7f45298920a2c7b52b34bdcd1183b159b28417;p=ceph.git

compressor/lz4: use optional<> instead of Tub<>

so we can drop Tub<> once all of its consumers are removed.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/compressor/lz4/LZ4Compressor.h b/src/compressor/lz4/LZ4Compressor.h
index dd22bd38761..fed98cec229 100644
--- a/src/compressor/lz4/LZ4Compressor.h
+++ b/src/compressor/lz4/LZ4Compressor.h
@@ -15,13 +15,13 @@
 #ifndef CEPH_LZ4COMPRESSOR_H
 #define CEPH_LZ4COMPRESSOR_H
 
+#include <optional>
 #include <lz4.h>
 
 #include "compressor/Compressor.h"
 #include "include/buffer.h"
 #include "include/encoding.h"
 #include "common/config.h"
-#include "common/Tub.h"
 
 
 class LZ4Compressor : public Compressor {
@@ -118,11 +118,11 @@ class LZ4Compressor : public Compressor {
 
     ceph::buffer::ptr cur_ptr = p.get_current_ptr();
     ceph::buffer::ptr *ptr = &cur_ptr;
-    Tub<ceph::buffer::ptr> data_holder;
+    optional<ceph::buffer::ptr> data_holder;
     if (compressed_len != cur_ptr.length()) {
-      data_holder.construct(compressed_len);
+      data_holder.emplace(compressed_len);
       p.copy_deep(compressed_len, *data_holder);
-      ptr = data_holder.get();
+      ptr = &*data_holder;
     }
 
     char *c_in = ptr->c_str();