Commit Graph

154 Commits

Author SHA1 Message Date
alesapin
7851d8fe0a Add ability to alter settings with other types of alter 2019-08-27 12:34:53 +03:00
alesapin
cf31187254 Resolve conflicts 2019-08-26 21:08:58 +03:00
alesapin
0d0ebf885f Remove two redundant arguments from alter 2019-08-26 17:50:34 +03:00
Alexey Milovidov
60d660e263 Merge branch 'master' into merge-constraints 2019-08-26 16:13:44 +03:00
alesapin
062034dfd8 Eventually merged with master 2019-08-26 13:07:32 +03:00
Alexey Milovidov
3fef8e92ad Merging CONSTRAINTS support 2019-08-25 00:20:20 +03:00
alesapin
70ca7f4156 Merge with master 2019-08-21 11:57:35 +03:00
alexey-milovidov
308baa182e
Merge branch 'master' into table-constraints 2019-08-21 06:33:08 +03:00
Gleb Novikov
86fecc7501 Merge branch 'master' into table-constraints 2019-08-20 12:17:56 +03:00
alesapin
e7542810bb Merge with master 2019-08-19 11:20:48 +03:00
Nikolai Kochetov
18ad0e7e6b Merged with master. 2019-08-16 13:55:40 +03:00
Gleb Novikov
381ea6cb6e Merge branch 'master' into table-constraints 2019-08-11 12:38:34 +03:00
Nikita Vasilev
75e381bde4 Merge remote-tracking branch 'upstream/master' into nikvas0/index_mutate 2019-08-10 23:07:50 +03:00
Nikolai Kochetov
2ae3db7920 Merged with master. 2019-08-09 18:32:44 +03:00
alesapin
e0d18c0fe8 Merge branch 'master' into merge_tree_settings_alter 2019-08-08 18:16:22 +03:00
Ivan
1bf6e034e8
Fix infinite loop when reading Kafka messages (#6354)
* Do not pause/resume consumer at all
* Fix kafka tests
* Try to ensure the subscription
* Set timeout for kafka tests and return 'while True'
* Update cluster.py
* When doing a raw select from kafka, ignore client errors.
  They may rise due to 'Local: Timed out' while subscribing.
2019-08-07 19:10:14 +03:00
alesapin
13e4581317 More general 2019-08-07 18:21:45 +03:00
alesapin
e62101b8e8 Better comment 2019-08-06 19:29:31 +03:00
Nikita Vasilev
4a39538625 Merge remote-tracking branch 'upstream/master' into nikvas0/index_mutate 2019-08-04 16:58:21 +03:00
alesapin
d9a2ac123a Fix small typo and merge 2019-07-29 12:17:37 +03:00
Nikita Vasilev
1118ce04b9 fixed 2019-07-27 18:36:40 +03:00
Nikita Vasilev
7efb1bcb12 Merge remote-tracking branch 'upstream/master' into nikvas0/index_mutate 2019-07-27 10:30:43 +03:00
alesapin
8a00ce5ff1 Intermediate step 2019-07-24 15:56:39 +03:00
CurtizJ
b9dc472071 Merge remote-tracking branch 'upstream/master' into order-by-efficient 2019-07-19 01:09:59 +03:00
CurtizJ
a3d25790bd basic implementation of reading in pk order and 'order by' optimization 2019-07-18 17:41:11 +03:00
Amos Bird
71233e11a9 minor updates. 2019-07-17 14:17:34 +08:00
Amos Bird
9fa955403b Optimize count()
Choose the smallest column to count if possible.
2019-07-17 02:29:17 +08:00
Ivan Lezhankin
befb3ce15b Merge branch 'master' into fix-filter-table 2019-07-10 13:27:26 +03:00
Ivan Lezhankin
9f01fa7aaa Implement getDatabaseName() and rename() for all storages 2019-07-09 18:40:21 +03:00
Vitaliy Zakaznikov
a80af666ad * Updates that incorporate comments from the review 2019-07-09 08:41:55 -04:00
Vitaliy Zakaznikov
259a95a3da * Updates to fix issues after the merge 2019-07-07 19:57:58 -04:00
CurtizJ
410b62f7fa Merge branch 'clickhouse-4013' of https://github.com/anrodigina/ClickHouse into order-by-efficient 2019-07-05 13:48:04 +03:00
Gleb Novikov
71c2ca0fe9 Merge branch 'master' into table-constraints 2019-07-04 22:40:00 +03:00
alesapin
3925a3bd13 Generalize check query 2019-07-03 16:17:19 +03:00
Vitaliy Zakaznikov
b5120931d5 Merge branch 'master' of https://github.com/yandex/ClickHouse into liveview 2019-07-01 18:12:31 -04:00
Nikita Vasilev
7b7517ff85 Merge remote-tracking branch 'upstream/master' into nikvas0/index_mutate 2019-06-24 16:44:44 +03:00
Ivan Lezhankin
9fd048cdbd Allow to select virtual columns in materialized view 2019-06-18 19:32:37 +03:00
Vitaliy Zakaznikov
5983273694 Fixing bugs reported by sanitizers
* data race condition on storage is_dropped access
* invalid reference to storage after it is deleted
* invalid reference to mutex after storage is deleted
2019-06-12 09:11:44 -04:00
Vitaliy Zakaznikov
87b58e4150 * Fixing clang errors
* Fixing LIVE VIEW tests
2019-06-10 07:18:33 -04:00
Vitaliy Zakaznikov
5079180595 * Fixing a bug in LIVE VIEW tables. Before when a table
is created with "AS SELECT 1" the SELECT and WATCH queries would fail
* Adding and updating LIVE VIEW tests to increase coverage
2019-06-08 09:26:02 -04:00
Vitaliy Zakaznikov
d112695c42 * Adding other changes to support LIVE VIEWs 2019-05-28 17:17:48 -04:00
Ivan Lezhankin
6b1a9e0e52 Fix comment 2019-05-28 15:22:10 +03:00
Ivan Lezhankin
dd906eabdc [WIP] refactoring 2019-05-22 22:38:43 +03:00
Ivan Lezhankin
cf39c4cc47 Embed virtual columns into IStorage 2019-05-21 14:24:32 +03:00
Gleb Novikov
773849a43d Added constraints getter and setter to IStorage 2019-05-19 09:08:25 +03:00
anrodigina
d7ee2cb907
Merge branch 'master' into clickhouse-4013 2019-05-18 15:34:23 +03:00
Anastasiya Rodigina
5978ca040b Resolve conflicts with master 2019-05-18 15:30:41 +03:00
Anastasiya Rodigina
31f5cb1eee Resolve conflicts with master 2019-05-18 15:29:57 +03:00
Anastasiya Rodigina
b5eab916f5 Resolve conflicts with master 2019-05-18 15:28:09 +03:00
alexey-milovidov
7985ad10ef
Update IStorage.h 2019-05-18 12:31:51 +03:00