16 Commits

Author	SHA1	Message	Date
Alexander Tokmakov	04d6b59ac0	Merge branch 'master' into database_atomic	2020-04-23 17:31:37 +03:00
Alexey Milovidov	07dcf40a6a	Simple server wide memory profiler	2020-04-22 20:52:21 +03:00
Alexander Tokmakov	fefbbd37df	Merge branch 'master' into database_atomic	2020-04-22 17:02:30 +03:00
Alexey Milovidov	0482e2e3ea	Implement suggestion from Sergey Veletsky	2020-04-22 01:40:18 +03:00
alexey-milovidov	8c2839d3c9	Merge pull request #10308 from ClickHouse/shared-context-lifetime ... Shared context lifetime	2020-04-21 00:12:45 +03:00
Alexander Tokmakov	b29bddac12	Merge branch 'master' into database_atomic	2020-04-20 14:09:09 +03:00
Alexey Milovidov	2987e70aab	Introduce "max_server_memory_usage" setting	2020-04-20 01:59:21 +03:00
Alexey Milovidov	ec6b176f3b	Rework total memory tracker #10293	2020-04-20 01:59:21 +03:00
Nikolai Kochetov	84faa9af26	Merge branch 'master' into shared-context-lifetime	2020-04-17 19:13:13 +03:00
Nikolai Kochetov	ce11662ab1	Fix build.	2020-04-17 15:58:52 +03:00
Nikolai Kochetov	d51a9c551b	Remove shared_ptr to SharedContext from Context.	2020-04-17 12:47:40 +03:00
Nikolai Kochetov	025093d354	Fix build.	2020-04-16 17:51:33 +03:00
Nikolai Kochetov	d6db27e372	Modify context.	2020-04-16 17:37:38 +03:00
Ivan Lezhankin	e230632645	Changes required for auto-sync with Arcadia	2020-04-16 15:31:57 +03:00
Alexander Tokmakov	9c67d2716e	Merge branch 'master' into database_atomic	2020-04-03 03:19:11 +03:00
Ivan	97f2a2213e	Move all folders inside /dbms one level up (#9974) ... * Move some code outside dbms/src folder * Fix paths	2020-04-02 02:51:21 +03:00