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

Fixed wording #1650

Browse Source
This commit is contained in:
Alexey Milovidov 2017-12-23 03:21:49 +03:00
parent 609133ea01
commit d6dc25b09e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/DataStreams/MergingSortedBlockInputStream.cpp
View File

@ -117,13 +117,13 @@ void MergingSortedBlockInputStream::init(Block & header, MutableColumns & merged
size_t dst_columns = header.columns();
if (src_columns != dst_columns)
throw Exception("Merging blocks has different number of columns ("
throw Exception("Merging blocks have different number of columns ("
+ toString(src_columns) + " and " + toString(dst_columns) + ")",
ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH);
for (size_t i = 0; i < src_columns; ++i)
if (!blocksHaveEqualStructure(*shared_block_ptr, header))
throw Exception("Merging blocks has different names or types of columns:\n"
throw Exception("Merging blocks have different names or types of columns:\n"
+ shared_block_ptr->dumpStructure() + "\nand\n" + header.dumpStructure(),
ErrorCodes::BLOCKS_HAVE_DIFFERENT_STRUCTURE);
}