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

Merge branch 'master' of github.com:ClickHouse/ClickHouse into settings-avoid-overflow

Browse Source
This commit is contained in:
Alexey Milovidov 2024-02-17 09:10:43 +01:00
commit f4539fc781
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Storages/MergeTree/IMergeTreeDataPart.cpp
View File

@ -842,6 +842,7 @@ void IMergeTreeDataPart::loadIndex()
for (size_t i = 0; i < key_size; ++i)
{
loaded_index[i]->shrinkToFit();
loaded_index[i]->protect();
if (loaded_index[i]->size() != marks_count)
throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read all data from index file {}(expected size: "

2
src/Storages/MergeTree/IMergeTreeDataPart.h
View File

@ -660,7 +660,7 @@ private:
virtual void appendFilesOfIndexGranularity(Strings & files) const;
/// Loads index file.
/// Loads the index file.
void loadIndex();
void appendFilesOfIndex(Strings & files) const;

1
tests/queries/1_stateful/00098_primary_key_memory_allocated.reference Normal file
View File

@ -0,0 +1 @@
1 1 1

1
tests/queries/1_stateful/00098_primary_key_memory_allocated.sql Normal file
View File

@ -0,0 +1 @@
SELECT primary_key_bytes_in_memory < 16000, primary_key_bytes_in_memory_allocated < 16000, primary_key_bytes_in_memory_allocated / primary_key_bytes_in_memory < 1.1 FROM system.parts WHERE database = 'test' AND table = 'hits';