thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Respect direct_io/mmap settings while reading secondary indices

Browse Source
This commit is contained in:
Alexey Milovidov 2020-06-25 22:31:54 +03:00
parent 5608f15749
commit 8872417d00
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -544,6 +544,14 @@ Pipes MergeTreeDataSelectExecutor::readFromParts(
if (minmax_idx_condition) if (minmax_idx_condition)
LOG_DEBUG(log, "MinMax index condition: {}", minmax_idx_condition->toString()); LOG_DEBUG(log, "MinMax index condition: {}", minmax_idx_condition->toString());
MergeTreeReaderSettings reader_settings =
{
.min_bytes_to_use_direct_io = settings.min_bytes_to_use_direct_io,
.min_bytes_to_use_mmap_io = settings.min_bytes_to_use_mmap_io,
.max_read_buffer_size = settings.max_read_buffer_size,
.save_marks_in_cache = true
};
/// PREWHERE /// PREWHERE
String prewhere_column; String prewhere_column;
if (select.prewhere()) if (select.prewhere())
@ -583,7 +591,7 @@ Pipes MergeTreeDataSelectExecutor::readFromParts(
for (const auto & index_and_condition : useful_indices) for (const auto & index_and_condition : useful_indices)
ranges.ranges = filterMarksUsingIndex( ranges.ranges = filterMarksUsingIndex(
index_and_condition.first, index_and_condition.second, part, ranges.ranges, settings); index_and_condition.first, index_and_condition.second, part, ranges.ranges, settings, reader_settings);
if (!ranges.ranges.empty()) if (!ranges.ranges.empty())
{ {
@ -605,14 +613,6 @@ Pipes MergeTreeDataSelectExecutor::readFromParts(
Pipes res; Pipes res;
MergeTreeReaderSettings reader_settings =
{
.min_bytes_to_use_direct_io = settings.min_bytes_to_use_direct_io,
.min_bytes_to_use_mmap_io = settings.min_bytes_to_use_mmap_io,
.max_read_buffer_size = settings.max_read_buffer_size,
.save_marks_in_cache = true
};
/// Projection, that needed to drop columns, which have appeared by execution /// Projection, that needed to drop columns, which have appeared by execution
/// of some extra expressions, and to allow execute the same expressions later. /// of some extra expressions, and to allow execute the same expressions later.
/// NOTE: It may lead to double computation of expressions. /// NOTE: It may lead to double computation of expressions.
@ -1405,7 +1405,8 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
MergeTreeIndexConditionPtr condition, MergeTreeIndexConditionPtr condition,
MergeTreeData::DataPartPtr part, MergeTreeData::DataPartPtr part,
const MarkRanges & ranges, const MarkRanges & ranges,
const Settings & settings) const const Settings & settings,
const MergeTreeReaderSettings & reader_settings) const
{ {
if (!part->volume->getDisk()->exists(part->getFullRelativePath() + index_helper->getFileName() + ".idx")) if (!part->volume->getDisk()->exists(part->getFullRelativePath() + index_helper->getFileName() + ".idx"))
{ {
@ -1428,9 +1429,10 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
size_t index_marks_count = (marks_count - final_mark + index_granularity - 1) / index_granularity; size_t index_marks_count = (marks_count - final_mark + index_granularity - 1) / index_granularity;
MergeTreeIndexReader reader( MergeTreeIndexReader reader(
index_helper, part, index_helper, part,
index_marks_count, index_marks_count,
ranges); ranges,
reader_settings);
MarkRanges res; MarkRanges res;

3
src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
View File

@ -106,7 +106,8 @@ private:
MergeTreeIndexConditionPtr condition, MergeTreeIndexConditionPtr condition,
MergeTreeData::DataPartPtr part, MergeTreeData::DataPartPtr part,
const MarkRanges & ranges, const MarkRanges & ranges,
const Settings & settings) const; const Settings & settings,
const MergeTreeReaderSettings & reader_settings) const;
}; };
} }

5
src/Storages/MergeTree/MergeTreeIndexReader.cpp
View File

@ -5,12 +5,13 @@ namespace DB
{ {
MergeTreeIndexReader::MergeTreeIndexReader( MergeTreeIndexReader::MergeTreeIndexReader(
MergeTreeIndexPtr index_, MergeTreeData::DataPartPtr part_, size_t marks_count_, const MarkRanges & all_mark_ranges_) MergeTreeIndexPtr index_, MergeTreeData::DataPartPtr part_, size_t marks_count_, const MarkRanges & all_mark_ranges_,
MergeTreeReaderSettings settings)
: index(index_), stream( : index(index_), stream(
part_->volume->getDisk(), part_->volume->getDisk(),
part_->getFullRelativePath() + index->getFileName(), ".idx", marks_count_, part_->getFullRelativePath() + index->getFileName(), ".idx", marks_count_,
all_mark_ranges_, all_mark_ranges_,
MergeTreeReaderSettings{}, nullptr, nullptr, std::move(settings), nullptr, nullptr,
part_->getFileSizeOrZero(index->getFileName() + ".idx"), part_->getFileSizeOrZero(index->getFileName() + ".idx"),
&part_->index_granularity_info, &part_->index_granularity_info,
ReadBufferFromFileBase::ProfileCallback{}, CLOCK_MONOTONIC_COARSE) ReadBufferFromFileBase::ProfileCallback{}, CLOCK_MONOTONIC_COARSE)

3
src/Storages/MergeTree/MergeTreeIndexReader.h
View File

@ -14,7 +14,8 @@ public:
MergeTreeIndexPtr index_, MergeTreeIndexPtr index_,
MergeTreeData::DataPartPtr part_, MergeTreeData::DataPartPtr part_,
size_t marks_count_, size_t marks_count_,
const MarkRanges & all_mark_ranges_); const MarkRanges & all_mark_ranges_,
MergeTreeReaderSettings settings);
void seek(size_t mark); void seek(size_t mark);