thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-12 09:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,612 Commits 9,297 Branches 1,782 Tags 2.1 GiB
b5156a115d
Commit Graph

570 Commits

Author SHA1 Message Date
Alexey Milovidov
6571769d3b dbms: added setting 'select_sequential_consistency' [#METR-16779]. 2015-09-20 14:54:58 +03:00
Alexey Milovidov
3b5a3e7325 dbms: quorum insert: development [#METR-16779]. 2015-09-20 14:02:59 +03:00
Alexey Milovidov
c89b063288 dbms: fixed deadlock on shutdown [#METR-18098]. 2015-09-20 07:03:53 +03:00
Alexey Milovidov
75ea48970c dbms: BackgroundProcessingPool: attempt to fix an error [#METR-18098]. 2015-09-19 10:55:01 +03:00
Andrey Mironov
38ae453855 Merge 2015-09-18 15:40:09 +03:00
Alexey Milovidov
a53f7473d3 dbms: removed misleading error messages about canceled merges [#METR-18087]. 2015-09-18 09:39:39 +03:00
Alexey Milovidov
5884a7b536 dbms: doing synchronous merges non-aggressively [#METR-18006]. 2015-09-18 03:48:48 +03:00
Alexey Milovidov
10b86afd3c dbms: saving create time for log entries in ZK [#METR-18085]. 2015-09-18 00:30:43 +03:00
Alexey Milovidov
7dfc436c83 dbms: fixed error with renaming unexpected parts [#METR-18009]. 2015-09-16 22:25:49 +03:00
Andrey Mironov
7b149be2c6 Merge 2015-09-16 20:49:08 +03:00
Andrey Mironov
9716ef7b34 Merge 2015-09-16 18:27:30 +03:00
Andrey Mironov
5ffd4898e8 Merge 2015-09-16 17:33:58 +03:00
Andrey Mironov
b6449b00f0 dbms: fix read order with merge_tree_uniform_read_distribution to be consistent with old method [#METR-16457] [#METR-18009] 2015-09-16 16:14:45 +03:00
Alexey Milovidov
fa0e61086f dbms: removed bad code [#METR-17988]. 2015-09-16 08:09:58 +03:00
Alexey Milovidov
d51404633b dbms: fixed error [#METR-16457]. 2015-09-16 07:18:16 +03:00
Alexey Milovidov
94d6d70310 Revert "dbms: fix filter size mismatch with size of column [#METR-18009]" 
This reverts commit a8da5e498cd9744189c9600d062e82a6fd334609.
 2015-09-16 05:02:22 +03:00
Andrey Mironov
0922693bf0 dbms: fix filter size mismatch with size of column [#METR-18009] 2015-09-15 20:45:39 +03:00
Andrey Mironov
2318e27485 Merge 2015-09-14 23:03:54 +03:00
Andrey Mironov
739a3dae8b Merge 2015-09-11 18:11:41 +03:00
Alexey Milovidov
15a6ac31f4 dbms: quorum inserts: development [#METR-16779]. 2015-09-11 05:51:35 +03:00
Alexey Milovidov
d53f173478 dbms: quorum inserts: development [#METR-16779]. 2015-09-11 05:13:59 +03:00
Alexey Milovidov
3b6ef8b28c dbms: quorum inserts: development [#METR-16779]. 2015-09-11 00:32:33 +03:00
Alexey Milovidov
a26a43fcc0 dbms: quorum inserts: development [#METR-16779]. 2015-09-10 23:43:42 +03:00
Alexey Milovidov
ec2151e646 dbms: removing deduplicated parts immediately [#METR-17988]. 2015-09-09 22:03:46 +03:00
Alexey Milovidov
53967b5c85 Merge 2015-09-09 21:16:09 +03:00
Alexey Milovidov
aaa70348af dbms: quorum inserts: development [#METR-16779]. 2015-09-09 21:15:36 +03:00
Andrey Mironov
5caf4e401f dbms: style corrections and comments [#METR-16457] 2015-09-09 20:46:56 +03:00
Andrey Mironov
40026a8e7b Merge 2015-09-03 16:30:50 +03:00
Andrey Mironov
e8111d7e07 Merge 2015-09-03 15:07:46 +03:00
Andrey Mironov
5ca53c8b10 Merge 2015-09-03 12:17:25 +03:00
Alexey Milovidov
df90e447fb dbms: increased limit for max_suspicious_broken_parts [#METR-17811]. 2015-09-02 22:39:19 +03:00
Andrey Mironov
9cc9cb241f Merge 2015-09-02 20:11:47 +03:00
Andrey Mironov
6b642e8749 dbms: round subtask size up to multiple of max_block_size [#METR-16457] 2015-09-02 19:09:32 +03:00
Andrey Mironov
288f46936a Merge 2015-09-02 18:48:10 +03:00
Andrey Mironov
70ec50316e Merge 2015-09-02 18:32:17 +03:00
Andrey Mironov
959d66cfa4 dbms: use actual settings [#METR-16457] 2015-09-02 14:15:16 +03:00
Andrey Mironov
ef356f9267 Merge 2015-09-01 19:09:12 +03:00
Andrey Mironov
cbe8fb0b67 Merge 2015-09-01 17:15:07 +03:00
Andrey Mironov
b2fa52394b dbms: support final with new code [#METR-16457] 2015-09-01 15:24:38 +03:00
Andrey Mironov
bc5007fc36 Merge 2015-08-31 23:22:06 +03:00
Andrey Mironov
7b818fe243 dbms: somehow fix memory corruption [#METR-16457] 2015-08-31 22:14:45 +03:00
Andrey Mironov
77a0a22de6 dbms: existing_memory support for ReadBufferAIO.cpp 2015-08-31 19:49:09 +03:00
Andrey Mironov
84d24ae336 merge branch 'master' 2015-08-31 18:50:06 +03:00
Andrey Mironov
fbfaa83b1a Merge 2015-08-25 13:25:45 +03:00
Alexey Milovidov
276ca03bc2 dbms: fixed error [#METR-17745]. 2015-08-18 18:20:38 +03:00
Alexey Milovidov
f1655cc62f Merge 2015-08-18 00:09:36 +03:00
Alexey Milovidov
325d73ea39 dbms: addition to prev. revision [#METR-17704]. 2015-08-14 06:41:31 +03:00
Alexey Milovidov
f11f0271e3 dbms: addition to prev. revision [#METR-17704]. 2015-08-14 06:27:32 +03:00
Alexey Milovidov
cf4a0e85ef dbms: lowered memory usage for INSERT [#METR-17704]. 2015-08-14 05:45:40 +03:00
Alexey Milovidov
bc6598371c dbms: fixed comment [#METR-2944]. 2015-07-27 16:36:22 +03:00
Alexey Milovidov
38d6128150 dbms: added column sizes to system.columns table [#METR-17475]. 2015-07-26 14:34:41 +03:00
Andrey Mironov
9fea075cb0 Merge 2015-07-24 17:46:29 +03:00
Andrey Mironov
28d333adff Merge 2015-07-23 20:54:07 +03:00
Andrey Mironov
9a54c18a8d Merge 2015-07-23 16:37:09 +03:00
Andrey Mironov
defba956d9 Merge 2015-07-23 16:11:27 +03:00
Alexey Milovidov
c0e029bb1b dbms: renamed ColumnWithNameAndType to ColumnWithTypeAndName for clarification [#METR-2944]. 2015-07-17 04:27:35 +03:00
Alexey Milovidov
71f64f2d49 Merge 2015-07-17 00:32:51 +03:00
Alexey Milovidov
52847e6591 Merge 2015-07-17 00:03:53 +03:00
Alexey Milovidov
583dd33ed0 dbms: disabled moving to PREWHERE expressions with GLOBAL IN [#METR-17231]. 2015-07-15 08:07:00 +03:00
Alexey Milovidov
1f03f17a49 dbms: passing proper Context to subqueries analyzer in PREWHERE [#METR-17231]. 2015-07-15 07:50:48 +03:00
Andrey Mironov
a27057d4b9 Merge 2015-07-08 20:59:44 +03:00
Alexey Milovidov
af0070c16b Merge 2015-07-08 07:38:46 +03:00
Andrey Mironov
a5bfc70920 Merge 2015-07-07 18:30:10 +03:00
Andrey Mironov
85d2dbcd76 Merge 2015-06-29 13:49:24 +03:00
Alexey Milovidov
4ecc523ea5 dbms: fixed error with using comparison of Date or DateTime with constant string in index [#METR-2944]. 2015-06-25 00:24:06 +03:00
Andrey Mironov
54d5517757 Merge 2015-06-24 20:05:40 +03:00
Andrey Mironov
b18764404a Merge 2015-06-24 14:03:53 +03:00
Andrey Mironov
2ba22a4a8a dbms: ActiveDataPartSet::level no longer participates in ::contains and ::operator<. 2015-06-22 21:24:02 +03:00
Alexey Milovidov
7f0e6fd3c1 Merge 2015-06-11 03:35:36 +03:00
Andrey Mironov
c4d1887a6f dbms: correctly (I hope) determine PREWHERE dependencies for defaults [#METR-16589] 2015-06-10 17:49:38 +03:00
Alexey Milovidov
c94bd2fc09 dbms: removed useless code [#METR-16739]. 2015-06-08 23:22:02 +03:00
Andrey Mironov
432687925c dbms: prevent moving array join-ed columns to PREWHERE. No diagnostic for ExpressionAnalyzer yet though [#METR-16525] 2015-06-08 19:05:44 +03:00
Alexey Milovidov
f78e0925da Merge 2015-06-05 20:41:51 +03:00
Alexey Milovidov
58465191e8 dbms: fixed error: stuck with too much parts [#METR-16703]. 2015-06-05 20:34:57 +03:00
Andrey Mironov
0326ee5a2e Merge 2015-06-05 20:30:24 +03:00
Alexey Milovidov
c19193cf61 Merge 2015-06-02 23:22:53 +03:00
Alexey Milovidov
40f0a9c4d9 dbms: fixed error with false-broken parts [#METR-16545]. 2015-05-28 07:32:38 +03:00
Alexey Milovidov
0984363b9c dbms: removed passing DataTypeFactory everywhere [#METR-16545]. 2015-05-28 06:49:28 +03:00
Alexey Milovidov
c160b7e460 dbms: tiny modification [#METR-2944]. 2015-05-26 03:35:13 +03:00
Pavel Kartavyy
4dce7fb109 dbms: log number of threads in background pool 2015-05-18 17:09:05 +03:00
Alexey Arno
cd24f85cfe dbms: Server: Reduced the number of open files. [#METR-15090] 2015-04-22 16:37:30 +03:00
Alexey Milovidov
124a12095a dbms: added support for selecting stronger compression method [#METR-15386]. 2015-04-17 08:35:53 +03:00
Alexey Milovidov
114b3de689 dbms: cut dependencies [#METR-2944]. 2015-04-16 09:12:35 +03:00
Alexey Arno
43e47bf4d5 dbms: Server: Compute the size of the file subset we plan to read. [#METR-15090] 2015-04-14 13:33:00 +03:00
Alexey Arno
bd36fad435 dbms: Server: Code cleanups. [#METR-15090] 2015-04-13 18:33:58 +03:00
Alexey Arno
e27cb9cb75 Merge 2015-04-13 18:02:39 +03:00
Alexey Milovidov
cac503ff82 Merge 2015-04-12 07:39:20 +03:00
Alexey Arno
b5c1932b8c Merge 2015-04-10 20:51:39 +03:00
Alexey Arno
0c4d61becc Merge 2015-04-10 20:49:30 +03:00
Alexey Arno
c7ab47d84d dbms: Server: min_bytes_to_use_direct_io = 0 means no AIO; various cleanups. [#METR-15090] 2015-04-10 20:09:16 +03:00
Alexey Arno
5cd9ed0582 dbms: Server: Added support for the client-side parameter min_bytes_to_use_direct_io in OPTIMIZE. [#METR-15090] 2015-04-10 18:31:51 +03:00
Alexey Arno
1ef3ae9dc4 dbms: Server: feature development. [#METR-15090] 2015-04-09 16:34:16 +03:00
Alexey Milovidov
7d4bf16d06 dbms: fixed Block::insertDefault method for elements of nested data structures (it is used in AddedDefaultsBlockInputStream, InterpreterInsertQuery) [#METR-15896]. 2015-04-09 05:10:06 +03:00
Alexey Milovidov
543c4c92cb dbms: removed dead code; healing corrupted nested columns [#METR-15896]. 2015-04-09 03:37:08 +03:00
Alexey Arno
aabd7b8320 Merge 2015-04-09 00:59:23 +03:00
Alexey Arno
7aa5d023eb dbms: Server: feature development. [#METR-15090] 2015-04-08 19:48:47 +03:00
Andrey Mironov
2de6e4a51b Merge 2015-04-03 13:10:38 +03:00
Andrey Mironov
ebd953e1b6 Merge 2015-04-02 19:37:05 +03:00
Andrey Mironov
ea9f5f2488 return old-fashioned code for calculation of total_rows 2015-04-02 12:36:40 +03:00
Alexey Milovidov
376087dd00 dbms: addition to prev. revision [#METR-15804]. 2015-04-02 06:19:09 +03:00
Alexey Milovidov
f6600e38d4 Merge 2015-04-02 06:17:10 +03:00
Alexey Milovidov
edf7fdc58d dbms: fixed error [#METR-15804]. 2015-04-02 06:08:43 +03:00
Andrey Mironov
6dcee7e9a5 Merge 2015-04-01 14:45:01 +03:00
Andrey Mironov
4760f61f39 Merge 2015-04-01 14:45:01 +03:00
Alexey Arno
d377b188a7 dbms: Server: feature development. [#METR-15090] 2015-04-01 00:07:50 +03:00
Alexey Arno
f847b5d641 dbms: Server: feature development. [#METR-15090] 2015-03-31 15:23:22 +03:00
Alexey Arno
0250522cd2 dbms: Server: feature development. [#METR-15090] 2015-03-31 14:16:34 +03:00
Alexey Milovidov
06c35e0faa dbms: improvement [#METR-15484]. 2015-03-27 06:37:46 +03:00
Alexey Milovidov
cfc5b313cc dbms: fixed 'force_index_by_date' setting [#METR-15484]. 2015-03-27 06:06:06 +03:00
Andrey Mironov
8ef4f22e4c Merge 2015-03-19 18:28:08 +03:00
Alexey Milovidov
6107740fc6 dbms: tiny improvement [#METR-14848]. 2015-03-18 22:17:05 +03:00
Alexey Milovidov
291d9daabf Merge 2015-03-14 05:37:53 +03:00
Alexey Milovidov
5c69667f2a dbms: different compression methods on merge: preparation [#METR-15386]. 2015-03-14 05:36:39 +03:00
Alexey Milovidov
b828604a5f Merge 2015-03-14 00:31:23 +03:00
Andrey Mironov
17ff7a352b Merge 2015-02-16 20:06:45 +03:00
Alexey Milovidov
2d04fed3a3 dbms: improved performance of reading string column [#METR-2944]. 2015-02-15 15:38:21 +03:00
Alexey Milovidov
fa84f264aa dbms: more sane progress bar - it doesn't roll back when using ConcatBlockInputStream [#METR-2944]. 2015-02-15 09:08:31 +03:00
Alexey Milovidov
7d4ce4b505 dbms: added settings to fine tune reads from merge tree [#METR-2944]. 2015-02-15 05:31:48 +03:00
Alexey Milovidov
a9eb28c07d Using std::make_unique [#METR-2807]. 2015-02-11 00:10:58 +03:00
Alexey Milovidov
60df70053d dbms: fixed error [#METR-14902]. 2015-02-03 20:39:24 +03:00
Alexey Milovidov
22b9ecfdea dbms: fixed error with DROP COLUMN in replicated tables [#METR-14848]. 2015-02-01 06:49:36 +03:00
Alexey Milovidov
86e9e77eae Fixed errors in clang (part 5, final) [#METR-2807]. 2015-01-22 04:13:13 +03:00
Alexey Milovidov
27543ea7e5 Fixed errors in clang (part 2) [#METR-2807]. 2015-01-21 07:00:20 +03:00
Alexey Milovidov
1be4bd0663 Fixed errors in clang (part 1) [#METR-2807]. 2015-01-21 06:56:28 +03:00
Alexey Milovidov
70ee1bdaf6 dbms: trivial modification [#METR-2944]. 2014-12-25 03:18:16 +03:00
Alexey Milovidov
132847e64d dbms: fixed special case when renaming or removing parts [#METR-13918] [#METR-14470]. 2014-12-24 23:02:04 +03:00
Andrey Mironov
1713846472 dbms: fix merge blocker. [#METR-14032] 2014-12-19 17:18:56 +03:00
Andrey Mironov
7d713ea40b dbms: compress zookeeper checksum metadata. [#MTRSADMIN-879] 2014-12-17 21:38:22 +03:00
Andrey Mironov
3ebfd2fb7f dbms: pass proper context into Storage::read(). [#METR-14179] 
This reverts commit 34b3f738a67432b44f6f69238dd1529535984d1a.
 2014-12-17 17:19:07 +03:00
Andrey Mironov
338314c9c6 dbms: stop merges on ALTER. [#METR-14032] 2014-12-17 16:14:24 +03:00
Andrey Mironov
49e322a045 Revert "dbms: pass proper context into Storage::read(). [#METR-14179]" 
This reverts commit c0800b74a6fa338d29a65111599aa1fe71b67201.
 2014-12-16 19:22:57 +03:00
Andrey Mironov
fc9472ba47 dbms: pass proper context into Storage::read(). [#METR-14179] 2014-12-16 15:40:25 +03:00
Alexey Milovidov
5abe09e7ba dbms: style [#METR-2944]. 2014-12-14 08:27:39 +03:00
Alexey Milovidov
09076b30d5 Merge 2014-12-12 23:50:32 +03:00
Andrey Mironov
c21502e70f dbms: store checksums in binary format. [#MTRSADMIN-879] 2014-12-09 16:58:19 +03:00
Andrey Mironov
8533ebe8bd Merge 2014-12-04 18:51:36 +03:00
Alexey Milovidov
32f3c9c1da Merge 2014-11-30 06:23:36 +03:00
Andrey Mironov
f7cda10386 Merge 2014-11-26 13:28:13 +03:00
Alexey Milovidov
a03bc39fa2 Merge 2014-11-25 23:55:36 +03:00
Alexey Milovidov
3dba76210f Merge 2014-11-25 23:55:36 +03:00
Alexey Milovidov
25ddd55cad Merge 2014-11-25 23:55:34 +03:00
Alexey Milovidov
8b2b1a52d1 Revert "Revert "dbms: allow all requested columns to be missing [#METR-13020]"" 
This reverts commit a74051d1739fbf4de8da2118e2f05820a6bc10f0.
 2014-11-25 23:55:23 +03:00
Andrey Mironov
eefcb3e369 Revert "dbms: allow all requested columns to be missing [#METR-13020]" 
This reverts commit e09872e3621f24a9a839ce377e4a317dc2ca1788.
 2014-11-25 21:46:58 +03:00
Andrey Mironov
c28bb54ed4 Merge 2014-11-25 21:46:38 +03:00
Andrey Mironov
4c9af262fd Merge 2014-11-25 21:46:23 +03:00
Alexey Milovidov
53c1dd7e08 Merge 2014-11-25 21:13:52 +03:00
Alexey Milovidov
d7a1abbbdc Merge 2014-11-22 05:22:30 +03:00
Andrey Mironov
d0971956e0 dbms: add quantile[s]Deterministic, rename stdext:: to ext:: [#METR-13199] 2014-11-21 16:34:37 +03:00
Andrey Mironov
d4d3663cd4 Merge 2014-11-20 17:42:45 +03:00
Andrey Mironov
37746b8e96 Merge 2014-11-14 15:52:02 +03:00
Andrey Mironov
58473a3085 Merge 2014-11-14 14:03:26 +03:00
Andrey Mironov
5af02c6119 Revert "dbms: purported fix", no luck 
This reverts commit bf86346df8713ac76ed631f12eda4f13d3379057.
 2014-11-14 12:47:58 +03:00
Andrey Mironov
4a70c452a7 dbms: purported fix 2014-11-14 12:30:35 +03:00
Andrey Mironov
11f1482927 dbms: allow all requested columns to be missing [#METR-13020] 2014-11-13 20:49:24 +03:00
Andrey Mironov
50328d120a Merge 2014-11-12 13:42:04 +03:00
Andrey Mironov
731be3e7cf Merge 2014-11-12 13:37:47 +03:00
Alexey Milovidov
9a9036f217 dbms: added FREEZE PARTITION functionality [#METR-13441]. 2014-11-11 07:11:07 +03:00
Alexey Milovidov
16a1c1e6e8 Merge 2014-11-09 02:55:24 +03:00
Alexey Milovidov
3d359e2b82 Partially get rid of time2str.h [#METR-13554]. 2014-11-06 09:32:23 +03:00
Alexey Milovidov
2d5192c4a0 dbms: StorageBuffer: development [#METR-13297]. 2014-10-26 03:01:36 +03:00
Alexey Milovidov
0045133b0e dbms: prepared for fully-functional progress bar [#METR-2944]. 2014-10-25 22:33:52 +04:00
Andrey Mironov
2798a19944 Merge 2014-10-24 14:48:47 +04:00
Andrey Mironov
ec5aa734f9 dbms: cut coupling between dbms and dbms_functions. [#METR-12739] 2014-10-24 13:33:31 +04:00
Andrey Mironov
847b91614a dbms: deduce and check types during alter, alteration of defaulted columns. [#METR-12739] 2014-10-21 16:11:20 +04:00
Alexey Milovidov
172ac6715f dbms: tiny fix [#METR-2944]. 2014-10-18 01:44:56 +04:00
Andrey Mironov
8a8e5963c5 dbms: chaining support for defaulted columns when corresponding columns files are absent. [#METR-12739] 2014-10-17 16:26:53 +04:00
Alexey Milovidov
a097d24644 dbms: moved some code to separate file [#METR-13153]. 2014-10-17 05:05:51 +04:00
Andrey Mironov
1dfcaefc64 Merge 2014-10-16 20:55:23 +04:00
Alexey Milovidov
07ba420b85 dbms: addition to prev. revision; removed support to FETCH UNREPLICATED PARTITION [#METR-13153]. 2014-10-15 23:59:12 +04:00
Alexey Milovidov
25b474bd81 dbms: fixed subtle error [#METR-13153]. 2014-10-15 17:38:09 +04:00
Alexey Milovidov
3d7639e5f1 dbms: little better [#METR-13153]. 2014-10-15 05:22:06 +04:00
Alexey Milovidov
21383c5475 dbms: FETCH PARTITION: development [#METR-13153]. 2014-10-13 21:28:59 +04:00
Andrey Mironov
6f7997ce11 dbms: prohibit inserting materialized columns, support create as and similar queries. [#METR-12739] 2014-10-10 19:45:43 +04:00
Alexey Milovidov
54636994ef dbms: FETCH PARTITION: development [#METR-13153]. 2014-10-10 04:46:37 +04:00
Alexey Milovidov
90d8096a0e Merge 2014-10-03 21:57:01 +04:00
Alexey Milovidov
e84a0266e6 dbms: more consistent usage of override in Storages [#METR-12524]. 2014-10-03 21:55:36 +04:00
Andrey Mironov
220ce78326 dbms: support ALIAS in table declaration 2014-10-03 19:30:10 +04:00
Andrey Mironov
defc09ed40 Merge 2014-10-03 18:29:42 +04:00
Andrey Mironov
468b7af64e Merge 2014-10-03 14:19:34 +04:00
Alexey Milovidov
1da86169d6 dbms: more handy error message [#METR-2944]. 2014-10-03 03:31:18 +04:00
Andrey Mironov
9800d0d95f Merge 2014-10-02 22:34:49 +04:00
Andrey Mironov
192dde9b36 Merge 2014-10-01 20:47:36 +04:00
Andrey Mironov
5083090f8d Merge 2014-10-01 20:39:32 +04:00
Alexey Milovidov
d6a2cc33aa dbms: tiny modifications [#METR-12784]. 2014-10-01 04:10:35 +04:00
Alexey Milovidov
4b83a8d3b3 dbms: tiny modifications [#METR-12784]. 2014-10-01 00:26:10 +04:00
Andrey Mironov
8052020218 add draft version of DEFAULT, MATERIALIZED/ALIAS currently parsed but not taken into account. [#METR-12739] 2014-09-30 07:08:47 +04:00
Alexey Milovidov
995bc9a5dd dbms: investigation [#METR-12784]. 2014-09-30 00:26:46 +04:00
Andrey Mironov
d1d9037053 Merge 2014-09-24 18:46:23 +04:00
Andrey Mironov
c6048522d2 Merge 2014-09-23 21:24:39 +04:00
Andrey Mironov
9c5f8eadb3 Merge 2014-09-23 21:00:57 +04:00
Andrey Mironov
f9afc661d1 Merge 2014-09-23 15:36:02 +04:00
Andrey Mironov
bc1587a192 Merge 2014-09-23 15:36:02 +04:00
Andrey Mironov
0f0c10a62d move single condition from WHERE to PREWHERE, refactor. [#METR-11900] 2014-09-23 15:36:02 +04:00
Andrey Mironov
13870f5ba5 transform of non-good conditions, refactor. [#METR-11900] 2014-09-23 15:36:02 +04:00
Andrey Mironov
78aeb03095 Merge 2014-09-23 15:36:02 +04:00
Andrey Mironov
8579036446 refactor, fix comment meaning. [#METR-11900] 2014-09-23 15:36:02 +04:00
Andrey Mironov
86beda3111 Merge 2014-09-23 15:36:01 +04:00
Andrey Mironov
0fb1912d7c WHERE condition recognition. [#METR-11900] 2014-09-23 15:36:01 +04:00
Andrey Mironov
e954fa6d00 add elapsed and progress rows to system.merges. [#METR-12574] 
Fix data-race introduced due to misconception of atomic instructions on integers.
 2014-09-18 14:23:12 +04:00
Alexey Milovidov
f2c0ba3ba2 dbms: fixed error with merges [#METR-12767]. 2014-09-18 03:57:25 +04:00