Commit Graph

421 Commits

Author SHA1 Message Date
Michael Kolupaev
b48bc12739 Merge 2014-03-27 15:32:41 +04:00
Michael Kolupaev
db3c061396 Added checksums to data parts. Not writing them yet. [#METR-10202] 2014-03-27 15:29:40 +04:00
Michael Kolupaev
a202cb4eaf Merge 2014-03-25 18:06:40 +04:00
Michael Kolupaev
4c92b5f220 Fixed segfault when some of the nested columns are missing. [#METR-10564] 2014-03-24 20:10:14 +04:00
Michael Kolupaev
258b14b506 Fixed segfault with table functions. [#METR-10549] 2014-03-24 17:24:47 +04:00
Michael Kolupaev
7b6ce30656 Merge 2014-03-22 18:44:44 +04:00
Michael Kolupaev
7084f03ab9 Merge 2014-03-21 23:17:59 +04:00
Michael Kolupaev
750cb44f94 Merge 2014-03-21 17:42:14 +04:00
Michael Kolupaev
6df8500852 Fixed dropping tables. [#METR-10202] 2014-03-20 17:28:49 +04:00
Michael Kolupaev
c5da5fd5f0 Merge 2014-03-20 17:00:42 +04:00
Michael Kolupaev
059e0f7e11 Fixed build. [#METR-10202] 2014-03-20 15:01:56 +04:00
Michael Kolupaev
e10125a052 Using IStorage locks properly in most places. Got rid of StoragePtr and DatabaseDropper. Drops are now synchronous. [#METR-10202] 2014-03-20 14:59:45 +04:00
Michael Kolupaev
67c563a4d3 Added locks to IStorage. Some race conditions are fixed, some are introduced, along with some possible deadlocks. [#METR-10202] 2014-03-19 14:45:13 +04:00
Michael Kolupaev
0faca75b37 Merge 2014-03-17 22:27:43 +04:00
Michael Kolupaev
758b1414a7 Merge 2014-03-14 21:19:38 +04:00
Michael Kolupaev
ba9315d264 Merge 2014-03-14 21:03:52 +04:00
Michael Kolupaev
2c81592a9b Merge 2014-03-13 23:36:28 +04:00
Michael Kolupaev
5b67cc94ce Small style change. [#METR-10202] 2014-03-13 23:14:25 +04:00
Michael Kolupaev
2a766770fc Merge 2014-03-13 23:07:17 +04:00
Michael Kolupaev
00d9c28571 Merge 2014-03-13 21:44:00 +04:00
Michael Kolupaev
36a86a4fc9 Merge 2014-03-13 16:48:07 +04:00
Pavel Kartavyy
5df3318134 dbms: fixed possible race condition in alter [#METR-10242] 2014-03-12 18:44:17 +04:00
Alexey Milovidov
8c87b14c7f Fixed warnings on clang [#METR-2807]. 2014-03-10 08:17:17 +04:00
Michael Kolupaev
be8855dcd2 fixed build; not it segfaults :) [#METR-10202] 2014-03-09 22:16:52 +04:00
Michael Kolupaev
989a316244 Merge 2014-03-09 21:58:27 +04:00
Michael Kolupaev
58ea3b108b Merge 2014-03-09 21:36:01 +04:00
Michael Kolupaev
96fb6da011 Merge 2014-03-09 18:24:04 +04:00
Pavel Kartavyy
07ebdaa173 dbms: removed useless code [#METR-10242] 2014-03-06 11:15:59 +04:00
Pavel Kartavyy
6f5c19d4b4 dbms: fixed deadlock in alter modify [#METR-10242] 2014-03-05 22:20:55 +04:00
Pavel Kartavyy
0abe7f6435 dbms: added sync [#METR-10242] 2014-03-05 22:20:55 +04:00
Pavel Kartavyy
108342491f dbms: added reset of cache in alter modify [#METR-10242] 2014-03-05 22:20:55 +04:00
Pavel Kartavyy
ada47dcc44 dbms: bugfixes in alter [#METR-10242] 2014-03-05 22:20:55 +04:00
Pavel Kartavyy
68540416c6 dbms: added code to modify column type [#METR-10242] 2014-03-05 22:20:55 +04:00
Pavel Kartavyy
50fc514bf8 Merge 2014-03-05 22:20:55 +04:00
Alexey Milovidov
1fa6408cc2 dbms: fixed error [#METR-10255]. 2014-03-03 22:58:45 +04:00
Alexey Milovidov
78e9b847e0 dbms: style [#METR-10255]. 2014-03-01 00:19:00 +04:00
Alexey Milovidov
5c71627f44 dbms: fixed TableFunctionRemote [#METR-9750]. 2014-02-23 06:27:09 +04:00
Alexey Milovidov
8cf5eb001a dbms: TableFunctionRemote, StorageDistributed: improvements [#METR-9750]. 2014-02-23 02:42:36 +04:00
Alexey Milovidov
339b730c4f dbms: tiny modification [#METR-2944]. 2014-02-16 21:14:41 +00:00
Sergey Fedorov
79feefb6a7 storages: index on virtual columns fully supported [METR-9172] 2014-02-11 18:38:21 +00:00
Sergey Fedorov
45dccb01b7 storages: index on virtual columns, huge optimization in queries like select smth where _host = .. [METR-9750] 2014-02-11 17:10:48 +00:00
Michael Kolupaev
92d8bdda28 Merge 2014-02-11 13:30:42 +00:00
Michael Kolupaev
83b3ecb1c2 clickhouse: fixed bug with PREWHERE. [#METR-9835] 2014-02-10 10:49:56 +00:00
Michael Kolupaev
5fd53300a9 clickhouse: fixed progress indication and limits checks with PREWHERE. [#METR-9838] 2014-02-10 09:15:38 +00:00
Alexey Milovidov
b5923961ad dbms: allowed all rows to be removed while merging parts [#METR-9909]. 2014-02-09 22:07:01 +00:00
Sergey Fedorov
325cc47ca5 table functions: implementation of function remote, updates in cluster and storageDistributed [METR-9750] 2014-02-07 15:11:57 +00:00
Alexey Milovidov
16fd573314 dbms: fixed error with virtual columns [#METR-9172]. 2014-02-04 15:44:15 +00:00
Sergey Fedorov
1e220376cd storages: few more comments on virtual columns, couple of code style changes [METR-9172] 2014-01-27 13:52:01 +00:00
Sergey Fedorov
f8b5613b82 storages: Virtual columns for storage distributed + few style fixes [METR-9172] 2014-01-22 14:24:05 +00:00
Sergey Fedorov
14620b3347 Merge 2014-01-22 12:50:19 +00:00
Sergey Fedorov
9cc974568e Merge 2014-01-17 15:19:20 +00:00
Sergey Fedorov
da115c14f7 Merge 2014-01-16 14:52:13 +00:00
Michael Kolupaev
fd05f7ea53 clickhouse: fixed a leak of file descriptors and memory. [#METR-9664] 2014-01-15 16:12:48 +00:00
Michael Kolupaev
532945a535 dbms: refactored compressed read buffers. [#METR-9633] 2014-01-15 14:53:20 +00:00
Sergey Fedorov
91609727a8 Merge 2014-01-10 13:24:50 +00:00
Alexey Milovidov
fd414800d5 dbms: added ProfileEvents system [#METR-2944]. 2014-01-03 08:20:13 +00:00
Sergey Fedorov
1a5f04d3bf Merge 2013-12-26 13:55:19 +00:00
Alexey Milovidov
e9d69e51a8 Merge 2013-12-23 03:10:12 +00:00
Alexey Milovidov
febe35c0bf dbms: OPTIMIZE query is merging aggressive [#METR-9516]. 2013-12-16 03:51:30 +00:00
Sergey Fedorov
6fb0caf597 Merge 2013-12-13 16:20:06 +00:00
Sergey Fedorov
9ba96ea811 merge tree: sharedptr buf fixed, correct calculating directory size in bytes, a few more changes [METR-9279] [METR-9444] 2013-12-13 14:23:04 +00:00
Alexey Milovidov
0a40b9f24c dbms: fixed one of errors [#METR-9454]. 2013-12-12 22:55:47 +00:00
Sergey Fedorov
aa56701c8a merge tree: fixed incorrect usage of Singleton [METR-9279] [METR-9444] 2013-12-12 15:12:18 +00:00
Sergey Fedorov
4787aefff9 merge tree: update in CurrentlyMergingInfo. Now looking on available disk space before merge [METR-9279] [METR-9444] 2013-12-12 14:11:40 +00:00
Sergey Fedorov
ee1fff79f2 merge tree: fixed currently merging vulnerability, added singleton with total merging files size [METR-9279] [METR-9444] 2013-12-12 13:54:16 +00:00
Alexey Milovidov
c9fe09e8ab dbms: probably fixed error [#METR-9463]. 2013-12-12 00:50:54 +00:00
Alexey Milovidov
df90b0bbce dbms: investigating error [#METR-9463]. 2013-12-11 20:44:06 +00:00
Pavel Kartavyy
ec2e5ff860 dbms: create cluster when distributed tables are created[#METR-9350] 2013-12-10 17:06:57 +00:00
Alexey Milovidov
a5d93468eb dbms: tiny improvement [#METR-8582]. 2013-12-09 00:40:15 +00:00
Alexey Milovidov
9690a3003b Merge 2013-12-09 00:29:24 +00:00
Pavel Kartavyy
278f5a9246 dbms: added Cluster class [#METR-9350] 2013-12-07 16:51:29 +00:00
Michael Kolupaev
3a4b4303ca ClickHouse: fixed a tiny special case for PREWHERE. [#METR-9392] 2013-12-06 09:02:19 +00:00
Michael Kolupaev
54bbe1f361 ClickHouse: fixed toFixedString exception text. [#METR-9091] 2013-12-05 13:15:04 +00:00
Michael Kolupaev
857cebea6f ClickHouse: small fixes for PREWHERE. [#METR-9091] 2013-12-05 13:07:55 +00:00
Michael Kolupaev
c621ed95b9 ClickHouse: fixed occasional segfault with PREWHERE; added check for isCancelled() during reading with PREWHERE. [#METR-9091] 2013-12-05 12:41:47 +00:00
Michael Kolupaev
8cb3822e64 Merge 2013-12-04 10:14:35 +00:00
Sergey Fedorov
2bc11e4271 Merge 2013-12-03 14:40:20 +00:00
Michael Kolupaev
034df57321 ClickHouse: working PREWHERE section. [#METR-9091] 2013-12-02 12:15:39 +00:00
Michael Kolupaev
71d5ea9ec1 removed changes accidentally committed in previous revision. [#METR-9091] 2013-12-02 09:48:57 +00:00
Michael Kolupaev
4d85e7b1a4 Merge 2013-12-02 09:46:30 +00:00
Alexey Milovidov
4eb7ba0e60 dbms: more clear code [#METR-2944]. 2013-11-29 22:10:15 +00:00
Michael Kolupaev
596b2bc1d9 ClickHouse: Parsing and passing around PREWHERE condition. No actual filtering yet. [#METR-9091] 2013-11-28 13:16:46 +00:00
Pavel Kartavyy
de71157b10 StorageDistributed: development [#METR-9244] 2013-11-28 10:31:17 +00:00
Michael Kolupaev
75567adb51 Merge 2013-11-26 11:55:11 +00:00
Alexey Milovidov
e36408e473 dbms: better [#METR-9194]. 2013-11-18 17:17:45 +00:00
Alexey Milovidov
5dfa8e3234 Fixed incompatibility with c++11 [#CONV-2807]. 2013-11-16 15:57:00 +00:00
Sergey Fedorov
ac21314784 dbms: Couple of unimportant fixes (includes, code simplification) in View and Materialized View [#METR-9076] 2013-11-15 09:43:50 +00:00
Sergey Fedorov
13bd27c498 dbms: View and Materialized View fixes, logic updates, implementation [#METR-9076] 2013-11-13 14:39:48 +00:00
Pavel Kartavyy
06759d5f3e dbms: style fix 2013-11-13 09:47:12 +00:00
Alexey Milovidov
71ed66ff2c dbms: tiny improvement [#METR-2807]. 2013-11-11 05:35:58 +00:00
Sergey Fedorov
b6b40d4c4e dbms: View and Materialized View implementation [#METR-9076] 2013-11-08 17:43:03 +00:00
Sergey Fedorov
07bbedc07d dbms: added support for simple VIEW engine. [#METR-9076] 2013-10-30 13:52:02 +00:00
Michael Kolupaev
99041b3173 Merge 2013-10-25 12:15:12 +00:00
Alexey Milovidov
ac83b94b0b Merge 2013-10-22 19:11:03 +00:00
Alexey Milovidov
ee6ca65243 Merge 2013-10-22 18:39:14 +00:00
Michael Kolupaev
62244d9abf Merge 2013-10-03 13:06:27 +00:00
Michael Kolupaev
d195799419 Merge 2013-10-03 12:46:17 +00:00
Michael Kolupaev
6879f3ea96 Merge 2013-10-03 12:18:56 +00:00
Alexey Milovidov
c084250925 Merge 2013-09-30 19:54:25 +00:00
Alexey Milovidov
0629fb4fdd Merge 2013-09-30 01:29:19 +00:00
Alexey Milovidov
7729bab279 dbms: removed sync [#CONV-8822]. 2013-09-27 17:26:35 +00:00
Alexey Milovidov
7dca2f21b9 Merge 2013-09-26 19:16:43 +00:00
Pavel Kartavyy
1bf0490191 Merge 2013-09-23 12:01:19 +00:00
Alexey Milovidov
808cec6d53 Merge 2013-09-15 03:44:32 +00:00
Alexey Milovidov
717a3fc591 dbms: fixed MergingSortedBlockInputStreams when one of stream is empty [#CONV-2944]. 2013-09-15 03:14:29 +00:00
Alexey Milovidov
8fc69c2a8e dbms: more fsync [#CONV-2944]. 2013-09-15 01:40:29 +00:00
Alexey Milovidov
1acad2acb1 Merge 2013-09-15 01:10:16 +00:00
Alexey Milovidov
fd4f4a9a86 dbms: fixed error [#CONV-2944]. 2013-09-14 05:14:22 +00:00
Alexey Milovidov
97b923fd7b dbms: uncompressed cache: better [#CONV-8661]. 2013-09-08 07:30:52 +00:00
Alexey Milovidov
efae271ae0 dbms: added uncompressed cache (experimental) [#CONV-8661]. 2013-09-08 05:53:10 +00:00
Alexey Milovidov
d055d54380 dbms: added SHOW PROCESSLIST query and 'max_concurrent_queries' setting [#CONV-8665] [#CONV-8664]. 2013-09-03 20:21:28 +00:00
Alexey Milovidov
3f72d27c61 dbms: better diagnostics [#CONV-8595]. 2013-08-27 20:15:22 +00:00
Alexey Milovidov
55bc868f19 dbms: tiny modification [#CONV-2944]. 2013-08-24 08:26:25 +00:00
Alexey Milovidov
482bc803fd Merge 2013-08-24 08:01:19 +00:00
Alexey Milovidov
be67c3e3d6 Removed useless namespace [#CONV-2807]. 2013-08-11 03:40:14 +00:00
Alexey Milovidov
f3f6268ee5 dbms: users: development [#CONV-8458]. 2013-08-10 09:04:45 +00:00
Alexey Milovidov
c2fc882312 dbms: tiny improvements [#CONV-8383]. 2013-08-09 00:12:59 +00:00
Vyacheslav Alipov
b0e6c69c96 fixed merge of nested arrays (multiple write of offsets issue) [#CONV-7967] 2013-08-08 13:12:28 +00:00
Pavel Kartavyy
4c07a0bccb Merge 2013-08-08 09:50:15 +00:00
Vyacheslav Alipov
7b01659e44 fixed merge of nested arrays (escaped filename issue) [#CONV-7967] 2013-08-07 19:45:47 +00:00
Pavel Kartavyy
a5c799d7a3 Merge 2013-08-07 13:07:42 +00:00
Vyacheslav Alipov
2d88cfa642 Merge 2013-08-05 17:05:30 +00:00
Alexey Milovidov
e0bdd99128 dbms: removed useless method [#CONV-2944]. 2013-07-28 03:28:52 +00:00
Alexey Milovidov
d0bc18a815 Merge 2013-07-28 01:15:52 +00:00
Vyacheslav Alipov
ac42eb45a4 SELECT and table reads/writes may be wokring now [NOT TESTED] [#CONV-7967] 2013-07-16 14:55:01 +00:00
Vyacheslav Alipov
090aae8e7b propagated [de]serialization to storages and (in|out)put streams [#CONV-7967] 2013-07-12 13:35:05 +00:00
Alexey Milovidov
69bd0e2557 dbms: style fix [#CONV-2944]. 2013-06-29 18:04:38 +00:00
Alexey Milovidov
a5fc5c235e Merge 2013-06-25 12:19:10 +00:00
Alexey Milovidov
fe0dd1d0b2 dbms: improvement [#CONV-2944]. 2013-06-21 20:34:19 +00:00
Alexey Milovidov
e853c4b320 dbms: don't write .sql files for ChunkRef tables [#CONV-7889]. 2013-06-17 07:01:31 +00:00
Alexey Milovidov
b7f98d9f6a dbms: lowered memory consumption [#CONV-7885]. 2013-06-15 03:33:45 +00:00
Michael Kolupaev
f7aedd227d Merge 2013-06-03 13:17:17 +00:00
Michael Kolupaev
503ca18634 clickhouse: removed heuristic for FINAL [#CONV-7363]. 2013-05-20 15:48:38 +00:00
Michael Kolupaev
b89bbf8463 clickhouse: addition to previous commit [#CONV-6705]. 2013-05-15 13:47:09 +00:00
Michael Kolupaev
471f6b3a66 Merge 2013-05-15 12:32:40 +00:00
Alexey Milovidov
b6a3c6a5b7 Added support for FINAL for StorageDistributed [#CONV-7040]. 2013-05-13 20:03:54 +00:00
Vyacheslav Alipov
755031efc6 performing sign rewrite from distributed table too [#CONV-6778] 2013-05-08 10:30:29 +00:00
Alexey Milovidov
01177e16fe Merge 2013-05-06 12:15:34 +00:00
Alexey Milovidov
2efd1bc6b0 dbms: removed few cyclic SharedPtr references [#CONV-2944]. 2013-05-05 18:02:05 +00:00
Alexey Milovidov
ce4161b4e0 dbms: development [#CONV-2944]. 2013-05-04 04:05:15 +00:00
Alexey Milovidov
85664affbf dbms: development of multi-queries [#CONV-2944]. 2013-05-03 10:20:53 +00:00
Michael Kolupaev
a34f86cc7b clickhouse: FINAL only returning positive rows [#CONV-7363]. 2013-04-26 13:20:42 +00:00
Michael Kolupaev
cd1183267c clickhouse: added CollapsingFinalBlockInputStream [#CONV-7363]. 2013-04-25 15:46:14 +00:00
Vyacheslav Alipov
6191923acc added option: sign_rewrite [#CONV-6778] 2013-04-24 13:34:04 +00:00
Michael Kolupaev
f938677d85 clickhouse: fixed indentation [#CONV-7363]. 2013-04-24 12:57:36 +00:00
Michael Kolupaev
fb180683c1 clickhouse: faster SELECT ... FINAL [#CONV-7363]. 2013-04-24 12:17:29 +00:00
Michael Kolupaev
5be6bd2408 Merge 2013-04-24 10:31:32 +00:00
Michael Kolupaev
d97d22919e Merge 2013-04-23 11:08:41 +00:00
Michael Kolupaev
961e3c9c87 clickhouse: fixed arrays in TinyLog [#CONV-2944]. 2013-03-07 17:40:24 +00:00
Michael Kolupaev
061f99e117 clickhouse: removed unused code [#CONV-6705]. 2013-02-26 13:48:47 +00:00
Michael Kolupaev
905c9051c8 clickhouse: slightly fixed comment [#CONV-6705]. 2013-02-26 13:11:55 +00:00
Michael Kolupaev
2a05c2829c clickhouse: StorageLog now stores all marks in one file [#CONV-6705]. 2013-02-26 13:06:01 +00:00
Michael Kolupaev
7393b0033b Merge 2013-02-25 10:23:31 +00:00
Michael Kolupaev
a4fe773cba Merge 2013-02-22 12:18:08 +00:00
Michael Kolupaev
bb9fccdd95 Merge 2013-02-20 10:29:26 +00:00
Michael Kolupaev
0184d23e1c Merge 2013-02-14 11:22:56 +00:00
Michael Kolupaev
4ed6c86648 clickhouse: Chunks: added logging [#CONV-6705]. 2013-02-11 12:28:43 +00:00
Michael Kolupaev
19707dc7ca Merge 2013-02-11 11:42:36 +00:00
Michael Kolupaev
f177dca440 Merge 2013-02-11 09:19:48 +00:00
Michael Kolupaev
7eaba87293 clickhouse: added comment [#CONV-6705]. 2013-02-11 08:55:51 +00:00
Michael Kolupaev
9aec07070a Merge 2013-02-08 17:06:29 +00:00
Michael Kolupaev
746d879e44 clickhouse: added ChunkRef storage [#CONV-6705]. 2013-02-07 13:40:59 +00:00
Michael Kolupaev
17ba747e56 fixed build [#CONV-6705]. 2013-02-07 13:07:13 +00:00
Michael Kolupaev
6f2c6559c8 clickhouse: added Chunks storage [#CONV-6705]. 2013-02-07 13:03:19 +00:00
Michael Kolupaev
b959d7e038 clickhouse: fixed a warning [#CONV-6561]. 2013-02-06 11:42:33 +00:00
Michael Kolupaev
e7c3e10814 clickhouse: slightly refactored storage creation [#CONV-6561]. 2013-02-06 11:26:35 +00:00
Michael Kolupaev
1ae4a374f9 clickhouse: added missing file [#CONV-6561]. 2013-02-05 13:18:43 +00:00
Michael Kolupaev
6dfc03c44f clickhouse: fixed not dropping database after dropping table during long select query [#CONV-6561]. 2013-02-05 13:03:35 +00:00
Michael Kolupaev
379b668e23 clickhouse: removing data lazily [#CONV-6561]. 2013-02-05 09:52:13 +00:00
Michael Kolupaev
166c644c72 clickhouse: probably fixed some crashes [#CONV-6561]. 2013-02-05 08:32:20 +00:00
Alexey Milovidov
7cc2871e30 dbms: allowed to send custom settings with query; sending current settings to remote servers for distributed query processing [#CONV-2944]. 2013-02-01 19:02:04 +00:00
Michael Kolupaev
c4b52f7232 clickhouse: fixed dropping tables [#CONV-6561]. 2013-01-23 17:43:19 +00:00
Michael Kolupaev
7a6c4e4545 clickhouse: fixed small bug [#CONV-6561]. 2013-01-23 17:40:09 +00:00
Michael Kolupaev
9b3b82c750 clickhouse: fixed segfault when a table is dropped while in use [#CONV-6561]. 2013-01-23 17:38:03 +00:00
Michael Kolupaev
572211a44a Merge 2013-01-23 11:16:32 +00:00
Alexey Milovidov
2076cc7d87 dbms: improved loading time [#CONV-2944]. 2013-01-17 20:21:03 +00:00
Alexey Milovidov
7b3f533ecd Using own Field class instead of boost::variant (experimental) [#CONV-2944]. 2013-01-05 20:03:19 +00:00
Alexey Milovidov
954ab221d6 Merge 2012-12-15 04:39:13 +00:00
Alexey Milovidov
17612f45ec Merge 2012-12-12 23:31:40 +00:00
Michael Kolupaev
81883201ec clickhouse: fixed [#6201]. 2012-12-12 15:45:08 +00:00
Michael Kolupaev
2350e09c51 clickhouse: fixed compiler warnings [#6201]. 2012-12-12 14:38:39 +00:00
Michael Kolupaev
42073f42ec clickhouse: added support for SAMPLE clause of SELECT query (works only in merge tree storage) [#6201]. 2012-12-12 14:25:55 +00:00
Michael Kolupaev
7f27cbbcb7 Merge 2012-12-10 10:23:10 +00:00
Michael Kolupaev
f75533a024 Merge 2012-12-07 10:05:36 +00:00
Michael Kolupaev
2b9f4ca2bf Merge 2012-12-06 13:07:29 +00:00
Michael Kolupaev
8f512c546a Merge 2012-12-06 11:10:05 +00:00
Michael Kolupaev
5555027deb Merge 2012-12-06 09:45:09 +00:00
Michael Kolupaev
905d9615c7 Merge 2012-12-05 12:55:30 +00:00
Michael Kolupaev
dba35f0364 Merge 2012-12-05 12:44:55 +00:00
Alexey Milovidov
f5586b456d Merge 2012-11-30 05:24:24 +00:00
Alexey Milovidov
7f4348ecdc dbms: added locks to storages Memory and Log [#CONV-2944]. 2012-11-30 04:28:13 +00:00
Alexey Milovidov
a0972784b1 Merge 2012-11-30 00:52:45 +00:00
Michael Kolupaev
03e00c0db0 Merge 2012-11-29 16:52:01 +00:00
Michael Kolupaev
8073045c7e Merge 2012-11-29 11:29:11 +00:00
Michael Kolupaev
982686f51c Merge 2012-11-29 10:50:17 +00:00
Michael Kolupaev
f55d19f71a Merge 2012-11-29 08:41:20 +00:00
Michael Kolupaev
912cf7c4eb Merge 2012-11-28 17:17:17 +00:00
Michael Kolupaev
e200c1c478 Merge 2012-11-28 08:52:15 +00:00
Michael Kolupaev
fba19e8eb6 clickhouse: fixed possible deadlock [#CONV-6108]. 2012-11-22 17:57:10 +00:00
Alexey Milovidov
d7d23ac81b dbms: StorageDistributed: added failover [#CONV-2944]. 2012-11-06 17:04:38 +00:00