Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Storages/MergeTree/MarkRange.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once

#include <cstddef>
#include <deque>
#include <Common/AllocatorWithMemoryTracking.h>
#include <Processors/Chunk.h>
#include <boost/container/devector.hpp>
#include <fmt/format.h>
#include <base/types.h>

Expand Down Expand Up @@ -31,7 +31,7 @@ struct MarkRange
bool operator<(const MarkRange & rhs) const;
};

struct MarkRanges : public std::deque<MarkRange, AllocatorWithMemoryTracking<MarkRange>>
struct MarkRanges : public boost::container::devector<MarkRange, AllocatorWithMemoryTracking<MarkRange>>
{
enum class SearchAlgorithm : uint8_t
{
Expand All @@ -40,7 +40,7 @@ struct MarkRanges : public std::deque<MarkRange, AllocatorWithMemoryTracking<Mar
GenericExclusionSearch,
};

using std::deque<MarkRange, AllocatorWithMemoryTracking<MarkRange>>::deque; /// NOLINT(modernize-type-traits)
using boost::container::devector<MarkRange, AllocatorWithMemoryTracking<MarkRange>>::devector; /// NOLINT(modernize-type-traits)

size_t getNumberOfMarks() const;
bool isOneRangeForWholePart(size_t num_marks_in_part) const;
Expand Down
2 changes: 1 addition & 1 deletion src/Storages/MergeTree/MergeTreeLazilyReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ void MergeTreeLazilyReader::readLazyColumns(
ReadBufferFromFileBase::ProfileCallback{});

size_t idx = 0;
auto mark_range_iter = mark_ranges.begin();
auto * mark_range_iter = mark_ranges.begin();
auto row_offset = row_offsets[idx].row_offset;
size_t next_offset = row_offset - index_granularity.getMarkStartingRow(mark_range_iter->begin);
size_t skipped_rows = next_offset;
Expand Down
2 changes: 1 addition & 1 deletion src/Storages/MergeTree/PatchParts/MergeTreePatchReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ static void filterReadRanges(MarkRanges & all_ranges, const MarkRanges & read_ra
{
std::unordered_set<MarkRange, MarkRangeHash> read_ranges_set(read_ranges.begin(), read_ranges.end());

for (auto it = all_ranges.begin(); it != all_ranges.end();)
for (auto * it = all_ranges.begin(); it != all_ranges.end();)
{
if (read_ranges_set.contains(*it))
it = all_ranges.erase(it);
Expand Down
4 changes: 2 additions & 2 deletions src/Storages/MergeTree/PatchParts/RangesInPatchParts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ MarkRanges RangesInPatchParts::getIntersectingRanges(const String & patch_name,

for (const auto & range : ranges)
{
auto left = std::lower_bound(patch_ranges.begin(), patch_ranges.end(), range.begin, [](const MarkRange & r, UInt64 value) { return r.end < value; });
auto right = std::upper_bound(patch_ranges.begin(), patch_ranges.end(), range.end, [](UInt64 value, const MarkRange & r) { return value < r.begin; });
const auto * left = std::lower_bound(patch_ranges.begin(), patch_ranges.end(), range.begin, [](const MarkRange & r, UInt64 value) { return r.end < value; });
const auto * right = std::upper_bound(patch_ranges.begin(), patch_ranges.end(), range.end, [](UInt64 value, const MarkRange & r) { return value < r.begin; });

res.insert(left, right);
}
Expand Down
Loading