Commit Graph

367 Commits

Author SHA1 Message Date
Alexey Milovidov
b16ee538ab Merge branch 'master' into sorting-processors 2020-04-17 05:31:55 +03:00
alexey-milovidov
17e7d4d88a
Merge pull request #10307 from abyss7/arcadia-4
Changes for auto-sync with Arcadia
2020-04-17 05:08:34 +03:00
Ivan Lezhankin
e230632645 Changes required for auto-sync with Arcadia 2020-04-16 15:31:57 +03:00
Alexey Milovidov
cdeda4ab91 Fix usage of max_parser_depth setting; remove harmful default function arguments 2020-04-16 04:06:10 +03:00
Nikolai Kochetov
153f795ebe Merge branch 'master' into sorting-processors 2020-04-15 12:07:05 +03:00
Alexey Milovidov
8ad04d4fec Remove useless code 2020-04-15 00:05:45 +03:00
Nikolai Kochetov
01945bf5d9 Fix style 2020-04-14 16:27:33 +03:00
Nikolai Kochetov
40a0f53a42 Remove SharedBlockPtr from MergingSortedBlockInputStream. 2020-04-14 14:32:38 +03:00
Nikolai Kochetov
ada3d4e67c Remove StopCondition from MergingSortedBlockInputStream. 2020-04-14 14:26:03 +03:00
Nikolai Kochetov
e92827b954 Remove StopCondition from MergingSortedBlockInputStream. 2020-04-14 14:25:01 +03:00
Nikolai Kochetov
1de7191aa3 U[date test 2020-04-14 13:49:46 +03:00
Nikolai Kochetov
c0a8def386 Fix build. 2020-04-14 13:35:17 +03:00
Nikolai Kochetov
edb3f2f3fc Remove old code. 2020-04-14 13:23:16 +03:00
Nikolai Kochetov
eacc04fc5c Fix race after cancel of RemoteBlockInputStream. 2020-04-13 19:33:15 +03:00
Nikolai Kochetov
16137068b2 Move Graphite params to separate file. 2020-04-10 12:22:51 +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
Ivan Lezhankin
06446b4f08 dbms/ → src/ 2020-04-03 18:14:31 +03:00