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

Unify serialization of complex data types: development [#CLICKHOUSE-2838].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-09-05 05:36:35 +03:00
parent cb2c09020c
commit 48ab039501
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dbms/src/Storages/StorageLog.cpp
View File

@ -349,12 +349,13 @@ void LogBlockOutputStream::writeData(const String & name, const IDataType & type
type.enumerateStreams([&] (const IDataType::SubstreamPath & path) type.enumerateStreams([&] (const IDataType::SubstreamPath & path)
{ {
String stream_name = IDataType::getFileNameForStream(name, path); String stream_name = IDataType::getFileNameForStream(name, path);
const auto & file = storage.files[stream_name]; const auto & file = storage.files[stream_name];
const auto & stream = streams[stream_name]; const auto stream_it = streams.find(stream_name);
Mark mark; Mark mark;
mark.rows = (file.marks.empty() ? 0 : file.marks.back().rows) + column.size(); mark.rows = (file.marks.empty() ? 0 : file.marks.back().rows) + column.size();
mark.offset = stream->plain_offset + stream->plain.count(); mark.offset = stream_it != streams.end() ? stream_it->second->plain_offset + stream_it->second->plain.count() : 0;
out_marks.emplace_back(file.column_index, mark); out_marks.emplace_back(file.column_index, mark);
}, {}); }, {});
@ -422,17 +423,17 @@ void StorageLog::addFiles(const String & column_name, const IDataType & type)
IDataType::StreamCallback stream_callback = [&] (const IDataType::SubstreamPath & substream_path) IDataType::StreamCallback stream_callback = [&] (const IDataType::SubstreamPath & substream_path)
{ {
String stream_name = IDataType::getFileNameForStream(name, substream_path); String stream_name = IDataType::getFileNameForStream(column_name, substream_path);
if (!files.count(stream_name)) if (!files.count(stream_name))
{ {
++file_count;
ColumnData & column_data = files[stream_name]; ColumnData & column_data = files[stream_name];
column_data.column_index = column_names.size(); column_data.column_index = file_count;
column_data.data_file = Poco::File{ column_data.data_file = Poco::File{
path + escapeForFileName(name) + '/' + stream_name + DBMS_STORAGE_LOG_DATA_FILE_EXTENSION}; path + escapeForFileName(name) + '/' + stream_name + DBMS_STORAGE_LOG_DATA_FILE_EXTENSION};
column_names.push_back(stream_name); column_names.push_back(stream_name);
++file_count;
} }
}; };