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

Merge

Browse Source
This commit is contained in:
Alexey Milovidov 2012-09-22 07:30:40 +00:00
parent c7a4df24be
commit f77216b3de
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/include/DB/Functions/FunctionsStringArray.h
View File

@ -17,6 +17,7 @@ namespace DB
* join(sep, arr) * join(sep, arr)
* join(arr) * join(arr)
* alphaTokens(s) - выделить из строки подпоследовательности [a-zA-Z]+. * alphaTokens(s) - выделить из строки подпоследовательности [a-zA-Z]+.
* extractAll(regexp, s) - выделить из строки подпоследовательности, соответствующие регекспу.
* *
* Функции работы с URL расположены отдельно. * Функции работы с URL расположены отдельно.
*/ */

16
dbms/src/Storages/StorageMergeTree.cpp
View File

@ -236,10 +236,8 @@ private:
type_arr->serializeOffsets(column, compressed, type_arr->serializeOffsets(column, compressed,
boost::bind(&MergeTreeBlockOutputStream::writeCallback, this, boost::bind(&MergeTreeBlockOutputStream::writeCallback, this,
boost::ref(prev_mark), boost::ref(plain), boost::ref(compressed), boost::ref(marks))); boost::ref(prev_mark), boost::ref(plain), boost::ref(compressed), boost::ref(marks)));
writeData(path, name, *type_arr->getNestedType(), dynamic_cast<const ColumnArray &>(column).getData(), level + 1);
} }
else
{ {
WriteBufferFromFile plain(path + escaped_column_name + ".bin", DBMS_DEFAULT_BUFFER_SIZE, flags); WriteBufferFromFile plain(path + escaped_column_name + ".bin", DBMS_DEFAULT_BUFFER_SIZE, flags);
WriteBufferFromFile marks(path + escaped_column_name + ".mrk", 4096, flags); WriteBufferFromFile marks(path + escaped_column_name + ".mrk", 4096, flags);
@ -402,10 +400,8 @@ private:
type_arr->serializeOffsets(column, stream.compressed, type_arr->serializeOffsets(column, stream.compressed,
boost::bind(&MergedBlockOutputStream::writeCallback, this, boost::bind(&MergedBlockOutputStream::writeCallback, this,
boost::ref(prev_mark), boost::ref(stream.plain), boost::ref(stream.compressed), boost::ref(stream.marks))); boost::ref(prev_mark), boost::ref(stream.plain), boost::ref(stream.compressed), boost::ref(stream.marks)));
writeData(name, *type_arr->getNestedType(), dynamic_cast<const ColumnArray &>(column).getData(), level + 1);
} }
else
{ {
ColumnStream & stream = *column_streams[name]; ColumnStream & stream = *column_streams[name];
@ -550,8 +546,8 @@ public:
{ {
/// Читаем PK, и на основе primary_prefix, primary_range определим mark_number и rows_limit. /// Читаем PK, и на основе primary_prefix, primary_range определим mark_number и rows_limit.
size_t min_mark_number = 0; ssize_t min_mark_number = -1;
size_t max_mark_number = 0; ssize_t max_mark_number = -1;
String index_path = path + "primary.idx"; String index_path = path + "primary.idx";
ReadBufferFromFile index(index_path, std::min(static_cast<size_t>(DBMS_DEFAULT_BUFFER_SIZE), Poco::File(index_path).getSize())); ReadBufferFromFile index(index_path, std::min(static_cast<size_t>(DBMS_DEFAULT_BUFFER_SIZE), Poco::File(index_path).getSize()));
@ -591,8 +587,8 @@ public:
} }
} }
mark_number = min_mark_number; mark_number = min_mark_number == -1 ? 0 : min_mark_number;
rows_limit = (max_mark_number - min_mark_number + 1) * storage.index_granularity; rows_limit = max_mark_number == -1 ? std::numeric_limits<size_t>::max() : ((max_mark_number - min_mark_number + 1) * storage.index_granularity);
std::cerr << mark_number << ", " << rows_limit << std::endl; std::cerr << mark_number << ", " << rows_limit << std::endl;
} }