Commit Graph

224 Commits

Author SHA1 Message Date
alesapin
e7ee9b7a67 Merge master 2019-09-02 11:46:00 +03:00
alesapin
7382a9f3c3 Rename method for settings check 2019-09-01 00:15:40 +03:00
alesapin
6f30338c08 Fixes 2019-08-30 21:31:35 +03:00
alesapin
808f4d0b8a Intermediate refactoring 2019-08-30 19:50:59 +03:00
alesapin
1813b96f82 Finally build, possible trash. 2019-08-29 19:17:47 +03:00
Alexey Milovidov
285d66cee1 Improve table locks (incomplete) 2019-08-27 23:43:08 +03:00
alesapin
36472b14f9 Defend kafka storage from alters 2019-08-27 12:48:20 +03:00
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
eb5e052855 merge and fixes 2019-08-21 13:09:29 +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
a85cdc91a6 Merge branch 'master' into ObjatieGroba-feature_multiple_disks 2019-08-19 11:34:02 +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
alesapin
949890ee90 Merged 2019-08-14 12:46:30 +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
Igr Mineev
fc79ed86ef Ready for review 2019-08-01 13:29:14 +03:00
Igr Mineev
31c36efa25 Merge branch 'master' of github.com:yandex/ClickHouse into feature_multiple_disks 2019-07-30 19:13:58 +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
Igr
3e017ec69c
Merge branch 'master' into feature_multiple_disks 2019-07-23 16:38:20 +03:00
Igr Mineev
e967c23adb Add Space interface for reservation. Add move to volume command 2019-07-23 16:34:17 +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
Igr Mineev
21e0bec3d0 Merge remote-tracking branch 'upstream/master' into feature_multiple_disks 2019-07-16 13:45:07 +03: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
Igr Mineev
842c72bb6d Merge branch 'master' into feature_multiple_disks 2019-06-09 15:38:54 +03: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
Igr Mineev
0eba56c4a7 Added move command. 2019-06-07 22:16:42 +03: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
Igor Mineev
15ee6207ab Chg 'Schema' to 'StoragePolicy'. Add system.disks. Add system.storage_politics. Add disk to system.parts. Add policy to system.tables. 2019-05-24 22:03:07 +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
alexey-milovidov
fa4a7eb3d1
Merge branch 'master' into merge-itable-istorage 2019-05-18 00:37:12 +03:00
Ivan Lezhankin
7b6c78402d Allow to shadow virtual column '_table' in Merge engine 2019-05-17 20:40:51 +03:00
Ivan Lezhankin
7f762aee88 Move some code from header to source file. 2019-05-17 17:48:03 +03:00
Ivan Lezhankin
0821d62516 Merge ITableDeclaration into IStorage.
Also a couple of massive include-refactorings with better forwarding
2019-05-17 17:34:25 +03:00
Anastasiya Rodigina
0c1735f1b1 ReverseBlockInputStream, optimization of group by, tests 2019-04-18 00:20:51 +03:00
Igor Mineev
563ab2a5ec Merge remote-tracking branch 'upstream/master' into feature_multiple_disks 2019-04-05 23:07:24 +03:00
Igor Mineev
0441480502 Storage getDataPath -> getDataPaths 2019-04-04 16:13:59 +03:00
Ivan
957d23267b
Minimal implementation of row-level security CLICKHOUSE-4315 (#4792)
For detailed description see the related PR
2019-03-29 23:31:06 +03:00
Alexey Zatelepin
b9c4908edb add the missing part of the comment 2019-03-11 22:07:09 +03:00
Alex Zatelepin
896b8b15f6 fix build 2019-03-07 23:52:25 +03:00
Alexey Zatelepin
f3ea9541fc add comments 2019-03-07 21:34:46 +03:00
Alexey Zatelepin
3344955154 separate Read and Write lock holders, better method names 2019-03-07 21:10:21 +03:00
Alexey Zatelepin
ab025805a3 alter intention lock 2019-03-07 20:21:18 +03:00
Alexey Zatelepin
c5dde2c9fd get rid of default query_id value in RWLock::getLock [#CLICKHOUSE-3789] 2019-02-28 12:37:05 +03:00
Alexey Zatelepin
5ac1d4dd4e rename LockHandler -> LockHolder [#CLICKHOUSE-3789] 2019-02-27 21:34:38 +03:00
Alexey Zatelepin
0d7ab9e3ea allow acquiring read lock to a table out of order if it was already locked by the same query [#CLICKHOUSE-3789]
this is important in preventing ALTER deadlocks
2019-02-27 21:34:38 +03:00
Vitaly Baranov
ab7e7507a4 Revert incorrect fix compilation on Mac.
This reverts commit ef6b20030c.
2019-02-18 20:31:18 +03:00
Vitaly Baranov
ef6b20030c Fix compilation on Mac. 2019-02-12 14:15:03 +03:00
Alexey Milovidov
ba3cb83a84 Removed duplicate includes 2019-02-10 20:12:22 +03:00
Alexey Zatelepin
d482f3e5d0 return CancellationCode from killMutation [#CLICKHOUSE-3912] 2019-02-05 21:09:15 +03:00
Alexey Zatelepin
67be566325 KILL MUTATION skeleton [#CLICKHOUSE-3912] 2019-02-05 21:08:41 +03:00
alesapin
8bc00f4632 CLICKHOUSE-4229: Fix user forwarding for replicated queries which actually send queries to master node 2018-12-28 19:21:32 +03:00
Alexey Milovidov
4c0b95ac02 Less dependencies [#CLICKHOUSE-2] 2018-12-26 02:11:36 +03:00
alexey-milovidov
48b30edcf5
Merge branch 'master' into alter-order-by 2018-12-02 21:06:38 +03:00
Ivan Lezhankin
8b5a05947c Remove redundant information from RWLock.
And fix broken exception in some race conditions
2018-11-28 18:50:52 +03:00
Alexey Zatelepin
1b27fb046d Merge branch 'master' into alter-order-by
Conflicts:
	dbms/programs/server/Server.cpp
2018-11-28 16:47:07 +03:00
Alexey Zatelepin
e085bc9816 adapt code of #3609 [#CLICKHOUSE-3859] 2018-11-27 20:07:10 +03:00
Ivan Lezhankin
470f96ce19 Minor refactoring 2018-11-27 19:45:45 +03:00
Ivan Lezhankin
73aa7f2027 Rename method partition() → alterPartition()
Also fix build with internal shared libraries.
2018-11-26 17:43:40 +03:00
Alexey Zatelepin
d3d9242462 Merge branch 'master' into alter-order-by
Conflicts:
	dbms/src/Parsers/ASTAlterQuery.h
	dbms/src/Parsers/ParserAlterQuery.cpp
	dbms/src/Storages/AlterCommands.cpp
	dbms/src/Storages/AlterCommands.h
2018-11-26 16:01:48 +03:00
alexey-milovidov
c6bc4279ee
Merge pull request #3377 from s-mx/CLICKHOUSE-4032
Added support for column COMMENTs in table definition.
2018-11-23 16:43:58 +03:00
alexey-milovidov
2c2d75cceb
Don't allow exceptions without code (#3645)
* Don't allow exceptions without code #3633

* Don't allow exceptions without code #3633
2018-11-23 00:19:58 +03:00