Commit Graph

2806 Commits

Author SHA1 Message Date
Alexey Milovidov
24f94d9352 Merge remote-tracking branch 'origin/master' into libzookeeper-rewrite 2018-03-24 23:30:57 +03:00
Alexey Milovidov
87b4d8209a Using different ZooKeeper library (development) [#CLICKHOUSE-2] 2018-03-24 23:28:43 +03:00
Alexey Milovidov
7ec66830af Using different ZooKeeper library (development) [#CLICKHOUSE-2] 2018-03-24 23:17:27 +03:00
Alexey Milovidov
58f32f98d7 Using different ZooKeeper library (development) [#CLICKHOUSE-2] 2018-03-24 23:11:46 +03:00
Alexey Milovidov
ae9633c1e5 Using different ZooKeeper library (development) [#CLICKHOUSE-2] 2018-03-24 23:00:16 +03:00
Tobias Adamson
0af09ae0c7 Add trim to topic names to be a bit more lenient if config is 'topic1, topic2' 2018-03-24 14:51:35 +08:00
Tobias Adamson
dd06b39e5f Fix rename of variable, duplication of wrong variable name 2018-03-24 09:16:33 +08:00
Alexey Milovidov
26584844b6 Rewriting ZooKeeper library [#CLICKHOUSE-2] 2018-03-24 04:00:12 +03:00
Alexey Milovidov
10be6ca8f8 Rewriting ZooKeeper library [#CLICKHOUSE-2] 2018-03-24 03:45:04 +03:00
Alexey Zatelepin
cf3c24d07d break cycle of ptrs to StorageReplicatedMergeTree [#CLICKHOUSE-3664] 2018-03-23 23:30:04 +03:00
proller
caf83a650e libs: compiling with msvc2017 (#1996)
* Allow use bundled *ssl library

* fix

* Add submodule

* Fixes

* fix

* fixes

* fixes

* fix

* fix

* update poco

* fix warnings

* fix

* fix

* Build fixes

* Build fixes

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add bat

* no zookeeper in dbms

* update boost

* fixes

* fixes

* fix

* fix

* fix

* fix

* try fix

* try fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* Better

* fix

* dh verbose

* fix

* dh verbose

* fix

* clean

* Update LocalDate.h

* Update LocalDateTime.h
2018-03-23 19:05:14 +03:00
Tobias Adamson
c76d1a008d Make sure to split the topics args list on ',' 2018-03-23 22:13:09 +08:00
KochetovNicolai
aacc0bee53
Merge pull request #2097 from yandex/CLICKHOUSE-3663
Clickhouse 3663
2018-03-23 14:56:08 +03:00
Nikolai Kochetov
2f468f1ae1 fix test [#CLICKHOUSE-3663] 2018-03-23 13:50:20 +03:00
alexey-milovidov
cf52c2840a
Merge branch 'master' into better-range-reader 2018-03-23 02:14:40 +03:00
Alexey Milovidov
0a06971e43 Merge remote-tracking branch 'origin/master' into libzookeeper-rewrite 2018-03-23 02:10:00 +03:00
alexey-milovidov
a75d5525e7 Update MergeTreeDataPartChecksum.h 2018-03-23 00:26:46 +03:00
Vitaliy Lyudvichenko
883de7a2a6 startup() waits for initialization of ReplicatedMergeTreeRestartingThread. [#CLICKHOUSE-2] 2018-03-23 00:26:46 +03:00
Vitaliy Lyudvichenko
fe8dfd3038 Add minimalistic checksums. [#CLICKHOUSE-3660] 2018-03-23 00:26:46 +03:00
Vitaliy Lyudvichenko
7c2a99c9b8 Introduced MinimalisticDataPartChecksums. [#CLICKHOUSE-3660] 2018-03-23 00:26:46 +03:00
Nikolai Kochetov
cbfd862fa3 fix reading with evaluated defaults [#CLICKHOUSE-3663] 2018-03-22 23:18:11 +03:00
Nikolai Kochetov
97624d7d78 fix reading with evaluated defaults [#CLICKHOUSE-3663] 2018-03-22 22:53:19 +03:00
Alexey Milovidov
d690c24198 Using different ZooKeeper library (development) [#CLICKHOUSE-2] 2018-03-22 00:40:53 +03:00
Nikolai Kochetov
476d4b339c Immutable construction for columns 2018-03-20 22:45:10 +03:00
Nikolai Kochetov
a399c17f01 && - qualified IColumn::mutate 2018-03-20 17:01:00 +03:00
Alexey Zatelepin
86d53b34a5 forward ALTER PARTITION statements for materialized views [#CLICKHOUSE-3659] 2018-03-20 16:44:36 +03:00
Vitaliy Lyudvichenko
e41b653f14 Parallelized block split in sync Distributed insert. [#CLICKHOUSE-2] 2018-03-19 21:26:52 +03:00
Alexey Zatelepin
b1274f7b34 fix deadlock in StorageKafka::shutdown() in case startup() wasn't called #2075 2018-03-19 20:52:48 +03:00
Alexey Milovidov
590feb02b5 Fixed error; added test from Alexander Zaitsev [#CLICKHOUSE-2] 2018-03-19 17:29:40 +03:00
Alexey Milovidov
a6892b8813 Fixed test [#CLICKHOUSE-2] 2018-03-16 12:00:04 +03:00
Alexey Milovidov
02c67e2b13 Fixed error [#CLICKHOUSE-2] 2018-03-16 09:51:37 +03:00
Alexey Milovidov
25a691f03d Don't allow Distributed table that look at itself [#CLICKHOUSE-2919]. 2018-03-16 05:08:31 +03:00
Alexey Milovidov
b5e4d0692a Disallow PREWHERE, SAMPLE, FINAL in MATERIALIZED VIEWs [#CLICKHOUSE-2]. 2018-03-16 04:23:37 +03:00
alexey-milovidov
b9339e0ea1
Merge pull request #2053 from yandex/small-enhancements
Small enhancements
2018-03-15 22:10:29 +03:00
alexey-milovidov
1e88f2fe5c
Update AbandonableLockInZooKeeper.h 2018-03-15 22:06:53 +03:00
alexey-milovidov
e64b2df874
Update ReplicatedMergeTreeBlockOutputStream.cpp 2018-03-15 22:06:23 +03:00
alexey-milovidov
1554390bab
Update AbandonableLockInZooKeeper.h 2018-03-15 22:05:58 +03:00
Vitaliy Lyudvichenko
16dad209f7 Do not make extra ZK RTTs in inserts. [#CLICKHOUSE-3]
Resolves #2054
2018-03-15 21:40:59 +03:00
Vitaliy Lyudvichenko
4011afa399 Parallel SELECT and INSERT in ClusterCopier. [#CLICKHOUSE-2] 2018-03-14 23:49:18 +03:00
Vitaliy Lyudvichenko
f1b32e8982 Fixed ordinary MergeTree merges in case of empty ORDER BY key. [#CLICKHOUSE-2] 2018-03-14 23:49:18 +03:00
Nikolai Kochetov
51301d38cd added tryGetCreateTableQuery [#CLICKHOUSE-3590] 2018-03-14 22:56:44 +03:00
Alexey Milovidov
3c16faaff0 Merge branch 'master' of github.com:yandex/ClickHouse 2018-03-14 21:57:15 +03:00
alexey-milovidov
e5836cf97f
Merge pull request #2036 from yandex/CLICKHOUSE-3639
Fixed ZooKeeper with chroot, refactoring of ZooKeeper::multi*
2018-03-14 21:56:22 +03:00
Alexey Milovidov
9862f17ae4 Merge branch 'master' of github.com:yandex/ClickHouse 2018-03-14 19:40:32 +03:00
Alexey Milovidov
57279a87c7 Whitespaces [#CLICKHOUSE-2]. 2018-03-14 19:40:08 +03:00
Vitaliy Lyudvichenko
7abbe093e9 Avoid magic constants in system.parts. [#CLICKHOUSE-3]
Resolves #2039
2018-03-14 19:04:19 +03:00
Vitaliy Lyudvichenko
56bfb05ebb Fix insane DateTime in system.parts. [#CLICKHOUSE-3] 2018-03-14 19:00:02 +03:00
Vitaliy Lyudvichenko
8028ba0de9 Refactoring of zkutil::ZooKeeper::multi* functions. [#CLICKHOUSE-2] 2018-03-14 16:29:03 +03:00
Nikolai Kochetov
d6e9d08d5e getCreateTableQuery and getCreateDatabaseQuery [#CLICKHOUSE-3590] 2018-03-14 15:37:38 +03:00
Alexey Milovidov
c9d1b61ef7 Fixed build after merge #2029 2018-03-14 06:19:23 +03:00
alexey-milovidov
9ac2569c65
Merge branch 'master' into refactor-table-declaration 2018-03-14 05:35:50 +03:00
kshvakov
3ae2e443fd Revert "Fix quotes in partition display name based on Date, DateTime or UUID type"
This reverts commit 10aa9cfc8a.
2018-03-14 03:33:21 +03:00
Kirill Shvakov
0a33b774a3 Fix quotes in partition display name based on Date, DateTime or UUID type 2018-03-14 03:33:21 +03:00
alexey-milovidov
04cc8a52f7
Merge pull request #2032 from yandex/system-table-macro
System table macro
2018-03-14 02:10:30 +03:00
alexey-milovidov
8522a1b4d1
Update StorageSystemMacros.h 2018-03-14 02:09:26 +03:00
Alexey Zatelepin
5906c9a988 rename for clarity 2018-03-13 18:00:28 +03:00
Alexey Zatelepin
fdffbe53ac encapsulate ColumnsDeclaration [#CLICKHOUSE-3241] 2018-03-13 17:41:25 +03:00
Alexey Milovidov
b7475b1d2c Fixed error: wrong timeouts passed to ConnectionPoolWithFailover [#CLICKHOUSE-3641] 2018-03-12 23:25:18 +03:00
Alexey Zatelepin
de1db216a5 getStructureOfRemoteTable returns info about column default kinds [#CLICKHOUSE-3241] 2018-03-12 23:21:54 +03:00
Alexey Zatelepin
78d92f6794 add some useful methods, rename for clarity [#CLICKHOUSE-3241] 2018-03-12 22:10:13 +03:00
Alexey Zatelepin
972db7b072 iterate over materialized columns where it makes sense 2018-03-12 22:07:48 +03:00
Alexey Zatelepin
71642b0880 use ColumnsDescription everywhere [#CLICKHOUSE-3241] 2018-03-12 22:07:48 +03:00
Nikolai Kochetov
8b09e55102 added system.macros table [#CLICKHOUSE-3591] 2018-03-12 21:38:00 +03:00
Nikolai Kochetov
4dd7f47ad5 reload macros with config [#CLICKHOUSE-3591] 2018-03-12 21:16:51 +03:00
alexey-milovidov
56deedfe9f
Merge pull request #2027 from yandex/CLICKHOUSE-3346
Sync insert and сluster copier enhancements
2018-03-12 20:58:53 +03:00
Nikolai Kochetov
60ab3294b1 fix concurrent select from system.parts_columns 2018-03-12 19:23:48 +03:00
Vitaliy Lyudvichenko
30b69c84ae Fixed Illegal PREWHERE error for Merge tables over Distributed. [#CLICKHOUSE-3637] 2018-03-12 18:14:26 +03:00
Vitaliy Lyudvichenko
32b617e1d6 Fixed extra squashing leaded to too big timeouts. [#CLICKHOUSE-3346] 2018-03-11 21:36:09 +03:00
Alexey Milovidov
5ff433b670 Merged Limits to Settings [#CLICKHOUSE-2021] 2018-03-11 03:15:26 +03:00
Alexey Milovidov
afbbd780e3 Fixed error with initialization of PartLog [#CLICKHOUSE-3354] 2018-03-10 22:57:13 +03:00
Alexey Milovidov
5fc47bdfb1 Fixed error [#CLICKHOUSE-3627] 2018-03-10 03:26:17 +03:00
Alexey Milovidov
3f8ef38b41 Fixed wording #245 2018-03-10 02:23:15 +03:00
Alexey Milovidov
97b30d0b33 Added column "peak_memory_usage" to SHOW PROCESSLIST #245 2018-03-10 02:09:28 +03:00
Alexey Milovidov
add4d29298 Added "is_cancelled" columns to SHOW PROCESSLIST #245 2018-03-10 00:12:52 +03:00
alexey-milovidov
e41e2fe613
Merge pull request #1912 from zhang2014/fix/ISSUES-369
ISSUES-369 add default database when create materialize view
2018-03-07 23:28:17 +03:00
proller
d73fea5ab0
Fix macos compile (#2006)
* Fix macos compile

* rename cluster-copier -> copier
2018-03-07 21:17:17 +03:00
Vitaliy Lyudvichenko
96d4e59dab Simplified logic of distributed sync insert. [#CLICKHOUSE-2] 2018-03-07 17:39:02 +03:00
Vitaliy Lyudvichenko
47d1d4c83c More effective retries, fast partition discovering. [#CLICKHOUSE-3346] 2018-03-07 17:39:02 +03:00
Nikolai Kochetov
532b57aef8 perf. fixes 2018-03-07 01:05:36 +03:00
Alex Zatelepin
90ea45a397
better exception message [#CLICKHOUSE-3599] 2018-03-06 22:01:45 +03:00
Alexey Zatelepin
ec91d29d6a correct MergingParams columns check [#CLICKHOUSE-3599] 2018-03-06 20:17:58 +03:00
Alexey Milovidov
8bc40879ab Fixed error [#CLICKHOUSE-2] 2018-03-06 19:11:29 +03:00
proller
82a361d0e9 Show error to client if query was killed (#1989)
* Show error to client if query was killed

* Kill exception v2

* Use kill

* fix

* wip

* fix

* fxi

* try fix

* Revert "try fix"

This reverts commit eb76e4c040.

* QUERY_WASCANCELLED

* Fxi all cancel()

* fix
2018-03-06 00:09:39 +03:00
Nikolai Kochetov
b2b1588d5f added FilterWithZerosCounter 2018-03-05 17:25:20 +03:00
Nikolai Kochetov
8b01ec2225 Merge branch 'master' into better-range-reader 2018-03-05 15:55:06 +03:00
Alexey Milovidov
91a6a88102 Explicit semantic for TSan [#CLICKHOUSE-2] 2018-03-03 21:00:46 +03:00
Alexey Milovidov
07d8db9f2a Explicit semantic for TSan [#CLICKHOUSE-2] 2018-03-03 20:44:53 +03:00
Alexey Milovidov
368f46d764 Addition to prev. revision [#CLICKHOUSE-2] 2018-03-03 19:48:24 +03:00
Alexey Milovidov
2e371822ad Changed low level data race to high level data race [#CLICKHOUSE-2] 2018-03-03 19:46:32 +03:00
Alexey Milovidov
3b0d713120 Cleanup semantics [#CLICKHOUSE-2] 2018-03-03 19:26:06 +03:00
Alexey Milovidov
c897e5ca39 Better [#CLICKHOUSE-2] 2018-03-03 18:36:20 +03:00
Alexey Milovidov
8c37547bfe Fixed harmless data race [#CLICKHOUSE-2] 2018-03-03 18:35:24 +03:00
alexey-milovidov
9b4ea7acde
Merge pull request #1933 from zhang2014/fix/ISSUES-1386
ISSUES-1386 add illegal column exception when drop exist depend
2018-03-02 22:33:57 +03:00
alexey-milovidov
1bc8e61d8b
Update AlterCommands.cpp 2018-03-02 22:33:04 +03:00
alexey-milovidov
e57124481e
Update AlterCommands.cpp 2018-03-02 22:32:30 +03:00
Alexey Milovidov
bf924d1c9d Better name [#CLICKHOUSE-2] 2018-03-02 21:51:59 +03:00
Nikolai Kochetov
7851e71a2a fix continueReadingChain from several mark ranges 2018-03-02 16:05:33 +03:00
zhang2014
c400613f03 Merge branch 'master' into fix/ISSUES-369 2018-03-02 18:55:15 +08:00
zhang2014
4a38e97ed6 Merge branch 'master' into fix/ISSUES-1386 2018-03-02 18:03:18 +08:00
Alexey Milovidov
22bbc9f08c Added limit on size of AST after expansion of aliases [#CLICKHOUSE-18] 2018-03-02 09:33:17 +03:00
zhang2014
54cba2f5a6 Fix exist subquery when create materializer view 2018-03-02 01:05:03 +08:00
Alexey Milovidov
c42d3ac17f Fixed error (PREWHERE in Distributed table) #1947 2018-03-01 10:11:35 +03:00
Alexey Milovidov
fe2da8a2c7 Added method rename for StorageView [#CLICKHOUSE-2] 2018-03-01 07:23:32 +03:00
Alexey Milovidov
9c68584281 Fixed error #1947 2018-02-28 22:47:33 +03:00
Alexey Milovidov
c35727c7ed Miscellaneous #1947 2018-02-28 03:07:39 +03:00
Alexey Milovidov
ac37b89b16 Better UNION ALL: development #1947 2018-02-26 12:05:06 +03:00
Alexey Milovidov
601ff1eee4 Simplification of AST #1947 2018-02-26 06:37:08 +03:00
Alexey Milovidov
88b01e867d Better UNION ALL: development #1947 2018-02-25 10:39:45 +03:00
Alexey Milovidov
6e93635275 Better UNION ALL: development #1947 2018-02-25 09:35:24 +03:00
Alexey Milovidov
6e8572e628 Merge branch 'master' into better-union-all-try2 2018-02-25 08:03:59 +03:00
Alexey Milovidov
722b6287ec Miscellaneous [#CLICKHOUSE-2] 2018-02-25 05:43:27 +03:00
Alexey Milovidov
ab594375ab Better UNION ALL: development #1947 2018-02-25 03:50:53 +03:00
Alexey Milovidov
2b974554e5 Fixed test [#CLICKHOUSE-2] 2018-02-24 04:55:43 +03:00
Alexey Milovidov
cae7f96f34 Simplification [#CLICKHOUSE-2] 2018-02-23 13:02:29 +03:00
Alexey Milovidov
ecc3ab8636 Fixed test #1896 2018-02-23 11:42:10 +03:00
Alexey Milovidov
ce1f9d7feb Fixed error #1947 2018-02-23 08:59:12 +03:00
Alexey Milovidov
640daaf052 Fixed test #1947 2018-02-23 04:00:47 +03:00
Alexey Milovidov
245fd61b12 Unify NullableAdapterBlockInputStream and CastTypeBlockInputStream #1947 2018-02-23 02:02:35 +03:00
Alexey Milovidov
f792ab0824 Remove RemoveColumnsBlockInputStream #1947 2018-02-23 00:35:17 +03:00
alexey-milovidov
7a5ccc86cc
Merge pull request #1937 from yandex/CLICKHOUSE-3606
Update of clickhouse-copier
2018-02-22 23:42:33 +03:00
alexey-milovidov
82fa3883f8
Merge pull request #1930 from yandex/nonblocking-precommitted
Allow PreCommitted parts to contain each other
2018-02-22 23:35:16 +03:00
alexey-milovidov
2acdba3781
Merge pull request #1943 from yandex/add_path_to_system_tables_and_databases
Add path to system tables and databases
2018-02-22 19:26:19 +03:00
Nikolai Kochetov
976d2a49fe merged with master 2018-02-22 14:54:26 +03:00
Nikolai Kochetov
733156438a fix continueReadingChain from several mark ranges 2018-02-22 14:35:06 +03:00
Nikolai Kochetov
39f16b66b5 fix continueReadingChain from several mark ranges 2018-02-22 14:31:15 +03:00
zhang2014
9cffea1958 ISSUES-1386 resolve some opinions 2018-02-22 19:27:58 +08:00
Nikolai Kochetov
c7f5f6f574 added data_path and metadata_path to system.databases and path to system.parts and system.parts_columns [#CLICKHOUSE-3580] 2018-02-22 13:03:45 +03:00
Nikolai Kochetov
a75e095a80 added data_path and metadata_path to system.tables 2018-02-22 13:03:35 +03:00
alexey-milovidov
b6f3f06ef3
Merge branch 'master' into CLICKHOUSE-3606 2018-02-22 02:13:38 +03:00
alexey-milovidov
ee41f7000f
Merge pull request #1940 from yandex/CLICKHOUSE-3571
Try to reduce false positive of sanity check
2018-02-22 01:59:33 +03:00
alexey-milovidov
d4dcb9412c
Merge pull request #1941 from yandex/unsorted-mergetree
Fix MergeTree idiosyncrasies
2018-02-22 00:36:59 +03:00
Alexey Milovidov
02f7cc2d04 Fixed error with StorageMerge [#CLICKHOUSE-2]. 2018-02-21 23:24:29 +03:00
Alexey Milovidov
222fb2c945 Miscellaneous [#CLICKHOUSE-2] 2018-02-21 23:23:27 +03:00
Alexey Milovidov
4055da5979 Fixed error with filtering of tables by _table virtual column in StorageMerge [#CLICKHOUSE-3583] 2018-02-21 22:44:22 +03:00
Alexey Zatelepin
610f70fbeb forbid non-deterministic functions in primary and partition keys [#CLICKHOUSE-3455] 2018-02-21 20:54:16 +03:00
Vitaliy Lyudvichenko
47becc0b92 Try to reduce false positive of sanity check. More detail dignostics. [#CLICKHOUSE-3571] 2018-02-21 20:06:29 +03:00
Alexey Zatelepin
6fdf82e452 allow the primary key and the partition key to use the same expression [#CLICKHOUSE-3455] 2018-02-21 18:43:24 +03:00
Alexey Zatelepin
e3422ea52e MergeTree without primary key [#CLICKHOUSE-3462] 2018-02-21 17:50:26 +03:00
Alexey Milovidov
1a026e6131 Fixed error [#CLICKHOUSE-2] 2018-02-21 09:47:32 +03:00
Alexey Milovidov
aad0c62e67 Fixed error [#CLICKHOUSE-2] 2018-02-21 08:11:53 +03:00
Alexey Milovidov
09ac108f4c Fixed error [#CLICKHOUSE-2] 2018-02-21 07:38:26 +03:00
Alexey Milovidov
652dfc8c36 Fixed error [#CLICKHOUSE-2] 2018-02-21 07:18:08 +03:00
Alexey Milovidov
a69bd2220a Merge branch 'master' into header-in-output-streams 2018-02-21 04:41:09 +03:00
Alexey Milovidov
3dd665179e Fixed error with components of Nested data structures without data and PREWHERE filtering [#CLICKHOUSE-3608] 2018-02-21 04:16:09 +03:00
zhang2014
dc189fd129 ISSUES-1386 add logical error when drop exist depend 2018-02-21 08:49:30 +08:00
Tsarkova Anastasia
d99d01ac3a Fix data types for key_ranges 2018-02-20 23:03:15 +03:00
Nikolai Kochetov
ba81835e58 fixed progress stats 2018-02-20 17:26:22 +03:00
Nikolai Kochetov
36fe36d003 updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader 2018-02-20 16:59:19 +03:00
Alexey Zatelepin
da87abc422 fix condition for the 'intersects previous part' log message 2018-02-20 16:59:01 +03:00
Alexey Zatelepin
53b5c5f54c add check for intersecting parts when adding new parts 2018-02-20 16:58:41 +03:00