Commit 0ea0fd9a authored by Ramon Nou's avatar Ramon Nou
Browse files

correcting clean inline

parent a2c95c8c

include/client/preload_util.hpp

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ metadata_to_stat(const std::string& path, const gkfs::metadata::Metadata& md, 
 */

std::pair<int, off64_t>

update_file_size(const std::string& path, size_t count, off64_t offset,

                 bool is_append);

                 bool is_append, bool clear_inline_flag = false);



void

load_hosts();

include/client/rpc/forward_metadata.hpp

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ forward_update_metadentry(const std::string& path, 
std::pair<int, off64_t>

forward_update_metadentry_size(const std::string& path, size_t size,

                               off64_t offset, bool append_flag,

                               const int num_copies);

                               bool clear_inline_flag, const int num_copies);



std::pair<int, off64_t>

forward_get_metadentry_size(const std::string& path, const int copy);

include/client/rpc/rpc_types.hpp

+10 −3
Original line number Diff line number Diff line
@@ -1130,8 +1130,9 @@ struct update_metadentry_size { 


    public:

        input(const std::string& path, uint64_t size, int64_t offset,

              bool append)

            : m_path(path), m_size(size), m_offset(offset), m_append(append) {}

              bool append, bool clear_inline = false)

            : m_path(path), m_size(size), m_offset(offset), m_append(append),

              m_clear_inline(clear_inline) {}



        input(input&& rhs) = default;
@@ -1163,9 +1164,14 @@ struct update_metadentry_size { 
            return m_append;

        }



        bool

        clear_inline() const {

            return m_clear_inline;

        }



        explicit input(const rpc_update_metadentry_size_in_t& other)

            : m_path(other.path), m_size(other.size), m_offset(other.offset),

              m_append(other.append) {}

              m_append(other.append), m_clear_inline(other.clear_inline) {}



        explicit

        operator rpc_update_metadentry_size_in_t() {
@@ -1177,6 +1183,7 @@ struct update_metadentry_size { 
        uint64_t m_size;

        int64_t m_offset;

        bool m_append;

        bool m_clear_inline;

    };



    class output {

include/common/rpc/rpc_types.hpp

+2 −1
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ MERCURY_GEN_PROC( 


MERCURY_GEN_PROC(rpc_update_metadentry_size_in_t,

                 ((hg_const_string_t) (path))((hg_uint64_t) (size))(

                         (hg_int64_t) (offset))((hg_bool_t) (append)))

                         (hg_int64_t) (offset))((hg_bool_t) (append))(

                         (hg_bool_t) (clear_inline)))



MERCURY_GEN_PROC(rpc_update_metadentry_size_out_t,

                 ((hg_int32_t) (err))((hg_int64_t) (ret_offset)))

include/daemon/backend/metadata/merge.hpp

+3 −2
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ private: 
public:

    IncreaseSizeOperand(size_t size, bool clear_inline = false);



    IncreaseSizeOperand(size_t size, uint16_t merge_id, bool append, bool clear_inline = false);

    IncreaseSizeOperand(size_t size, uint16_t merge_id, bool append,

                        bool clear_inline = false);



    explicit IncreaseSizeOperand(const rdb::Slice& serialized_op);