Alexey Milovidov
|
137ad95929
|
Changed tabs to spaces in code [#CLICKHOUSE-3].
|
2017-04-01 11:35:09 +03:00 |
|
Alexey Milovidov
|
26788e3938
|
Formatting [#CLICKHOUSE-2].
|
2017-03-13 21:01:46 +03:00 |
|
f1yegor
|
401425bb89
|
translate comments
|
2017-03-12 20:18:07 +01:00 |
|
Alexey Milovidov
|
c9b4a163be
|
Added info about uncompressed size to system.columns table [#CLICKHOUSE-2831].
|
2017-02-12 01:31:22 +04:00 |
|
Alexey Milovidov
|
ca37f28b5f
|
Renamed methods Block::rows and Block::rowsInFirstColumn [#METR-2944].
|
2017-01-02 23:45:27 +03:00 |
|
Alexey Milovidov
|
2b4f3b5d34
|
Renamed method (less confusion) [#METR-2944].
|
2017-01-02 23:12:12 +03:00 |
|
Alexey Milovidov
|
e97ecb6cf7
|
Merge branch 'master' into METR-19266
Conflicts:
dbms/CMakeLists.txt
dbms/include/DB/Functions/FunctionsArray.h
dbms/include/DB/Functions/FunctionsString.h
dbms/include/DB/Parsers/ExpressionListParsers.h
dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
dbms/src/Core/ErrorCodes.cpp
dbms/src/Parsers/ASTFunction.cpp
dbms/src/Storages/MergeTree/MergeTreeData.cpp
dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
dbms/src/Storages/MergeTree/MergeTreeReader.cpp
dbms/src/Storages/StorageLog.cpp
|
2016-12-10 07:51:36 +03:00 |
|
Vitaliy Lyudvichenko
|
202ba912ce
|
Vertical merging algorithm for MergeTree engines. [#METR-23305]
|
2016-11-29 22:41:31 +03:00 |
|
alexey-milovidov
|
8c2e228856
|
Revert "New "vertical" algorithm for MergeTrees' parts merges"
|
2016-11-24 23:08:54 +04:00 |
|
Vitaliy Lyudvichenko
|
2cd5b8b604
|
Updated MergeInfo and progress callbacks with respect to vertical merge alg.
|
2016-11-23 15:52:12 +03:00 |
|
Alexey Milovidov
|
9018906e1a
|
Better [#METR-2944].
|
2016-11-20 15:43:20 +03:00 |
|