Commit Graph

1378 Commits

Author SHA1 Message Date
Alexey Milovidov
ce0ac3f8f8 Fixed error with Sets, part 2 #2246 2018-04-20 00:34:04 +03:00
Alexey Milovidov
c0978919e3 Fixed error with partition key IN, part 1 #2246 2018-04-19 23:34:02 +03:00
Alexey Milovidov
12e33cfd85 Exit from threads when ZooKeeper session is expired (non significant change) [#CLICKHOUSE-2] 2018-04-19 21:16:18 +03:00
Silviu Caragea
32dd4554da Merge remote-tracking branch 'github/master' into background-schedule-pool-fix
# Conflicts:
#	dbms/src/Storages/StorageReplicatedMergeTree.cpp
2018-04-19 09:29:49 +03:00
Alexey Milovidov
a55abd0a25 Fixed test [#CLICKHOUSE-2] 2018-04-18 23:27:27 +03:00
Alexey Milovidov
3eff0184fa Added set size checking when set from subquery is used for index; removed harmful feature for special support of (a, b) IN (SELECT (a, b)) instead of (a, b) IN (SELECT a, b) [#CLICKHOUSE-2] 2018-04-18 22:38:40 +03:00
alexey-milovidov
22f7a3a545
Merge pull request #2223 from sundy-li/master
Fix:ignore the format_version check when the data is empty
2018-04-17 22:50:26 +03:00
alexey-milovidov
089e71d9a5
Merge pull request #2235 from yandex/small-enhancements
Small enhancements
2018-04-17 22:45:01 +03:00
Vitaliy Lyudvichenko
bf832b3ea6 Fixed OPTIMIZE after RENAME of replicated table. [#CLICKHOUSE-2] 2018-04-17 20:59:42 +03:00
Nikolai Kochetov
9e05052c2a merged with master 2018-04-16 18:35:11 +03:00
Nikolai Kochetov
7b8a306e34 minor fixes 2018-04-16 18:11:13 +03:00
sundy-li
12211ffc5b Fix:ignore the format_version check when the data is empty 2018-04-16 18:04:59 +08:00
Silviu Caragea
c547c5a7b0 Merge remote-tracking branch 'origin/background-schedule-pool-fix'
# Conflicts:
#	dbms/src/Common/ZooKeeper/LeaderElection.h
#	dbms/src/Common/ZooKeeper/ZooKeeper.cpp
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.cpp
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
#	dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
#	dbms/src/Storages/StorageReplicatedMergeTree.cpp
2018-04-10 16:20:14 +03:00
Alexey Milovidov
0a4b349f73 Merge branch 'master' of github.com:yandex/ClickHouse 2018-04-07 00:47:18 +03:00
Alexey Milovidov
4e5e0fa664 ReplicatedMergeTree: Better diagnostics [#CLICKHOUSE-2] 2018-04-07 00:46:57 +03:00
alexey-milovidov
84726e17e8
Merge pull request #2185 from yandex/fix-leader-election-race
Fix races in leader election.
2018-04-07 00:18:26 +03:00
Alexey Milovidov
ee7fe63b69 Avoid herd effect in ReplicatedMergeTreeCleanupThread (continued) [#CLICKHOUSE-2] 2018-04-06 22:44:55 +03:00
Alexey Milovidov
fa776b93c2 Avoid herd effect in ReplicatedMergeTreeCleanupThread [#CLICKHOUSE-2] 2018-04-06 22:43:37 +03:00
Alexey Zatelepin
3a8ca70d1f fix races in leader election [#CLICKHOUSE-3533] 2018-04-06 19:10:23 +03:00
Alexey Milovidov
f66d2fb780 Allow to use FINAL even in case of single part #2086 2018-04-06 00:36:55 +03:00
Nikolai Kochetov
b96039bafe added check for partition column in mayBenefitFromIndexForIn #2170 2018-04-05 00:03:16 +03:00
alexey-milovidov
e2a517db12 Update MergeTreeData.cpp 2018-04-04 00:17:22 +03:00
Nikolai Kochetov
2163977b2a mayBenefitFromIndexForIn returns true if at least one tuple element is in pk [#CLICKHOUSE-3680] 2018-04-04 00:17:22 +03:00
Alexey Milovidov
08170d0d77 Modifications after removing libzookeeper [#CLICKHOUSE-2] 2018-04-03 21:24:18 +03:00
Alexey Milovidov
2310bd7947 Miscellaneous [#CLICKHOUSE-2] 2018-04-03 20:35:48 +03:00
KochetovNicolai
62e6a1bde6
Update MergeTreeBaseBlockInputStream.cpp
Check is block is not empty before removing prewhere column
2018-04-02 17:08:05 +03:00
proller
440b0f33c7 Compile fixes 2018-04-02 15:31:49 +03:00
Alexey Milovidov
3fe743e2bd Fixed error after merge [#CLICKHOUSE-2] 2018-04-01 22:29:08 +03:00
alexey-milovidov
b07fb1ddda
Merge branch 'master' into better-range-reader 2018-04-01 22:16:39 +03:00
alexey-milovidov
428ee63a04
Merge branch 'master' into libzookeeper-rewrite 2018-04-01 17:31:20 +03:00
alexey-milovidov
2e15ce6791
Merge pull request #2132 from yandex/small-enhancements
Small enhancements
2018-03-29 03:07:49 +03:00
alexey-milovidov
a220a43b8e
Merge branch 'master' into fix-detach-database 2018-03-29 03:01:07 +03:00
Vitaliy Lyudvichenko
701b58b4ff Faster DROP PARTITION. [#CLICKHOUSE-2] 2018-03-28 15:48:40 +03:00
alexey-milovidov
e3cbd3306c
Merge pull request #2081 from yandex/stricter-mutable-column-semantic-2
&& - qualified IColumn::mutate
2018-03-28 05:27:35 +03:00
Silviu Caragea
1418e339e4 Rename merge_selecting_handle with merge_selecting_task_handle for consistency 2018-03-26 23:18:19 +03:00
Silviu Caragea
0aa9b9efbe Use consistent names for the task variables (change from next_update_task_handle to merge_selecting_handle) (reverted from commit 50992843c6) 2018-03-26 23:12:17 +03:00
Silviu Caragea
438121e45b Renamed Zookeeper get method with getWatch for consistency 2018-03-26 23:08:14 +03:00
Silviu Caragea
50992843c6 Use consistent names for the task variables (change from next_update_task_handle to merge_selecting_handle) 2018-03-26 22:59:58 +03:00
Silviu Caragea
4361df913b Remove exists and use existsWatch instead for WatchCallbacks 2018-03-26 22:46:14 +03:00
Silviu Caragea
31874ed172 Use consistent names for the task variables 2018-03-26 22:37:47 +03:00
Alex Zatelepin
c5b04f7f17 Add info about total uncompressed part size to system tables (#2052)
* column size calculating routines now take into account multiple streams [#CLICKHOUSE-2831]

* rename for clarity

* use more appropriate method for calculating table size

* add info about total uncompressed part size to system.parts and system.parts_columns [#CLICKHOUSE-2831]

* rename columns for clarity [#CLICKHOUSE-2831]

* count shared substreams only once [#CLICKHOUSE-2831]
2018-03-26 17:18:04 +03:00
Alexey Milovidov
522bf01db9 Using different ZooKeeper library (development) [#CLICKHOUSE-2] 2018-03-25 03:15:52 +03:00
Alexey Milovidov
24f94d9352 Merge remote-tracking branch 'origin/master' into libzookeeper-rewrite 2018-03-24 23:30:57 +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
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
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
Silviu Caragea
a2dc16a582 Remove the link between TaskHandles and ZooKeeper 2018-03-22 17:21:14 +02:00
Silviu Caragea
6629b03af9 Fixed few of the observation of the code review 2018-03-22 17:09:30 +02:00
Silviu Caragea
b24a4b2111 Add back the buggy BackgroundSchedulePool 2018-03-22 17:07:12 +02: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
Alexey Milovidov
02c67e2b13 Fixed error [#CLICKHOUSE-2] 2018-03-16 09:51: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
f1b32e8982 Fixed ordinary MergeTree merges in case of empty ORDER BY key. [#CLICKHOUSE-2] 2018-03-14 23:49:18 +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
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
Alexey Milovidov
c9d1b61ef7 Fixed build after merge #2029 2018-03-14 06:19:23 +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 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
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
3f8ef38b41 Fixed wording #245 2018-03-10 02:23:15 +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
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
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
Alexey Milovidov
601ff1eee4 Simplification of AST #1947 2018-02-26 06:37:08 +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
82fa3883f8
Merge pull request #1930 from yandex/nonblocking-precommitted
Allow PreCommitted parts to contain each other
2018-02-22 23:35:16 +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
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 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
aad0c62e67 Fixed error [#CLICKHOUSE-2] 2018-02-21 08:11:53 +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
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
Nikolai Kochetov
2bf1931d86 updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader 2018-02-20 16:37:04 +03:00
Alexey Zatelepin
5bc6bd55b1 allow PreCommitted parts to contain each other, clean up code 2018-02-20 16:33:28 +03:00
Nikolai Kochetov
dcd99860fe updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader 2018-02-20 16:30:47 +03:00
Nikolai Kochetov
3063c35429 updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader 2018-02-20 16:23:56 +03:00
Nikolai Kochetov
d8b5f14dd7 updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader 2018-02-20 15:26:09 +03:00
Nikolai Kochetov
d2d0d570d8 updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader 2018-02-20 15:09:32 +03:00
Nikolai Kochetov
77a3989558 updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader 2018-02-20 15:02:25 +03:00
Nikolai Kochetov
58b6b7570f updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader 2018-02-20 14:54:32 +03:00
Nikolai Kochetov
af6895ee6f updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader 2018-02-20 14:50:33 +03:00
Nikolai Kochetov
ce70d4faa9 updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader 2018-02-20 14:45:58 +03:00
Nikolai Kochetov
af9ac7b48b merged with master 2018-02-20 12:27:47 +03:00
Nikolai Kochetov
82c76d8467 added MergeTreePrewhereRangeReader 2018-02-20 12:23:02 +03:00
Alexey Milovidov
d0bfa15525 Removed UnsortedMergeTree, part 2 [#CLICKHOUSE-2] 2018-02-19 20:31:49 +03:00
Alexey Milovidov
7ff1346685 Removed UnsortedMergeTree, part 2 [#CLICKHOUSE-2] 2018-02-19 20:31:30 +03:00
Alexey Milovidov
74c56c2def Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 06:56:08 +03:00
Alexey Milovidov
fa50fe80a0 Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 03:45:32 +03:00
alexey-milovidov
d73080640d
Merge pull request #1921 from yandex/header-in-input-streams
Header in input streams
2018-02-18 07:58:04 +03:00
Alexey Milovidov
afe09d3138 Removed unused code [#CLICKHOUSE-2] 2018-02-18 06:46:18 +03:00
Alexey Milovidov
754a4296df Header in every stream: fixed non-deterministic test [#CLICKHOUSE-2] 2018-02-18 06:23:48 +03:00
Alexey Milovidov
df4853a13a Header in every stream: development [#CLICKHOUSE-2] 2018-02-18 03:37:22 +03:00
Alexey Milovidov
ff235fc506 Header in every stream: development [#CLICKHOUSE-2] 2018-02-18 00:08:21 +03:00
Alexey Milovidov
dba529d674 Header in every stream: development [#CLICKHOUSE-2] 2018-02-17 07:13:49 +03:00
Alexey Milovidov
fb0920ff98 Whitespace [#CLICKHOUSE-2] 2018-02-17 01:33:46 +03:00
Alexey Milovidov
264e6cbc84 Header in every stream: development [#CLICKHOUSE-2] 2018-02-16 00:31:09 +03:00
Alexey Milovidov
921e09b5f8 Merge branch 'master' into header-in-input-streams 2018-02-15 19:20:36 +03:00
Nikolai Kochetov
7c69ecb3ef fix test [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
90d67d4e8a added test for moving partition from collapsing to versioned collapsing merge tree [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
36de8a2911 added secondary sort expression [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
64b3a8baa7 added secondary sort expression [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
beb866150d added checks and comments for FixedSizeDequeWithGaps; review fixes [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
40ef753992 added VersionedCollapsingMergeTree to help message [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
32bdf7c38c renamed MultiversionMergeTree to VersionedCollapsingMergeTree [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00