515 Commits

Author	SHA1	Message	Date
Nikita Mikhaylov	a8d72d01c3	mvp fix	2020-04-11 00:29:54 +03:00
Alexander Tokmakov	033d7f9b32	Merge branch 'master' into database_atomic	2020-04-10 17:12:09 +03:00
Alexander Kazakov	497df3086f	Merge branch 'master' into timed_rwlock ... Change-Id: I620bfde2121ff013773b001d514b40b1e796a58b	2020-04-10 11:38:20 +03:00
Alexander Kazakov	26dd6140b2	Added new config settings to control timeouts ... * "lock_acquire_timeout" controls for how long a query will continue to acquire each lock on its argument tables * "lock_acquire_timeout_for_background_operations" is a per-table setting for storages of *MergeTree family	2020-04-09 21:10:27 +03:00
Alexander Tokmakov	140cd88c20	fixes	2020-04-09 02:59:39 +03:00
alexey-milovidov	c389fee7e7	Update StorageReplicatedMergeTree.cpp	2020-04-08 22:48:01 +03:00
Alexander Tokmakov	dd1590830b	Merge branch 'master' into database_atomic	2020-04-08 22:00:46 +03:00
alesapin	ded306f016	Fix adaptive granularity compatibility	2020-04-08 12:51:04 +03:00
alexey-milovidov	ead277b717	Update StorageReplicatedMergeTree.cpp	2020-04-07 20:23:26 +03:00
alesapin	27777c1d2b	Better comment	2020-04-07 18:55:23 +03:00
Alexander Tokmakov	4c48b7dd80	better rename	2020-04-07 18:31:33 +03:00
alesapin	82a87bc0d2	Fix replicated tables startup when updating from old version	2020-04-07 18:28:29 +03:00
Alexander Tokmakov	08bae4668d	Merge branch 'master' into database_atomic	2020-04-06 16:18:07 +03:00
alesapin	1cb072d58a	Merge branch 'master' into alter_rename_column	2020-04-06 11:40:27 +03:00
Ivan Lezhankin	06446b4f08	dbms/ → src/	2020-04-03 18:14:31 +03:00