Commit Graph

448 Commits

Author SHA1 Message Date
Michael Kolupaev
2bd9733223 Merge 2014-07-30 16:10:38 +04:00
Michael Kolupaev
8a41d7985a Merge 2014-07-28 18:50:51 +04:00
Michael Kolupaev
2854ed49da Merge 2014-07-28 18:50:51 +04:00
Michael Kolupaev
5c9f92ac1e Merge 2014-07-28 14:36:15 +04:00
Michael Kolupaev
53a76dd348 Merge 2014-07-28 14:36:14 +04:00
Michael Kolupaev
c832fc00aa Merge 2014-07-25 20:32:02 +04:00
Michael Kolupaev
219e3ca3c6 Merge 2014-07-25 20:10:02 +04:00
Michael Kolupaev
13b9392241 Merge 2014-07-25 17:12:14 +04:00
Michael Kolupaev
85c722caf3 Merge 2014-07-25 17:12:14 +04:00
Michael Kolupaev
a6e8c35ba8 Merge 2014-07-25 11:49:02 +04:00
Alexey Milovidov
b897fdc27a dbms: updated comment [#METR-2944]. 2014-07-24 03:57:58 +04:00
Michael Kolupaev
7b44c88b73 Merge 2014-07-23 20:31:38 +04:00
Michael Kolupaev
90dc182f12 Merge 2014-07-23 19:24:51 +04:00
Michael Kolupaev
272a2a8d9b Merge 2014-07-23 16:44:23 +04:00
Michael Kolupaev
8b18acffec Merge 2014-07-23 15:02:22 +04:00
Michael Kolupaev
bfe126ab04 Merge 2014-07-23 13:50:29 +04:00
Michael Kolupaev
f3285dba79 Merge 2014-07-23 13:15:41 +04:00
Michael Kolupaev
256f15b099 BackgroundProcessingPool: fast shutdown. [#METR-2807] 2014-07-23 13:14:51 +04:00
Michael Kolupaev
16e5a92ed9 Merge 2014-07-22 17:49:52 +04:00
Michael Kolupaev
1be80d3410 part_checker: fixes. [#METR-11980] 2014-07-22 14:35:44 +04:00
Michael Kolupaev
cb7aa9dd66 part_checker: fixes. [#METR-11980] 2014-07-22 14:35:44 +04:00
Michael Kolupaev
c8c5fb9d5b missing files for previous commit. [#METR-11980] 2014-07-22 14:35:44 +04:00
Michael Kolupaev
c777975b0b dbms: parts_checker; not working yet. [#METR-11980] 2014-07-22 14:35:44 +04:00
Michael Kolupaev
5e10dbca8a Merge 2014-07-17 17:41:47 +04:00
Michael Kolupaev
e493438564 Merge 2014-07-17 14:44:17 +04:00
Michael Kolupaev
67b76568d3 Merge 2014-07-17 13:38:31 +04:00
Michael Kolupaev
12c6d16743 Merge 2014-07-16 13:32:15 +04:00
Michael Kolupaev
d668fd27d2 Merge 2014-07-15 19:51:27 +04:00
Michael Kolupaev
86fb1eee37 Merge 2014-07-15 18:37:49 +04:00
Michael Kolupaev
9ced1d909e Merge 2014-07-15 15:12:58 +04:00
Michael Kolupaev
01094ec78d Merge 2014-07-15 14:13:36 +04:00
Michael Kolupaev
007c0cedc1 fixed build and a bunch of other stuff. [#METR-11886] 2014-07-14 19:49:03 +04:00
Michael Kolupaev
33955ee7dd Merge 2014-07-14 18:07:47 +04:00
Michael Kolupaev
62de3bc73a Merge 2014-07-14 16:24:22 +04:00
Michael Kolupaev
8f394dd852 Merge 2014-07-14 15:45:34 +04:00
Michael Kolupaev
0ff3ede227 Merge 2014-07-14 13:12:50 +04:00
Michael Kolupaev
e26223d5c8 Merge 2014-07-11 16:47:45 +04:00
Michael Kolupaev
703b1d1c93 addition to previous commit. [#METR-11886] 2014-07-11 12:12:03 +04:00
Michael Kolupaev
c335519c9c Merge 2014-07-10 12:40:59 +04:00
Michael Kolupaev
a6fd9cd2bd Merge 2014-07-09 17:39:19 +04:00
Michael Kolupaev
0a67d151bd dbms: updated all usages of NamesAndTypesPair to new field names. [#METR-10202] 2014-07-09 15:54:26 +04:00
Alexey Milovidov
0041db77ab Tiny improvement [#METR-2807]. 2014-07-09 03:52:53 +04:00
Michael Kolupaev
c5c63b6111 fixed build. [#METR-10202] 2014-07-07 16:08:47 +04:00
Michael Kolupaev
639d1ad15f Merge 2014-07-07 15:39:06 +04:00
Michael Kolupaev
557a48f9e5 Merge 2014-07-07 14:23:24 +04:00
Michael Kolupaev
1983ac540b Merge 2014-07-03 12:51:11 +04:00
Michael Kolupaev
15d9e39aa6 Merge 2014-07-02 16:30:38 +04:00
Michael Kolupaev
601732a0dd Merge 2014-07-02 14:16:49 +04:00
Michael Kolupaev
faafb36596 Merge 2014-07-01 19:58:25 +04:00
Michael Kolupaev
201e63181c a bit more verbose exceptions when reading from merge tree. [#METR-10202] 2014-07-01 12:50:30 +04:00
Michael Kolupaev
310df87971 Merge 2014-06-30 14:02:25 +04:00
Michael Kolupaev
3be9f54264 small improvements. [#METR-10202] 2014-06-27 21:58:26 +04:00
Michael Kolupaev
429b5f63b2 Merge 2014-06-27 21:58:26 +04:00
Michael Kolupaev
739f93e781 small logging improvement. [#METR-10202] 2014-06-27 21:58:26 +04:00
Michael Kolupaev
4baf5626cd small logging improvements. [#METR-10202] 2014-06-27 21:58:26 +04:00
Alexey Milovidov
108a7850a5 dbms: improved performance on short queries [#METR-11571]. 2014-06-26 04:58:14 +04:00
Alexey Milovidov
f16a9beb61 dbms: removed sign_rewrite (obsolete, unused); tiny modifications [#METR-11370]. 2014-06-12 23:23:06 +04:00
Pavel Kartavyy
7b62758dcf dbms: fix to compability with new zkutil 2014-06-11 21:29:04 +04:00
Alexey Milovidov
16f092d87b dbms: development [#METR-10894]. 2014-06-05 23:52:13 +04:00
Sergey Fedorov
4fe8f37e03 Merge 2014-05-28 19:00:08 +04:00
Michael Kolupaev
3aad8dad8f Merge 2014-05-27 16:08:40 +04:00
Michael Kolupaev
cf2843d22c Merge 2014-05-27 14:03:13 +04:00
Michael Kolupaev
d51f9cae03 Merge 2014-05-27 12:43:01 +04:00
Michael Kolupaev
c1b265d4ac Merge 2014-05-26 22:16:05 +04:00
Sergey Fedorov
8f306f4238 Merge 2014-05-26 20:13:46 +04:00
Michael Kolupaev
7abd68d5ed dbms: added ActiveDataPartSet, currently unused. [#METR-10202] 2014-05-26 14:41:40 +04:00
Michael Kolupaev
77589b0c6e Merge 2014-05-22 14:37:17 +04:00
Michael Kolupaev
df4c963bc1 Merge 2014-05-21 14:20:41 +04:00
Michael Kolupaev
06edb12dbe Merge 2014-05-16 19:55:57 +04:00
Michael Kolupaev
ed26098886 Merge 2014-05-14 21:51:43 +04:00
Michael Kolupaev
2765b93851 Merge 2014-05-13 14:16:33 +04:00
Michael Kolupaev
90e93b171d Merge 2014-05-13 14:10:26 +04:00
Alexey Milovidov
8198d86f5a dbms: fixed errors on clang [#METR-2807]. 2014-05-12 04:45:50 +04:00
Michael Kolupaev
e2e7a61c61 Merge 2014-05-08 11:30:00 +04:00
Michael Kolupaev
ea9e8964f0 Merge 2014-05-08 11:12:01 +04:00
Michael Kolupaev
0b7928f6a9 Merge 2014-05-07 17:58:20 +04:00
Sergey Fedorov
199738fee9 mergeTree: fixed bug with all_mark_ranges[i].end [METR-10931] 2014-04-25 18:56:32 +04:00
Michael Kolupaev
205b0bd908 Merge 2014-04-25 16:43:10 +04:00
Michael Kolupaev
94cae0b3ad dbms: not logging some useless info; added comment. [#METR-10202] 2014-04-25 12:46:40 +04:00
Sergey Fedorov
0fbd8a32be dbms: optimization of reading from files in merge tree [METR-10931] 2014-04-23 20:45:53 +04:00
Alexey Milovidov
aa3c0b6a8d dbms: tiny improvement [#METR-10931]. 2014-04-23 02:58:05 +04:00
Alexey Milovidov
b821e1420d Fixed style [#METR-10931]. 2014-04-23 02:52:00 +04:00
Alexey Milovidov
a3caebf31b dbms: tiny improvement [#METR-10931]. 2014-04-23 02:43:55 +04:00
Sergey Fedorov
c139a6d209 dbms: fixed bug in merge tree output stream: compression of min block now runs at the right moment [METR-10570] 2014-04-22 19:36:21 +04:00
Michael Kolupaev
88644b2377 Merge 2014-04-18 15:05:30 +04:00
Michael Kolupaev
2ff0b62529 Merge 2014-04-18 14:37:26 +04:00
Michael Kolupaev
d5215ae37e Better handling of old checksums files. [#METR-10202] 2014-04-18 13:55:25 +04:00
Michael Kolupaev
68049a0162 Merge 2014-04-18 13:55:25 +04:00
Michael Kolupaev
07d9ab9bbf Merge 2014-04-14 17:13:20 +04:00
Michael Kolupaev
3dc646c066 Merge 2014-04-14 17:08:26 +04:00
Michael Kolupaev
b9c4a3419a Merge 2014-04-14 14:19:38 +04:00
Michael Kolupaev
b2fa912b2c Merge 2014-04-11 20:56:49 +04:00
Michael Kolupaev
7ec176038c Merge 2014-04-11 17:05:20 +04:00
Michael Kolupaev
18a9a9e207 Merge 2014-04-10 16:31:03 +04:00
Michael Kolupaev
524f376b2d Merge 2014-04-09 20:32:40 +04:00
Michael Kolupaev
e3dfe90ffe Merge 2014-04-09 19:53:47 +04:00
Michael Kolupaev
f0b55713f5 Merge 2014-04-08 21:45:27 +04:00
Sergey Fedorov
ecc697cd2c Merge 2014-04-08 19:29:12 +04:00
Alexey Milovidov
63cff6a5a4 Improvement [#METR-2807]. 2014-04-08 11:58:53 +04:00
Alexey Milovidov
5ca21127c7 Improvement [#METR-2807]. 2014-04-08 11:31:51 +04:00
Michael Kolupaev
7d5429655a Merge 2014-04-07 23:10:14 +04:00
Pavel Kartavyy
6ad275725e dbms: add desciption of in [#METR-10498] 2014-04-07 20:29:25 +04:00
Pavel Kartavyy
bdeee5386b dbms: development [#METR-10498]
Signed-off-by: Pavel Kartavyy <kartavyy@yandex-team.ru>
2014-04-07 20:29:25 +04:00
Pavel Kartavyy
a737895eb4 build fix [#METR-10498] 2014-04-07 20:29:25 +04:00
Pavel Kartavyy
14168120f1 development [#METR-10498] 2014-04-07 20:29:25 +04:00
Pavel Kartavyy
2a408f2841 development [#METR-10498] 2014-04-07 20:29:25 +04:00
Michael Kolupaev
4e975b43ec Merge 2014-04-07 19:45:46 +04:00
Alexey Milovidov
8b3df69a46 dbms: removed useless variable [#METR-2944]. 2014-04-06 05:18:28 +04:00
Michael Kolupaev
4a45c7c089 Merge 2014-04-04 21:20:45 +04:00
Michael Kolupaev
954a97764c Merge 2014-04-04 17:27:47 +04:00
Michael Kolupaev
1b5b9a1f1e Merge 2014-04-04 16:47:57 +04:00
Michael Kolupaev
847128152e Merge 2014-04-04 14:37:33 +04:00
Michael Kolupaev
95fc39c559 Merge 2014-04-03 17:30:21 +04:00
Michael Kolupaev
50ba6ca8e1 Merge 2014-04-03 16:49:01 +04:00
Michael Kolupaev
b4d85c1676 Merge 2014-04-03 15:48:28 +04:00
Pavel Kartavyy
d50aaf9368 dbms: added removing of nested columns to merge tree [#METR-10550] 2014-04-03 15:46:32 +04:00
Michael Kolupaev
5a0aab3bb2 Merge 2014-04-03 12:47:59 +04:00
Michael Kolupaev
b92f1ff480 Merge 2014-04-02 17:45:39 +04:00
Michael Kolupaev
233557ec72 Merge 2014-04-02 14:40:23 +04:00
Michael Kolupaev
997875d7d1 Merge 2014-04-02 14:10:37 +04:00
Michael Kolupaev
8fc53a7020 Merge 2014-04-02 11:59:43 +04:00
Sergey Fedorov
a138e8efdf dbms: insignificant fix in checking if block is ready for compression [METR-10570] 2014-03-28 20:01:36 +04:00
Sergey Fedorov
6395e841f9 Merge 2014-03-28 18:36:24 +04:00
Michael Kolupaev
634c33c766 Merge 2014-03-27 21:49:08 +04:00
Michael Kolupaev
a8f4ed6278 Merge 2014-03-27 21:30:04 +04:00
Michael Kolupaev
6a3043e749 Deduplicated code for merge tree writing; previous commit is useless. [#METR-10202] 2014-03-27 16:32:37 +04:00
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
7b6ce30656 Merge 2014-03-22 18:44:44 +04:00
Michael Kolupaev
c5da5fd5f0 Merge 2014-03-20 17:00:42 +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
Michael Kolupaev
989a316244 Merge 2014-03-09 21:58:27 +04:00
Michael Kolupaev
58ea3b108b Merge 2014-03-09 21:36:01 +04:00
Pavel Kartavyy
0abe7f6435 dbms: added sync [#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
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
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
Alexey Milovidov
e9d69e51a8 Merge 2013-12-23 03:10:12 +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
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
Michael Kolupaev
3a4b4303ca ClickHouse: fixed a tiny special case for PREWHERE. [#METR-9392] 2013-12-06 09:02:19 +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
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
Michael Kolupaev
75567adb51 Merge 2013-11-26 11:55:11 +00:00
Alexey Milovidov
71ed66ff2c dbms: tiny improvement [#METR-2807]. 2013-11-11 05:35:58 +00:00
Michael Kolupaev
99041b3173 Merge 2013-10-25 12:15:12 +00:00
Michael Kolupaev
62244d9abf Merge 2013-10-03 13:06:27 +00:00
Michael Kolupaev
6879f3ea96 Merge 2013-10-03 12:18:56 +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
Alexey Milovidov
717a3fc591 dbms: fixed MergingSortedBlockInputStreams when one of stream is empty [#CONV-2944]. 2013-09-15 03:14:29 +00:00
Alexey Milovidov
1acad2acb1 Merge 2013-09-15 01:10:16 +00:00
Alexey Milovidov
efae271ae0 dbms: added uncompressed cache (experimental) [#CONV-8661]. 2013-09-08 05:53:10 +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
Vyacheslav Alipov
b0e6c69c96 fixed merge of nested arrays (multiple write of offsets issue) [#CONV-7967] 2013-08-08 13:12:28 +00:00
Vyacheslav Alipov
7b01659e44 fixed merge of nested arrays (escaped filename issue) [#CONV-7967] 2013-08-07 19:45:47 +00:00
Vyacheslav Alipov
2d88cfa642 Merge 2013-08-05 17:05:30 +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
Michael Kolupaev
f7aedd227d Merge 2013-06-03 13:17:17 +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
f938677d85 clickhouse: fixed indentation [#CONV-7363]. 2013-04-24 12:57:36 +00:00
Michael Kolupaev
5be6bd2408 Merge 2013-04-24 10:31:32 +00:00