Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa4e8fdf authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use matching types for block number arrays" into main

parents 0dc78a46 d9fa328e

fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h

+2 −2
Original line number Diff line number Diff line
@@ -172,10 +172,10 @@ class CowReader final : public ICowReader { 
    bool ParseV2(android::base::borrowed_fd fd, std::optional<uint64_t> label);

    bool PrepMergeOps();

    // sequence data is stored as an operation with actual data residing in the data offset.

    bool GetSequenceDataV2(std::vector<uint32_t>* merge_op_blocks, std::vector<int>* other_ops,

    bool GetSequenceDataV2(std::vector<uint32_t>* merge_op_blocks, std::vector<uint32_t>* other_ops,

                           std::unordered_map<uint32_t, int>* block_map);

    // v3 of the cow writes sequence data within its own separate sequence buffer.

    bool GetSequenceData(std::vector<uint32_t>* merge_op_blocks, std::vector<int>* other_ops,

    bool GetSequenceData(std::vector<uint32_t>* merge_op_blocks, std::vector<uint32_t>* other_ops,

                         std::unordered_map<uint32_t, int>* block_map);

    uint64_t FindNumCopyops();

    uint8_t GetCompressionType();

fs_mgr/libsnapshot/libsnapshot_cow/cow_reader.cpp

+3 −3
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ uint32_t CowReader::GetMaxCompressionSize() { 
//                        Replace-op-4, Zero-op-9, Replace-op-5 }

//==============================================================

bool CowReader::PrepMergeOps() {

    std::vector<int> other_ops;

    std::vector<uint32_t> other_ops;

    std::vector<uint32_t> merge_op_blocks;

    std::unordered_map<uint32_t, int> block_map;
@@ -356,7 +356,7 @@ bool CowReader::PrepMergeOps() { 
}



bool CowReader::GetSequenceDataV2(std::vector<uint32_t>* merge_op_blocks,

                                  std::vector<int>* other_ops,

                                  std::vector<uint32_t>* other_ops,

                                  std::unordered_map<uint32_t, int>* block_map) {

    auto seq_ops_set = std::unordered_set<uint32_t>();

    size_t num_seqs = 0;
@@ -394,7 +394,7 @@ bool CowReader::GetSequenceDataV2(std::vector<uint32_t>* merge_op_blocks, 
    return false;

}



bool CowReader::GetSequenceData(std::vector<uint32_t>* merge_op_blocks, std::vector<int>* other_ops,

bool CowReader::GetSequenceData(std::vector<uint32_t>* merge_op_blocks, std::vector<uint32_t>* other_ops,

                                std::unordered_map<uint32_t, int>* block_map) {

    std::unordered_set<uint32_t> seq_ops_set;

    // read sequence ops data