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

Merge

Browse Source
This commit is contained in:
Alexey Milovidov 2013-08-24 08:01:19 +00:00
parent e54ee51124
commit 482bc803fd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
View File

@ -63,10 +63,9 @@ public:
const ColumnWithNameAndType & column = block.getByName(it->first); const ColumnWithNameAndType & column = block.getByName(it->first);
writeData(column.name, *column.type, *column.column, offset_columns); writeData(column.name, *column.type, *column.column, offset_columns);
} }
index_offset = rows % storage.index_granularity size_t written_for_last_mark = (storage.index_granularity - index_offset + rows) % storage.index_granularity;
? (storage.index_granularity - rows % storage.index_granularity) index_offset = (storage.index_granularity - written_for_last_mark) % storage.index_granularity;
: 0;
} }
void writeSuffix() void writeSuffix()