Commit Graph

3338 Commits

Author SHA1 Message Date
alexey-milovidov
20d5ddd58c
Merge branch 'master' into alter-update 2018-09-10 17:17:10 +03:00
alexey-milovidov
3054e62e00
Merge pull request #3089 from VadimPE/CLICKHOUSE-3839
CLICKHOUSE-3839 add virtual column "_partition_id"
2018-09-10 17:16:21 +03:00
VadimPE
10ab9587a2 CLICKHOUSE-3839 add virtual column _partition_id 2018-09-10 12:53:13 +03:00
Alexey Milovidov
c9b612de48 Attempt to fix CLICKHOUSE-3888 bug 2018-09-10 06:59:48 +03:00
Alexey Milovidov
54ea7b0b20 Fixed error [#CLICKHOUSE-2] 2018-09-09 06:28:45 +03:00
alexey-milovidov
ef22af2e49
Merge pull request #2881 from zhang2014/feature/support_optimize_predicate_for_view
ISSUES-863 support optimize predicate for view
2018-09-08 00:43:13 +03:00
alexey-milovidov
0b6e85e51d
Merge pull request #3073 from yandex/fix_prewhere_with_sampling
Fix prewhere with sampling
2018-09-08 00:34:06 +03:00
Nikolai Kochetov
8311c23d83 Fix test. 2018-09-07 23:23:28 +03:00
Alexey Zatelepin
133c9c7c37 Merge branch 'master' into alter-update
Conflicts:
	docs/en/query_language/alter.md
2018-09-07 19:11:02 +03:00
Nikolai Kochetov
6e41be3476 Avoid removing columns used in sample expression in prewhere actions. [#CLICKHOUSE-3969] 2018-09-07 19:01:21 +03:00
Alexey Zatelepin
d77037fec7 fix use after move 2018-09-07 18:54:34 +03:00
Alexey Zatelepin
1064d1d26b update MATERIALIZED columns when their dependencies are updated [#CLICKHOUSE-13] 2018-09-07 18:54:18 +03:00
chertus
0b35cdae69 refactoring: add some sugar in type checks [CLICKHOUSE-0002] 2018-09-07 17:37:26 +03:00
Alexey Milovidov
98b835ea52 Fixed build [#CLICKHOUSE-2] 2018-09-06 21:44:12 +03:00
alexey-milovidov
580683310b
Merge pull request #2990 from alesapin/master
CLICKHOUSE-3800: Add Cache for compiled expression.
2018-09-06 21:12:08 +03:00
proller
6d8b1bea4b Try fix crash in StorageBuffer 2018-09-06 18:06:54 +03:00
Alexander Sapin
03174e131d Merge remote-tracking branch 'upstream/master' 2018-09-06 12:39:42 +03:00
Alexey Milovidov
5a096ee099 Attempt to fix an issue mentioned by Matt Keranen in #2958 2018-09-06 05:47:59 +03:00
alexey-milovidov
4032e4d22c
Merge pull request #3049 from yandex/fix-collapsing-vertical-merge
Fix collapsing vertical merge regression
2018-09-05 21:47:23 +03:00
Alexey Zatelepin
6275bfd8cd fix CollapsingMergeTree + vertical merge [#CLICKHOUSE-3963]
don't skip writing to rows sources even if all rows have collapsed.
2018-09-05 20:19:51 +03:00
Alexey Milovidov
12ff8814f8 Removed useless code [#CLICKHOUSE-2] 2018-09-05 19:11:10 +03:00
Alexey Zatelepin
acc1a84827 better name [#CLICKHOUSE-13] 2018-09-05 15:54:03 +03:00
Nikolai Kochetov
46d6c03569 Merge branch 'master' into fix-prewhere-with-aliases 2018-09-05 13:08:07 +03:00
Alexey Milovidov
035c07d01e Fixed error with locking in InterpreterDropQuery [#CLICKHOUSE-3959] 2018-09-04 23:56:09 +03:00
Nikolai Kochetov
3c6db8ebc1 Fix prewhere with aliased columns. [#CLICKHOUSE-3944] 2018-09-04 21:28:01 +03:00
Alexey Zatelepin
4f91833e67 Merge branch 'master' into alter-update
Conflicts:
	dbms/src/Parsers/ASTIdentifier.cpp
2018-09-04 17:39:08 +03:00
Alexey Zatelepin
816b91e2e3 additional checks for UPDATEs of key columns [#CLICKHOUSE-13] 2018-09-04 17:34:50 +03:00
Alexey Zatelepin
b6a5bbc4e9 move validation to MutationsInterpreter [#CLICKHOUSE-13] 2018-09-04 17:33:48 +03:00
Alexey Zatelepin
dc0c731c10 later mutation stages now work with IN (SELECT ...) [#CLICKHOUSE-13] 2018-09-04 14:39:10 +03:00
Alexey Zatelepin
d4d1020798 execute UPDATEs and DELETEs in stages [#CLICKHOUSE-13] 2018-09-03 22:34:49 +03:00
Alexey Milovidov
8fae37f5c7 Removed wrong code from StorageSystemColumns #2447 2018-09-03 21:04:29 +03:00
alesapin
83574eed7c Merge remote-tracking branch 'upstream/master' 2018-09-03 13:11:33 +03:00
alesapin
11d248ba10 Resolve conflict 2018-09-03 13:11:10 +03:00
VadimPE
6e78f576d7 ISSUES-2581 add comments, and fix 2018-09-03 11:25:35 +03:00
Alexey Milovidov
226a7f491e Whitespaces [#CLICKHOUSE-3944] 2018-09-03 08:06:19 +03:00
Alexey Milovidov
a903a5a755 Addition to prev. revision [#CLICKHOUSE-2] 2018-09-02 06:58:31 +03:00
Alexey Milovidov
fc27be314b Avoid temporary nullptr references [#CLICKHOUSE-2] 2018-09-02 06:00:04 +03:00
Alexey Milovidov
684d3f6162 Fixed bug #2830 2018-09-02 05:27:56 +03:00
Alexey Milovidov
f7107f12b4 Merge branch 'master' into extra-warnings 2018-09-02 03:13:36 +03:00
Alexey Milovidov
8eb746b216 Documentation for ProfileEvents (draft) #3010 2018-09-02 02:13:17 +03:00
Alexey Milovidov
751cf62262 Added documentation for CurrentMetrics #3010 2018-09-01 22:51:38 +03:00
alexey-milovidov
a05cdfbb45
Merge branch 'master' into extra-warnings 2018-08-31 03:03:44 +03:00
alesapin
6bfde2825e Fix conflict 2018-08-30 22:23:00 +03:00
alesapin
6e64067a70 CLICKHOUSE-3800: Move cache to context, change hashing algorithm, add drop instruction for compiled expressions cache 2018-08-30 19:31:20 +03:00
Alexey Zatelepin
e9493b3a5f use hard links to copy columns that didn't change [#CLICKHOUSE-13] 2018-08-30 16:56:43 +03:00
Alexey Zatelepin
dc2a4c21e9 execute ALTER UPDATE [#CLICKHOUSE-13] 2018-08-30 16:56:43 +03:00
Alexey Zatelepin
8e7c58dd75 parse ALTER UPDATE command [#CLICKHOUSE-13] 2018-08-30 16:56:43 +03:00
Alexey Milovidov
87dfd8e47e Removed useless field #2447 2018-08-29 17:55:28 +03:00
zhang2014
f921c9c169 ISSUES-863 support optimize predicate for view 2018-08-29 13:29:03 +08:00
Alexey Milovidov
3e216f055c Miscellaneous #2758 2018-08-28 03:44:42 +03:00
Alexey Milovidov
9a4b4fbccd Miscellaneous #2758 2018-08-28 03:23:52 +03:00
Alexey Milovidov
236c3872b8 Miscellaneous #2758 2018-08-28 03:23:38 +03:00
Alexey Milovidov
32286484cd Miscellaneous #2758 2018-08-28 03:22:32 +03:00
Alexey Milovidov
52379be265 Miscellaneous #2758 2018-08-28 03:21:02 +03:00
Alexey Milovidov
4f8d324fa7 Miscellaneous #2758 2018-08-28 03:18:32 +03:00
Alexey Milovidov
fa0ffcf8dc Miscellaneous #2758 2018-08-28 03:17:27 +03:00
Alexey Milovidov
2a4b4eefd6 Miscellaneous #2758 2018-08-28 03:10:05 +03:00
Alexey Milovidov
ea643eeff9 Miscellaneous #2758 2018-08-28 03:03:10 +03:00
Alexey Milovidov
7c777c48d7 Miscellaneous #2758 2018-08-28 03:01:03 +03:00
Alexey Milovidov
0a7e288d70 Miscellaneous #2758 2018-08-28 02:59:49 +03:00
Alexey Milovidov
bab6cd504d Miscellaneous #2758 2018-08-27 22:16:38 +03:00
Alexey Milovidov
24bd803c07 Whitespaces #2758 2018-08-27 22:06:32 +03:00
Vadim
a246b913e0
Merge branch 'master' into ISSUES-2581 2018-08-27 19:45:35 +03:00
Vadim
2d8bffafa3
Update MergeTreeSettings.h 2018-08-27 19:38:54 +03:00
Vadim
4d9d80b271
Update MergeTreeSettings.h 2018-08-27 19:38:36 +03:00
Alexey Milovidov
076e1fb2e1 Enabling -Wshadow [#CLICKHOUSE-2] 2018-08-27 19:31:45 +03:00
VadimPE
418375aa1d Merge branch 'CLICKHOUSE-3847' of https://github.com/VadimPE/ClickHouse into CLICKHOUSE-3847 2018-08-27 19:23:08 +03:00
VadimPE
70ebb6a47d CLICKHOUSE-3847 fix code-style 2018-08-27 19:22:39 +03:00
Vadim
64a27e592b
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-27 19:00:40 +03:00
VadimPE
4d198f2bfe CLICKHOUSE-3847 fix build 2018-08-27 18:54:07 +03:00
VadimPE
0281678c3e CLICKHOUSE-3847 fix code style 2018-08-27 18:44:51 +03:00
VadimPE
a8974f8786 CLICKHOUSE-3847 add Coordinator 2018-08-27 16:51:22 +03:00
Vadim
be2d821669
Merge branch 'master' into CLICKHOUSE-3847 2018-08-27 15:26:41 +03:00
Vadim
c4e90d89f0
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-27 15:16:52 +03:00
VadimPE
22aa521884 CLICKHOUSE-3847 fix bug when replica recover and it's log_pointer will be deleted 2018-08-27 15:14:48 +03:00
VadimPE
cf0a7c1529 CLICKHOUSE-3847 fix bug when replica recover and it's log_pointer will be deleted 2018-08-27 15:09:22 +03:00
Alexey Milovidov
a1a70d4a65 Enabling -Wzero-as-null-pointer-constant [#CLICKHOUSE-2] 2018-08-26 04:56:34 +03:00
Alexey Milovidov
c193d15ef2 Merge branch 'master' into generalize-zookeeper 2018-08-26 03:32:15 +03:00
alexey-milovidov
f92bae33f8
Merge pull request #2949 from yandex/distinguish-between-definitely-lost-and-unknown-requests-in-zookeeper
ZooKeeperImpl: allow to distinguish cases when request was definitely not been processed.
2018-08-26 03:12:20 +03:00
Alexey Milovidov
068e50329e Support for max_block_size in system.tables and system.columns tables #2447 2018-08-25 19:07:48 +03:00
alexey-milovidov
046137f9c5
Merge pull request #2946 from amosbird/locking
Better locking for StorageBuffer
2018-08-25 13:47:29 +03:00
Amos Bird
2602177525 Better locking for StorageBuffer 2018-08-25 13:52:06 +08:00
Alexey Milovidov
3475ef5304 Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 04:58:14 +03:00
Alexey Milovidov
01082d03d2 Adopted logic in ReplicatedMergeTreeBlockOutputStream #2949 2018-08-25 01:55:02 +03:00
alexey-milovidov
7ba62c2e25
Merge pull request #2939 from yandex/fix-potential-data-loss-in-case-of-zk-errors
Fixed potential data loss in case of ZK errors [#CLICKHOUSE-3916]
2018-08-25 01:08:31 +03:00
Alexey Milovidov
eec8af52f3 Fixed potential data loss [#CLICKHOUSE-3916] 2018-08-24 11:57:24 +03:00
Amos Bird
26903d6e8f Add schema argument to ODBC table func.
Useful for datbases like postgres and greenplum.
2018-08-24 16:18:17 +08:00
Alexey Milovidov
1437e5cbe3 Fix style [#CLICKHOUSE-2] 2018-08-24 03:07:25 +03:00
alexey-milovidov
e1e6e316d9
Merge pull request #2930 from yandex/fix-empty-parts-vertical-merge
Fix vertical merge of empty parts
2018-08-24 01:47:11 +03:00
Vadim
1c596db7c0
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 20:19:05 +03:00
Vadim
0bc224ab46
Update StorageReplicatedMergeTree.cpp 2018-08-23 19:40:59 +03:00
Vadim
5a129f5383
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 19:37:28 +03:00
Vadim
380452c933
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 19:36:54 +03:00
Alexey Zatelepin
08f6305dba add missed logging message 2018-08-23 19:33:25 +03:00
Vadim
e7d6bc3dbc
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 19:02:19 +03:00
VadimPE
ce217af78a CLICKHOUSE-3847 fix 2018-08-23 18:58:29 +03:00
Vadim
9271ea7a5f
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 17:20:13 +03:00
Vadim
c1274f9776
Update StorageReplicatedMergeTree.cpp 2018-08-23 17:13:15 +03:00
Vadim
94699b8f6a
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 17:08:24 +03:00
Vadim
234242dd2d
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-23 17:04:53 +03:00