Commit Graph

1030 Commits

Author SHA1 Message Date
chertus
a5a7dc0fdd Merge branch 'master' into decimal 2018-08-03 13:30:27 +03:00
Vadim
034a88a504
Merge branch 'master' into CLICKHOUSE-3714 2018-08-01 20:42:56 +03:00
VadimPE
66d9ba3eb7 CLICKHOUSE-3714 add max_partition_size_to_drop 2018-08-01 20:41:18 +03:00
Alexey Milovidov
c9ab39c8c6 Added validation of ODBC connection string [#CLICKHOUSE-3861] 2018-08-01 00:25:26 +03:00
chertus
4a1b7cfebf Merge branch 'master' into decimal 2018-07-30 21:51:08 +03:00
alesapin
744258818e CLICKHOUSE-3852: Fix PR remarks 2018-07-29 04:58:05 +03:00
alesapin
1f32701665 CLICKHOUSE-3852: Remove useless newlines 2018-07-29 04:58:05 +03:00
alesapin
652e5ff9e2 CLICKHOUSE-3852: Add ability to set up config parameters from env variables. 2018-07-29 04:58:05 +03:00
chertus
b9fd87eff7 Merge branch 'master' into decimal 2018-07-27 20:31:33 +03:00
chertus
492875e0f7 decimal comparisons with other integers 2018-07-26 18:28:14 +03:00
chertus
c1c149d74b decimal comparisons 2018-07-25 22:38:21 +03:00
alexey-milovidov
dc2c22ffff
Update IFactoryWithAliases.h 2018-07-25 21:46:16 +03:00
alesapin
9adb251689 CLICKHOUSE-3857: Add table table_engines, alias factory base class and columns alias_to and case_insensitive to functions 2018-07-25 19:08:23 +03:00
Alexey Milovidov
7c07f46d50 Style [#CLICKHOUSE-2] 2018-07-24 21:46:23 +03:00
Nikolai Kochetov
bbd13a25e4 Supported JOIN ON syntax for single and chain in expression analyzer. 2018-07-23 18:54:10 +03:00
chertus
5ec47b4a1c decimal (in progress) 2018-07-20 22:05:07 +03:00
proller
51cdec0bec CLICKHOUSE-3771: fixes 2018-07-18 12:48:45 +03:00
proller
c7848d2062 CLICKHOUSE-3771: Fixes 2018-07-17 21:22:32 +03:00
Alexey Milovidov
6a2d8d4f3f Added support for arbitary complex types in "uniq" family of aggregate functions #2010 2018-07-16 06:55:41 +03:00
Alexey Milovidov
215ec2be98 Tiny improvement [#CLICKHOUSE-3820] 2018-07-13 20:27:58 +03:00
Alexey Milovidov
c315200e64 Fixed rare error in ZooKeeper library: callback never called in case when network error happens after reading response header but before response body was read - that will lead to deadlock and readonly table [#CLICKHOUSE-3820] 2018-07-13 00:31:38 +03:00
Alexey Milovidov
d6a3cade18 Whitespaces [#CLICKHOUSE-3820] 2018-07-11 19:10:02 +03:00
Alexey Milovidov
f80081ca03 Fixed chroot prefix in information about exception for ZooKeeper multi transaction (variant 2) [#MDBSUPPORT-204] 2018-07-10 19:14:27 +03:00
Alexey Milovidov
a26a0f5331 Better exception message for KeeperMiltiException [#MDBSUPPORT-204] 2018-07-10 16:47:14 +03:00
Alexey Milovidov
8e0ae12b4e Miscellaneous [#CLICKHOUSE-2] 2018-07-10 16:43:01 +03:00
Simon Podlipsky
6c7ba03d0f
Add missing UInt128 (UUID) field visitors 2018-07-10 00:39:13 +03:00
Alexey Milovidov
7707b5a209 Improvement [#CLICKHOUSE-3810] 2018-07-08 02:53:49 +03:00
Alexey Milovidov
4b099e385b Fixed typo #2482 2018-07-04 20:28:06 +03:00
alexey-milovidov
3904ba561f
Merge branch 'master' into CLICKHOUSE-2910 2018-06-28 20:47:25 +03:00
Mikhail Surin
c7a305eca3 fix float transform 2018-06-28 16:36:40 +03:00
Alexey Zatelepin
2447755700 BackgroundSchedulePool: remove task from delayed even it it is currently executing
If the task was left in the delayed_tasks set, it could lead to a nasty bug:
delayExecutionThreadFunction() would schedule the task, then it would immediately
go on a next iteration and schedule the same task again. Thus this task would be
continually executing, and other delayed tasks would have no chance to run.
2018-06-27 13:47:58 +03:00
Alexey Zatelepin
7ce74d1730 ZooKeeper client: before the fix we waited 2x longer than necessary before the timeout 2018-06-22 18:30:29 +03:00
proller
a31adcfdea Allow use unbundled cpuid (#2543)
* Wait test server startup for 5s

* clean

* Allow use system libcpuid

* cpuid: move include/cpuid/ -> include/libcpuid/

* fix
2018-06-21 20:35:03 +03:00
proller
e1ae5233df Add // Y_IGNORE tags 2018-06-21 18:24:36 +03:00
Vitaliy Lyudvichenko
1a4157f2a9 clickhouse_common_io does not depend on dbms. [#CLICKHOUSE-2910]
Get rid of extra linking dependencies for clickhouse_common_io. [#CLICKHOUSE-2910]
2018-06-21 15:13:56 +03:00
Vitaliy Lyudvichenko
358e4ae9bf Fixed failures in utils, more precise test. [#CLICKHOUSE-2910] 2018-06-20 18:41:15 +03:00
Vitaliy Lyudvichenko
310bb4116e Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-06-19 23:33:11 +03:00
Vitaliy Lyudvichenko
e13ba09004 Rewritten ThreadStatus via adding shared thread state. [#CLICKHOUSE-2910]
Fixed race condition in SystemLog.
2018-06-19 23:30:35 +03:00
proller
fbe7df73a2
CLICKHOUSE-3762 Build fixes (#2488)
CONTRIB-254
2018-06-19 21:09:09 +03:00
Vitaliy Lyudvichenko
e031b5360a Minor enhancement. [#CLICKHOUSE-2910] 2018-06-18 16:50:20 +03:00
Vitaliy Lyudvichenko
392f6e0c6c Print query_id in logs. Add own logging interface. [#CLICKHOUSE-2910] 2018-06-18 16:41:13 +03:00
Alexey Milovidov
82102c6896 Fixed conflicting headers on Fedora Rawhide while using Linux native AIO #2520 2018-06-18 04:33:34 +03:00
Alexey Milovidov
2298f1c68b Fixed strange code #2501 2018-06-16 08:54:06 +03:00
Alexey Milovidov
e4776e8b5d Fixed build (no include path was specified) #2513 2018-06-16 05:31:41 +03:00
alexey-milovidov
d853b28543
Merge pull request #2513 from yandex/trim-exit-string
Trim exit string
2018-06-16 05:15:25 +03:00
alexey-milovidov
d578bcbd5c
Update StringUtils.h 2018-06-16 05:14:37 +03:00
alexey-milovidov
e6daa67beb
Merge pull request #1890 from yandex/lz4_experiments
Faster LZ4 decompression (experimental) + simple draft of data mutator.
2018-06-16 04:57:47 +03:00
Vitaliy Lyudvichenko
a0e9d17bfd Add query_id and host_name to server logs. [#CLICKHOUSE-2910] 2018-06-15 16:49:01 +03:00
Alexey Milovidov
c375814e44 Added support for intHashCRC32 on AArch64 [#CLICKHOUSE-2] 2018-06-15 08:21:12 +03:00
Alexey Milovidov
af5875960f Fallback for non x86 [#CLICKHOUSE-2] 2018-06-14 23:09:05 +03:00
Alexey Milovidov
86053c754f Fixed warning on platforms where char is unsigned [#CLICKHOUSE-2] 2018-06-14 22:57:11 +03:00
Alexey Milovidov
a2fdda4231 Fixed warning on platforms where char is unsigned [#CLICKHOUSE-2] 2018-06-14 22:54:11 +03:00
Nikolai Kochetov
fd406f30ad Trim exit string before checking. #2510 2018-06-14 22:21:35 +03:00
Nikolai Kochetov
27c6df7e20 Trim exit string before checking. #2510 2018-06-14 22:15:35 +03:00
Vitaliy Lyudvichenko
e5e73d4a9b Add CAP_NET_ADMIN capability check. [#CLICKHOUSE-2910] 2018-06-14 17:58:39 +03:00
Vitaliy Lyudvichenko
4cd230f85c Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-06-14 16:04:00 +03:00
Vitaliy Lyudvichenko
95b42afcb9 Add test for profile events logging. [#CLICKHOUSE-2910] 2018-06-14 14:56:12 +03:00
alexey-milovidov
f123fce023
Merge pull request #2505 from yandex/use-zookeeper-session-timeout-from-server
Use zookeeper session timeout from zookeeper server.
2018-06-13 22:36:37 +03:00
Nikolai Kochetov
cedf7a309e Use zookeeper session timeout from zookeeper server. 2018-06-13 22:24:54 +03:00
Alexey Milovidov
397ac0fb24 Updated performance testing tool #1890 2018-06-13 05:52:03 +03:00
Alexey Milovidov
24b0f77a2c Revert "Added ASLR to aid debugging #1890"
This reverts commit 619225323d.
2018-06-12 06:33:26 +03:00
Alexey Milovidov
619225323d Added ASLR to aid debugging #1890 2018-06-11 08:02:20 +03:00
alexey-milovidov
fafecb3c25
Better modularity of formats. (#2492)
* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development): removed very old tests #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447
2018-06-10 22:22:49 +03:00
Alexey Milovidov
d864f39ec7 Merge branch 'master' into zhang2014-feature/support_truncate 2018-06-09 19:10:06 +03:00
Vitaliy Lyudvichenko
c04dfb40a6 Fixed memory tracking. [#CLICKHOUSE-2910] 2018-06-09 18:29:08 +03:00
Alexey Milovidov
0bc678474e Merge branch 'feature/support_truncate' of https://github.com/zhang2014/ClickHouse into zhang2014-feature/support_truncate 2018-06-09 17:24:50 +03:00
Vitaliy Lyudvichenko
ac54e52fb3 Add server logs passing to client. [#CLICKHOUSE-2910] 2018-06-07 20:58:50 +03:00
alexey-milovidov
587189b211
Merge branch 'master' into clang-compliant 2018-06-07 17:43:20 +03:00
flow
c408854c3c Clang compliant on macosx 2018-06-07 12:21:38 +08:00
Alexey Milovidov
b6a6e391b8 Fixed minor security issue [#CLICKHOUSE-3758] 2018-06-06 21:05:35 +03:00
Alexey Milovidov
51044279e5 Squashed #2471 2018-06-05 23:09:51 +03:00
Alexey Milovidov
a6caf556ef Fixed potential issue found by PVS-Studio [#CLICKHOUSE-3] 2018-06-04 22:43:38 +03:00
Alexey Milovidov
ca52d96e09 Insignificant changes for PVS-Studio [#CLICKHOUSE-3] 2018-06-04 22:22:27 +03:00
Alexey Milovidov
5fa1cdf49e Better code (preparation) [#CLICKHOUSE-3] 2018-06-04 18:44:29 +03:00
Vitaliy Lyudvichenko
89f2107c75 C++ify taskstats getter, periodic auto update of profile events. [#CLICKHOUSE-2910] 2018-06-04 17:50:35 +03:00
Alexey Milovidov
8cb65277e2 Non significant changes according to clang's -Weverything, part 5 [#CLICKHOUSE-2] 2018-06-04 01:11:50 +03:00
Alexey Milovidov
f5adbceed2 Non significant changes according to clang's -Weverything, part 3 [#CLICKHOUSE-2] 2018-06-03 23:39:06 +03:00
Alexey Milovidov
1c2b024c39 Non significant changes according to clang's -Weverything, part 2 [#CLICKHOUSE-2] 2018-06-03 20:43:56 +03:00
Alexey Milovidov
734cebdf09 Non significant changes according to clang's -Weverything, part 1 [#CLICKHOUSE-2] 2018-06-03 19:51:31 +03:00
Vitaliy Lyudvichenko
b46f2ad946 Simplified code via introducing states. [#CLICKHOUSE-2910] 2018-06-01 22:39:32 +03:00
Vitaliy Lyudvichenko
2b179b560b Initialize external tables after enqueue query. [#CLICKHOUSE-2910] 2018-06-01 18:32:27 +03:00
alexey-milovidov
46cb408fd8
Update BackgroundSchedulePool.cpp 2018-06-01 16:35:16 +03:00
Alexey Zatelepin
af06ca5d3c Merge branch 'master' into replicated-mergetree-mutations 2018-06-01 16:21:14 +03:00
Vitaliy Lyudvichenko
549a6944d9 Better AsynchronousBlockInputStream in sync mode. [#CLICKHOUSE-2910] 2018-06-01 14:58:17 +03:00
Alexey Milovidov
3cb68784ad Miscellaneous [#CLICKHOUSE-3753] 2018-05-31 22:30:08 +03:00
Alexey Milovidov
515bd29df7 Better name [#CLICKHOUSE-3753] 2018-05-31 22:28:30 +03:00
Alexey Milovidov
5dbd5b6d68 Fixed error in ZK library [#CLICKHOUSE-3753] 2018-05-31 22:26:21 +03:00
Vitaliy Lyudvichenko
0355f81f20 [WIP] Introduced query_thread_log. [#CLICKHOUSE-2910] 2018-05-31 18:54:08 +03:00
Alexey Zatelepin
c9bb986330 Merge branch 'master' into replicated-mergetree-mutations
Conflicts:
	dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h
	dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
	dbms/src/Storages/StorageReplicatedMergeTree.cpp
2018-05-31 18:52:42 +03:00
Alexey Zatelepin
d89221c458 easier init and deactivation of BackgroundSchedulePool tasks 2018-05-31 16:18:52 +03:00
Vitaliy Lyudvichenko
e265e5c2ab Refactoring. [#CLICKHOUSE-2910] 2018-05-29 21:14:31 +03:00
proller
0cd644f5ec Fix test (no zookeeper detection) 2018-05-29 15:48:36 +03:00
Vitaliy Lyudvichenko
d81744fd06 Add more perfomance counters. [#CLICKHOUSE-2910] 2018-05-28 23:03:03 +03:00
Vitaliy Lyudvichenko
aa40931824 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-05-28 20:22:27 +03:00
Alexey Zatelepin
f6c72f8e56 Merge branch 'master' into replicated-mergetree-mutations
Conflicts:
	dbms/src/Common/ActionBlocker.h
	dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp
	dbms/src/Storages/MergeTree/ActiveDataPartSet.h
	dbms/src/Storages/MergeTree/MergeTreeData.h
	dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
	dbms/src/Storages/StorageMergeTree.cpp
	dbms/src/Storages/StorageReplicatedMergeTree.cpp
	dbms/src/Storages/StorageReplicatedMergeTree.h
2018-05-28 18:37:30 +03:00
Vitaliy Lyudvichenko
7615f5a09a More detail dignostic when parse JSONEachRow. [#CLICKHOUSE-2] 2018-05-28 14:40:07 +03:00
Alexey Zatelepin
59fe12ed15 part log and metrics [#CLICKHOUSE-3747] 2018-05-25 23:13:00 +03:00
Alexey Zatelepin
41b7e533cd more honest constness in ActionBlocker 2018-05-25 23:06:36 +03:00
Alexey Zatelepin
49439aa2d2 write mutations to ZK [#CLICKHOUSE-3747] 2018-05-25 23:06:08 +03:00
Alexey Zatelepin
4ca3bf65f3 test getting abandonable lock in all partitions [#CLICKHOUSE-3747] 2018-05-25 23:05:10 +03:00
Vitaliy Lyudvichenko
c888903488
Add query ALTER TABLE t1 [REPLACE|ATTACH] PARTITION FROM t2
* Add ATTACH PARTITION FROM table for MergeTree. [#CLICKHOUSE-3546]

* Implemented replicated case on non-leader replica. [#CLICKHOUSE-3546]

* Disable merges in the dropping range. [#CLICKHOUSE-3546]

* DROP PARTITION is atomic and simpler now. [#CLICKHOUSE-3546]

* Implemented more SYSTEM queries. [#CLICKHOUSE-2931] [#CLICKHOUSE-3546]

SYSTEM queries:
RESTART REPLICAS
SYNC REPLICA db.name
STOP MERGES [db.name]
START MERGES [db.name]
STOP FETCHES [db.name]
START FETCHES [db.name]
STOP REPLICATED SENDS [db.name]
START REPLICATED SENDS [db.name]
STOP REPLICATION QUEUES [db.name]
START REPLICATION QUEUES [db.name]

* Fixed a bunch of bugs in REPLACE PARTITION. [#CLICKHOUSE-3546]

* Add tests for REPLACE PARTITION and SYSTEM. [#CLICKHOUSE-3546]

* Add system.part_log logging. [#CLICKHOUSE-3546]

* Fixed long wait in SYNC REPLICA. [#CLICKHOUSE-3546]

* Add requested changes. [#CLICKHOUSE-3546]

Fixed clickhouse-client bad return code.

* Add requested chenges. [#CLICKHOUSE-3546]

* Add requested chenges. [#CLICKHOUSE-3546]
2018-05-21 16:49:54 +03:00
zhang2014
fa865636ce ISSUES-2259 add comment & move delete database metadata implementation 2018-05-21 11:38:46 +08:00
zhang2014
6613e56784 ISSUES-2259 support truncate syntax 2018-05-21 11:38:46 +08:00
alexey-milovidov
517318334a
Merge pull request #1722 from silviucpp/background-schedule-pool-fix
Background schedule pool fixed
2018-05-19 19:00:43 +03:00
Vitaliy Lyudvichenko
bd4d8a6766 Add profile events and settings logging. [#CLICKHOUSE-2910] 2018-05-17 19:01:41 +03:00
Alexey Milovidov
195f91f191 Merge branch 'master' of github.com:yandex/ClickHouse 2018-05-16 03:35:07 +03:00
Alexey Milovidov
fb91bba279 Miscellaneous [#CLICKHOUSE-2] 2018-05-16 03:34:56 +03:00
Vitaliy Lyudvichenko
abc73eb6ba Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-05-15 21:35:52 +03:00
Vitaliy Lyudvichenko
412c154045 Better configs for an integration test. [#CLICKHOUSE-2] 2018-05-15 21:25:54 +03:00
proller
fb911f7cfa Allow force disable libs: poco netssl poco mongodb, poco data odbc 2018-05-14 21:36:01 +03:00
Vitaliy Lyudvichenko
de6c48f4df Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-05-14 19:09:00 +03:00
Vitaliy Lyudvichenko
e8b94b89e9 Removed dbg output, fixed test. [#CLICKHOUSE-2] 2018-05-14 17:14:58 +03:00
Alexey Milovidov
3a059b82d2 Merge branch 'master' of github.com:yandex/ClickHouse into pyos-llvm-jit 2018-05-09 23:34:20 +03:00
Vitaliy Lyudvichenko
1f05000c2c Better naming. [#CLICKHOUSE-3645] 2018-05-09 07:55:08 +03:00
Vitaliy Lyudvichenko
704583968f Do not save resolved addresses in Connections. [#CLICKHOSUE-2]
Add disable_internal_dns_cache main config option.
2018-05-09 07:55:08 +03:00
Vitaliy Lyudvichenko
8fd72a6777 Add automatic DROP DNS CACHE, update of SYSTEM queries. [#CLICKHOUSE-3645] 2018-05-09 07:55:08 +03:00
alexey-milovidov
1e9edac617
Merge pull request #2328 from proller/fix15
Build fixes (gcc8)
2018-05-09 07:25:18 +03:00
Alexey Milovidov
b442cd9c64 Miscellaneous (no effect) [#CLICKHOUSE-2] 2018-05-09 07:22:30 +03:00
proller
eb772b8001 gcc8 fixes (memset, uncaught_exception) 2018-05-08 22:44:54 +03:00
Alexey Milovidov
6e2028d921 Merge branch 'master' of github.com:yandex/ClickHouse into pyos-llvm-jit 2018-05-08 16:01:56 +03:00
alexey-milovidov
fd9938cc46 Update getNumberOfPhysicalCPUCores.cpp 2018-05-08 12:43:45 +03:00
Atri Sharma
14cc530833 Update based on comments 2018-05-08 12:43:45 +03:00
Atri Sharma
22530c38e4 Add Rounding to nearest number 2018-05-08 12:43:45 +03:00
Atri Sharma
9b5ecc83ac Fix quota issue 2018-05-08 12:43:45 +03:00
Atri Sharma
cbaf78df4f Implement CGroups Limit for CPU 2018-05-08 12:43:45 +03:00
Alexey Milovidov
43f0b419ea Removed useless code [#CLICKHOUSE-2] 2018-05-08 00:01:15 +03:00
Alexey Milovidov
089ef3277f Removed useless code [#CLICKHOUSE-2] 2018-05-07 19:30:47 +03:00
Alexey Milovidov
01bbf650f8 Build fixes #2277 2018-05-07 11:59:24 +03:00
Alexey Milovidov
d1b4b5c836 Fixed error; added ProfileEvent #2277 2018-05-07 09:23:18 +03:00
Alexey Milovidov
e06223cbb8 Style [#CLICKHOUSE-2] 2018-05-07 05:15:47 +03:00
Alexey Milovidov
b8a6261bbc Style [#CLICKHOUSE-2] 2018-05-07 05:15:47 +03:00
Alexey Milovidov
a916d2760e Style [#CLICKHOUSE-2] 2018-05-07 05:15:24 +03:00
Alexey Milovidov
fd0ee5c6b1 Style [#CLICKHOUSE-2] 2018-05-07 05:14:24 +03:00
Alexey Milovidov
e26abf0ab4 Applied clang-format to some imported code [#CLICKHOUSE-2] 2018-05-07 05:08:38 +03:00
Alexey Milovidov
598c7fddb7 Applied clang-format to some imported code [#CLICKHOUSE-2] 2018-05-07 05:06:00 +03:00
Alexey Milovidov
94369e55d3 Fixed style a bit [#CLICKHOUSE-2] 2018-05-07 05:01:29 +03:00
Alexey Milovidov
956128a67a Fixed style a bit [#CLICKHOUSE-2] 2018-05-07 05:01:11 +03:00
proller
634ba89f90 Build fixes 2018-05-05 15:34:17 +03:00
Vitaliy Lyudvichenko
63cc34d3f6 Fixed incorrect failed OP detection in ZooKeeper. [#CLICKHOUSE-2] 2018-05-03 16:34:19 +03:00
Tsarkova Anastasia
4bce6035b1
Merge branch 'master' into master 2018-04-29 18:02:34 +02:00
Vitaliy Lyudvichenko
e152f223c9 Fix nodes leak in case of session expiration. [#CLICKHOUSE-2] 2018-04-26 22:46:45 +03:00
Silviu Caragea
1dd5a704fc Merge remote-tracking branch 'origin/master' into background-schedule-pool-fix
# Conflicts:
#	dbms/src/Common/ZooKeeper/LeaderElection.h
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.cpp
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
#	dbms/src/Storages/StorageReplicatedMergeTree.cpp
2018-04-24 20:11:59 +03:00
Tsarkova Anastasia
12c8014e5c Conditional computations. 2018-04-24 09:16:39 +02:00
Alexey Milovidov
5ba5e80846 Added correct code #2257 2018-04-20 22:45:23 +03:00
alexey-milovidov
60fade5de8 Revert "ISSUES-1885 UTF8 countCodePoints use SIMD" 2018-04-20 22:18:24 +03:00
alexey-milovidov
21a5d2dfde Update Macros.h 2018-04-20 19:10:26 +03:00
alexey-milovidov
c783a69d6b Update Macros.cpp 2018-04-20 19:10:26 +03:00
Kirill Shvakov
918dbc2902 #2249 allow macros while creating kafka engine 2018-04-20 19:10:26 +03:00
Vitaliy Lyudvichenko
a29a99b7d3 Add test for ZooKeeperImpl with watch and chroot. [#CLICKHOUSE-2] 2018-04-19 22:40:42 +03:00
Alexey Milovidov
9a05dd6161 ZooKeeperImpl: fixed error with watches and chroot [#CLICKHOUSE-2] 2018-04-19 22:21:37 +03:00