Commit Graph

391 Commits

Author SHA1 Message Date
Alexey Milovidov
d605bfdc9d Using internal boost library [#METR-2944]. 2016-12-12 07:57:09 +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
proller
26fe10a7b4 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-25 03:22:30 +03:00
Alexey Milovidov
7d280a55a3 Fixed error that server could not shutdown while fetching parts [#METR-23616]. 2016-11-25 02:18:24 +03:00
Alexey Milovidov
167782c230 Addition to prev. revision [#METR-23615]. 2016-11-25 01:43:49 +03:00
Alexey Milovidov
8e5889cf0e Improved merge selecting algorithm for Replicated tables [#METR-23615]. 2016-11-25 01:41:27 +03:00
proller
eeeacd0805 merge upstream 2016-11-23 01:33:02 +03:00
Alexey Milovidov
bba5dcbcfa Fixed deadlock [#METR-23557]. 2016-11-22 22:27:45 +03:00
Alexey Milovidov
3b635bf641 Merge branch 'master' of github.com:yandex/ClickHouse 2016-11-22 20:42:21 +03:00
Alexey Milovidov
a464f2303d Better logic for ALTER in ReplicatedMergeTree [#METR-22214]. 2016-11-22 20:41:45 +03:00
proller
e280569453 Everything [maybe] works! 2016-11-22 18:03:54 +03:00
Alexey Milovidov
9018906e1a Better [#METR-2944]. 2016-11-20 15:43:20 +03:00
Alexey Milovidov
866e64a65e Fixed deadlock in test when many replicas on single server try to execute multiple attaches and wait for each other [#METR-23507]. 2016-11-16 09:08:29 +03:00
Alexey Milovidov
5b72f0956a Setting level to zero after ATTACH [#METR-23438]. 2016-11-11 20:33:43 +03:00
Alexey Milovidov
bee00bfcfc MergeSelector: development [#METR-21841]. 2016-10-30 14:05:45 +03:00
Alexey Milovidov
74c3b30622 dbms: Simplified logic of selecting merges [#METR-21841]. 2016-10-28 01:50:02 +03:00
Alexey Milovidov
2dd43be6e6 Don't hold shared_ptr to zookeeper for long time, because it makes very difficult to remove ephemeral nodes in case of temporary communication errors and thus breaks leader election [#METR-23272]. 2016-10-24 15:34:08 +03:00
Alexey Milovidov
9af5ce1e3b Separate compilation of ProfileEvents; comments [#METR-23237]. 2016-10-24 05:02:37 +03:00
Alexey Arno
924402f33e dbms: Server: merged from master [#METR-19266] 2016-10-19 18:00:56 +03:00
Vitaliy Lyudvichenko
669e2982a5 Made merge_selecting_thread creation & deletion atomic. [#METR-22471] 2016-10-14 14:47:11 +03:00
Vitaliy Lyudvichenko
aa863ea7bb Fixed std::terminate on DROP of StorageReplicatedMergeTree. [#METR-22471] 2016-10-14 13:17:05 +03:00
Alexey Milovidov
6b2755bf2a Non significant change [#METR-2944]. 2016-09-23 23:33:06 +03:00
alexey-milovidov
012f34a799 Merge pull request #96 from yurial/yurial-IStorage-enable_shared_from_this
use std::enable_shared_from_this for IStorage
2016-08-31 00:00:23 +04:00
Yuri Dyachenko
e5825f790f use std::enable_shared_from_this for IStorage 2016-08-29 16:28:34 +03:00
Alexey Milovidov
be6cfea281 Fixed typo in comment [#METR-2807]. 2016-08-26 23:22:22 +03:00
Alexey Milovidov
867b73b6b0 Fixed error with cancelling merges on ALTERs [#METR-22524]. 2016-08-26 22:50:04 +03:00
Alexey Arno
f4e77aaf97 dbms: Better code for functions processing. Code cleanup. [#METR-19266] 2016-08-15 14:14:29 +03:00
Alexey Arno
f5d9d0ebc9 Merge branch 'master' into METR-19266 [#METR-19266] 2016-08-10 22:13:15 +03:00
Alexey Milovidov
d8eb52c189 Improvement [#METR-22352]. 2016-08-10 10:20:21 +03:00
Alexey Milovidov
6bc1840b88 Fixed error [#METR-22352]. 2016-08-10 07:20:50 +03:00
Alexey Milovidov
b51bdbd0c0 Allow to set 'force_restore_data' flag with creating file on local filesystem [#METR-21594], [#METR-17811]. 2016-08-10 00:48:05 +03:00
Alexey Milovidov
4b41c52747 Attempt to improve performance of replication queue processing [#METR-22352]. 2016-08-09 23:39:28 +03:00
Alexey Arno
531ff3d5ac dbms: Merged with master [#METR-19266] 2016-08-05 18:44:19 +03:00
Alexey Milovidov
ee92f5d0cc dbms: prefer fetching part from replica, in some cases [#METR-22288]. 2016-08-02 22:02:00 +03:00
Alexey Milovidov
6cf89fa915 Attempt to not interrupt merges when ZK session is reinitialized [#METR-22283]. 2016-08-02 21:33:55 +03:00
Alexey Milovidov
9a07830dbb Removed useless code (experimental) [#METR-2944]. 2016-08-02 04:46:05 +03:00
Alexey Arno
1fe6786b78 dbms: NULL support for MergeTree [#METR-19266] 2016-07-24 22:32:21 +03:00
Alexey Milovidov
130ec8b58b Compatibility with new parser and AST of tables list [#METR-2944]. 2016-07-22 23:39:28 +03:00
Alexey Milovidov
55ed2904f4 Allowed for certain aggregate functions to have case insensitive names for compatibility [#METR-22087]. 2016-07-14 08:22:09 +03:00
Alexey Milovidov
5ded454986 Added 'WITH NAME' section to ALTER TABLE ... FREEZE PARTITION query [#METR-21884]. 2016-06-28 23:50:37 +03:00
Alexey Milovidov
47898ae73b Disabled implicit moving to PREWHERE when using FINAL [#METR-20644]. 2016-06-06 21:41:28 +03:00
Alexey Milovidov
c518abe882 Get rid of Poco::SharedPtr [#METR-21503]. 2016-05-28 20:31:50 +03:00
Alexey Milovidov
36efb7063e Using std::shared_ptr for functions and AST [#METR-21503]. 2016-05-28 19:00:04 +03:00
Alexey Milovidov
fc65afb6f0 Using std::shared_ptr for functions and AST [#METR-21503]. 2016-05-28 18:46:03 +03:00
Alexey Milovidov
3c1c9d46f7 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 15:22:22 +03:00
Alexey Milovidov
6863e72f3d Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 13:15:36 +03:00
Alexey Milovidov
be394f2c84 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 10:48:40 +03:00
Alexey Milovidov
4b7f461e46 Using std::shared_ptr for columns [#METR-21503]. 2016-05-28 08:31:36 +03:00
Alexey Arno
113dc3e82f dbms: Server: Fixed grammar in a few error messages [#METR-20000] 2016-05-24 19:53:29 +03:00
Alexey Milovidov
adc850993c Fixed error [#METR-21326]. 2016-05-19 23:58:24 +03:00