thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-20 06:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,023 Commits 9,144 Branches 1,778 Tags 2 GiB
aa6e8f1fff
Commit Graph

877 Commits

Author SHA1 Message Date
Alexey Milovidov
fb2caea60b dbms: tiny modification [#METR-2944]. 2014-05-22 22:58:07 +04:00
Michael Kolupaev
77589b0c6e Merge 2014-05-22 14:37:17 +04:00
Michael Kolupaev
c70e26bc70 Small improvement for previous commit. [#METR-11193] 2014-05-21 14:37:53 +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
4e2f2eca05 dbms: small fix. [#METR-2807] 2014-05-14 18:20:34 +04:00
Michael Kolupaev
728bdf4928 Merge 2014-05-13 15:24:16 +04:00
Michael Kolupaev
f17b46548c fixed build. [#METR-10202] 2014-05-13 14:34:45 +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
19d6a632b6 Fixed build [#METR-2807]. 2014-05-08 22:34:43 +04:00
Michael Kolupaev
be5a9cf820 Merge 2014-05-08 17:27:18 +04:00
Michael Kolupaev
f93db5572e dbms: added a check to active_parts.py. [#METR-10202] 2014-05-08 16:35:46 +04:00
Michael Kolupaev
6232f3e9b4 Merge 2014-05-08 12:03:03 +04:00
Michael Kolupaev
ea9e8964f0 Merge 2014-05-08 11:12:01 +04:00
Michael Kolupaev
cbf3719981 dbms: small improvement. [#METR-11044] 2014-05-08 10:24:48 +04:00
Michael Kolupaev
5a5cfa31f1 Merge 2014-05-07 18:12:15 +04:00
Michael Kolupaev
0b7928f6a9 Merge 2014-05-07 17:58:20 +04:00
Michael Kolupaev
df07fa2674 Merge 2014-05-07 17:56:01 +04:00
Alexey Milovidov
0abc554493 dbms: tracking amount of memory usage per query [#METR-11015]. 2014-05-04 02:57:43 +04:00
Alexey Milovidov
fc8aa282c0 dbms: lowered default block size; introduced default insert block size [#METR-11014].. 2014-04-30 00:22:57 +04:00
Alexey Milovidov
897752de16 dbms: unified hash tables: development [#METR-2944]. 2014-04-29 04:28:18 +04:00
Alexey Milovidov
38f7c7834e dbms: unified hash tables: development [#METR-2944]. 2014-04-28 07:29:32 +04:00
Alexey Milovidov
4bf42ea6e6 dbms: unified hash tables: development [#METR-2944]. 2014-04-28 06:47:56 +04:00
Alexey Milovidov
8232983714 dbms: unified hash tables: development [#METR-2944]. 2014-04-28 05:48:24 +04:00
Michael Kolupaev
94cae0b3ad dbms: not logging some useless info; added comment. [#METR-10202] 2014-04-25 12:46:40 +04:00
Alexey Milovidov
3b883d6b43 dbms: doc: development [#METR-10719]. 2014-04-24 22:49:07 +04:00
Michael Kolupaev
571a446aaf dbms: fixed active_parts.py. [#METR-10202] 2014-04-24 14:21:23 +04:00
Michael Kolupaev
8bd16d3361 Merge 2014-04-24 14:20:02 +04:00
Alexey Milovidov
a3caebf31b dbms: tiny improvement [#METR-10931]. 2014-04-23 02:43:55 +04:00
Michael Kolupaev
dba95b4de5 Merge 2014-04-22 15:20:02 +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
30db4e41ec Merge 2014-04-18 14:05:38 +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
Sergey Fedorov
e7756b8acc dbms: fixed bug on droping database with materialized view [METR-10848] 2014-04-15 18:00:33 +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
ee6a647245 Merge 2014-04-14 14:56:06 +04:00
Michael Kolupaev
b9c4a3419a Merge 2014-04-14 14:19:38 +04:00
Michael Kolupaev
f362d03611 Merge 2014-04-14 14:19:38 +04:00
Alexey Milovidov
fedcc0081a dbms: better [#METR-10841]. 2014-04-13 13:46:36 +04:00
Alexey Milovidov
b5c63dade9 Merge 2014-04-12 20:11:06 +04:00
Michael Kolupaev
563e0bf025 Merge 2014-04-11 22:04:31 +04:00
Michael Kolupaev
815904f536 Merge 2014-04-11 21:23:22 +04:00
Michael Kolupaev
b2fa912b2c Merge 2014-04-11 20:56:49 +04:00
Michael Kolupaev
541ead96e5 Merge 2014-04-11 19:53:32 +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
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
Michael Kolupaev
b0edb3b470 Fixes. [#METR-10202] 2014-04-07 22:44:10 +04:00
Michael Kolupaev
afafcc85b4 Fixes. [#METR-10202] 2014-04-07 22:14:39 +04:00
Michael Kolupaev
28ff474916 Fixes. [#METR-10202] 2014-04-07 21:39:45 +04:00
Pavel Kartavyy
6ad275725e dbms: add desciption of in [#METR-10498] 2014-04-07 20:29:25 +04:00
Pavel Kartavyy
049db94426 dbms: development [#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
763f354b3d dbms: probably lowered latency of global distributed queries [#METR-10500]. 2014-04-07 04:00:23 +04:00
Alexey Milovidov
312feedecb dbms: removed virtual columns from StorageDistributed [#METR-9172]. 2014-04-07 01:59:27 +04:00
Alexey Milovidov
0fc10a40ae dbms: tiny modification [#METR-2944]. 2014-04-06 05:19:02 +04:00
Alexey Milovidov
cf5a86434d dbms: fixed error when uncompressed_cache or marks_cache is not set [#METR-2944]. 2014-04-05 23:54:00 +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
b00c303f7d Merge 2014-04-03 17:11:11 +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
6395e841f9 Merge 2014-03-28 18:36:24 +04:00
Alexey Milovidov
eba3126077 dbms: style [#METR-10071]. 2014-03-27 23:09:23 +04:00
Michael Kolupaev
634c33c766 Merge 2014-03-27 21:49:08 +04:00
Michael Kolupaev
347c8c9047 Merge 2014-03-27 21:42:19 +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
Sergey Fedorov
0898ccfeb4 dbms: fixed merging errors [METR-10071] 2014-03-27 16:06:45 +04:00
Sergey Fedorov
a4d4990860 dbms: fixed problem with sending empty tables, few more fixes [METR-10071] 2014-03-27 16:06:45 +04:00
Sergey Fedorov
6f85a12692 dbms: fixed variable names, temporary tables are now external tables, in distributed query external table now always will be send to remote servers [METR-10071] 2014-03-27 16:06:45 +04:00
Michael Kolupaev
b48bc12739 Merge 2014-03-27 15:32:41 +04:00
Michael Kolupaev
2b7cdfd950 Merge 2014-03-27 15:30:54 +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
08f4af22e1 Merge 2014-03-24 17:59:04 +04:00
Michael Kolupaev
7b6ce30656 Merge 2014-03-22 18:44:44 +04:00
Michael Kolupaev
36b152f2b1 Added interserver IO host and port to context. [#METR-10202] 2014-03-21 23:49:27 +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
4d201fa0e5 Merge 2014-03-20 21:34:40 +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
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
Sergey Fedorov
730079e99d dbms: fixed bug with incorrect to_stage calculation in storage distributed [METR-10499] 2014-03-19 16:49:40 +04:00
Michael Kolupaev
4f46874933 added a couple of comments. [#METR-10202] 2014-03-19 15:44:41 +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
Alexey Milovidov
ce98defebe dbms: fixed error [#METR-10489]. 2014-03-18 21:20:44 +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
d5e957818b Merge 2014-03-14 11:05:43 +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
a75070d9c6 Addition to prev. revision [#METR-2944]. 2014-03-10 16:43:22 +04:00
Alexey Milovidov
8c87b14c7f Fixed warnings on clang [#METR-2807]. 2014-03-10 08:17: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
5bc75d93b5 dbms: ignore missing files [#METR-10242] 2014-03-05 23:39:34 +04:00
Pavel Kartavyy
774206e517 Revert "dbms: ignore missed columns in alter [#METR-10242]" 
This reverts commit 9060ec63fb8d81741171213fa1689c7f202c7ea9.
 2014-03-05 23:32:34 +04:00
Pavel Kartavyy
becc2e21c7 dbms: ignore missed columns in alter [#METR-10242] 2014-03-05 23:06:32 +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
2c1629a9d2 dbms: added exception for nested and array types [#METR-10242] 2014-03-05 22:20:55 +04:00
Pavel Kartavyy
0b023ec06d dbms: added tab [#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
9c269c7b81 dbms: removed useless [#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
Pavel Kartavyy
259a5f88cb Merge 2014-03-05 22:20:55 +04:00
Alexey Milovidov
11001c52b4 dbms: fixed error [#METR-10257]. 2014-03-04 04:17:20 +04:00
Alexey Milovidov
c4b2c7804e dbms: probably better [#METR-10223]. 2014-03-04 00:22:39 +04:00
Alexey Milovidov
46cb5ea0a2 Merge 2014-03-02 00:37:04 +04:00
Alexey Milovidov
78e9b847e0 dbms: style [#METR-10255]. 2014-03-01 00:19:00 +04:00
Michael Kolupaev
89e91f3dc4 Merge 2014-02-28 14:32:07 +04:00
Alexey Milovidov
fee77d6c98 dbms: Fixed error with incorrect handling of weird case (column names with whitespaces) [#METR-10225]. 2014-02-26 23:50:04 +04:00
Sergey Fedorov
655e0d4934 virtual columns: fixed bug with Group by virtual column, bug when column appears in result more than once [METR-9172] 2014-02-26 14:59:56 +04:00
Alexey Milovidov
5c71627f44 dbms: fixed TableFunctionRemote [#METR-9750]. 2014-02-23 06:27:09 +04:00
Alexey Milovidov
05615da00a dbms: Fixed leak [#METR-9750]. Enabled warning, fixed potential errors. 2014-02-23 04:37:25 +04:00
Alexey Milovidov
8cf5eb001a dbms: TableFunctionRemote, StorageDistributed: improvements [#METR-9750]. 2014-02-23 02:42:36 +04:00
Alexey Milovidov
f5f95b7cd6 dbms: Cluster: improvement; TableFunctionRemote: allowed to omit port number [#METR-9750]. 2014-02-23 01:50:27 +04:00
Alexey Milovidov
63ff4c57b5 dbms: fixed garbage [#METR-9172]. 2014-02-21 00:05:06 +04:00
Alexey Milovidov
7fb97708f3 dbms: removing old_ parts before attempt to merge [#METR-10069]. 2014-02-14 19:38:13 +00:00
Michael Kolupaev
015fb32382 clickhouse: parsing multiple infix AND and OR into a function call with more than two arguments; fixed handling of variadic and and or in virtual columns and PKCondition. [#METR-9599] 2014-02-13 11:05:51 +00:00
Sergey Fedorov
b75fe2f6eb dbms: query Id is String valued now, show process list also shows query_id, query_id is stored in processlist, now query could be replaced [METR-8818] 2014-02-12 17:31:02 +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
5fa9d07b35 clickhouse: fixed tiny flaw in PKCondition that prevented prewhere_test.sh from finding the bug mentioned in task. [#METR-9835] 2014-02-10 12:44:51 +00:00
Michael Kolupaev
217b5cf013 clickhouse: better test for PKCondition. [#METR-9835] 2014-02-10 12:10:18 +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
b74904a4be storages: virtual column port in storag distributed now work properly [METR-9172] 2014-02-07 15:39:55 +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
Alexey Milovidov
3ba9a9ca4b dbms: fixed error [#METR-9664]. 2014-01-20 16:41:24 +00:00
Sergey Fedorov
9cc974568e Merge 2014-01-17 15:19:20 +00:00
Sergey Fedorov
dba74f16f2 storages: fixed two warnings, which cause a compilation error [METR-9172] 2014-01-16 15:25:54 +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
Sergey Fedorov
91609727a8 Merge 2014-01-10 13:24:50 +00:00
Alexey Milovidov
eba56181d2 dbms: Added comment [#METR-2944]. 2014-01-09 13:39:06 +00:00
Alexey Milovidov
9c4043de67 Removed 'tr1' [#METR-2807]. 2014-01-08 16:33:28 +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
Pavel Kartavyy
a97a959b6c dbms: fixed error messages 2013-12-23 09:29:42 +00:00
Pavel Kartavyy
60f69f8be0 dbms: fixed error messages in alter 2013-12-23 09:29:27 +00:00
Alexey Milovidov
2765113a08 dbms: removed old code [#METR-2944]. 2013-12-23 03:10:55 +00:00
Pavel Kartavyy
a0acabc46b dbms: alter Distributed table. bugfix [#METR-9493] 2013-12-18 11:19:37 +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
bda42aec99 Fixed build [#METR-2807]. 2013-12-13 00:05:20 +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
Sergey Fedorov
15989ee930 merge tree test: updates in logic, removed compilation warnings [METR-9279] 2013-12-12 11:39:52 +00:00
Alexey Milovidov
df90b0bbce dbms: investigating error [#METR-9463]. 2013-12-11 20:44:06 +00:00
Pavel Kartavyy
d930b49c75 dbms: can change load_balancing in runtime [#METR-9350] 2013-12-11 11:51:01 +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
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
Pavel Kartavyy
74309378d7 dbms: development [#METR-9268] 2013-12-05 17:39:33 +00:00
Pavel Kartavyy
c6aabe89e4 dbms: limited timeouts to be less than limits.max_execution_time [#METR-9268] 2013-12-05 17:24:05 +00:00
Michael Kolupaev
6135f27af0 ClickHouse: added a test for PREWHERE. [#METR-9091] 2013-12-04 10:17:43 +00:00
Sergey Fedorov
67745b8a7e Merge 2013-12-03 16:14:36 +00:00
Sergey Fedorov
544f935bcf Merge 2013-12-03 16:10:20 +00:00
Sergey Fedorov
10918b67cc Merge 2013-12-03 15:06:59 +00:00
Sergey Fedorov
2bc11e4271 Merge 2013-12-03 14:40:20 +00:00
Michael Kolupaev
4d85e7b1a4 Merge 2013-12-02 09:46:30 +00:00
Sergey Fedorov
6a100c0117 Merge 2013-11-29 16:15:12 +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
26f58e99d0 Merge 2013-11-28 10:31:21 +00:00
Pavel Kartavyy
de71157b10 StorageDistributed: development [#METR-9244] 2013-11-28 10:31:17 +00:00
Sergey Fedorov
831d6cfb4a Merge 2013-11-27 16:45:01 +00:00
Sergey Fedorov
5c95506548 Merge 2013-11-27 16:41:48 +00:00
Sergey Fedorov
5539ea6c6b Merge 2013-11-27 14:57:23 +00:00
Sergey Fedorov
1de8ddb8df dbms: Pushing to Views fixed workflow with constant columns [#METR-9076] 2013-11-20 16:02:45 +00:00
Alexey Milovidov
e36408e473 dbms: better [#METR-9194]. 2013-11-18 17:17:45 +00:00
Alexey Milovidov
037b52e848 Fixed warning [#METR-2807]. 2013-11-16 16:44:43 +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
9fbaa3f823 dbms: removed now-useless log message [#METR-2944]. 2013-11-11 03:38:40 +00:00
Sergey Fedorov
b6b40d4c4e dbms: View and Materialized View implementation [#METR-9076] 2013-11-08 17:43:03 +00:00
Michael Kolupaev
e38ee8343a dbms: fast seek in ReadBufferFromFile[Descriptor] and a speed test for it. [#METR-2807] 2013-11-08 12:27:44 +00:00
Alexey Milovidov
9437657b7b dbms: modified Limits, Quotas, Progress, ProcessList [#METR-8459], [#METR-8894]. 2013-11-03 05:32:42 +00:00
Sergey Fedorov
be738dc12b dbms: Erase extra includes in StorageView.cpp and extra variables in Parser [#METR-9076] 2013-10-30 14:04:27 +00:00
Sergey Fedorov
07bbedc07d dbms: added support for simple VIEW engine. [#METR-9076] 2013-10-30 13:52:02 +00:00
Michael Kolupaev
bcd3a116be ClickHouse: fixed FINAL behavior with deleted visits; added test for it. [#METR-9072] 2013-10-30 09:15:41 +00:00
Michael Kolupaev
732302c263 Merge 2013-10-30 08:50:58 +00:00
Alexey Milovidov
a38317e1f5 dbms: better exception messages [#METR-8224]. 2013-10-26 03:20:51 +00:00
Michael Kolupaev
99041b3173 Merge 2013-10-25 12:15:12 +00:00
Alexey Milovidov
b65bb6cbe2 dbms: StorageChunks: changed error to warning in log [#METR-2944]. 2013-10-22 19:11:33 +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
d195799419 Merge 2013-10-03 12:46:17 +00:00
Michael Kolupaev
6745803ef7 Merge 2013-10-03 12:13:16 +00:00
Michael Kolupaev
43fc9b09d8 Merge 2013-10-02 15:33:18 +00:00
Alexey Milovidov
4ebdcee47e dbms: addition to prev. revision [#CONV-8806]. 2013-10-01 20:39:26 +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
7dca2f21b9 Merge 2013-09-26 19:16:43 +00:00
Pavel Kartavyy
1bf0490191 Merge 2013-09-23 12:01:19 +00:00
Pavel Kartavyy
37ed6f55d4 dbms: fixed error with missed .mrk file [#CONV-2944] 2013-09-19 15:20:31 +00:00
Alexey Milovidov
808cec6d53 Merge 2013-09-15 03:44:32 +00:00
Alexey Milovidov
8fc69c2a8e dbms: more fsync [#CONV-2944]. 2013-09-15 01:40:29 +00:00
Alexey Milovidov
fd4f4a9a86 dbms: fixed error [#CONV-2944]. 2013-09-14 05:14:22 +00:00
Alexey Milovidov
a47faab727 dbms: style [#CONV-2807]. 2013-09-13 23:52:10 +00:00
Alexey Milovidov
2be066285a dbms: lowered memory usage for merge operations [#CONV-8705]. 2013-09-13 23:28:40 +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
0b2ef14d19 dbms: added test [#CONV-2944]. 2013-08-25 03:44:11 +00:00
Alexey Milovidov
760a1fbca3 dbms: StorageMemory: fixed perf [#CONV-8572]. 2013-08-22 16:14:44 +00:00
Pavel Kartavyy
18d1ee2eb2 Fixed incorrect working with nested tables in ALTER [#conv-8383] 2013-08-14 16:52:40 +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
Pavel Kartavyy
4c07a0bccb Merge 2013-08-08 09:50:15 +00:00
Pavel Kartavyy
a5c799d7a3 Merge 2013-08-07 13:07:42 +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
858b2805eb dbms: probably better [#CONV-2944]. 2013-06-30 17:12:34 +00:00
Alexey Milovidov
3fbd36fde9 dbms: improvement [#CONV-2944]. 2013-06-21 21:05:16 +00:00
Alexey Milovidov
fe0dd1d0b2 dbms: improvement [#CONV-2944]. 2013-06-21 20:34:19 +00:00
Michael Kolupaev
e8d77fe8ec Merge 2013-06-18 09:43:35 +00:00
Alexey Milovidov
170d408ba3 dbms: improvement to prev. revision [#CONV-7889]. 2013-06-17 07:57:58 +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
8fad2d42e2 dbms: StorageLog: fixed error in one of prev. revision [#CONV-2944]. 2013-06-17 05:28:15 +00:00
Alexey Milovidov
b2f02c372a dbms: style fix [#CONV-2944]. 2013-06-15 08:48:30 +00:00
Alexey Milovidov
91a062a575 Merge 2013-06-15 08:38:30 +00:00
Alexey Milovidov
16e5dc1f70 dbms: removed TODO [#CONV-7885]. 2013-06-15 04:08:53 +00:00
Alexey Milovidov
b7f98d9f6a dbms: lowered memory consumption [#CONV-7885]. 2013-06-15 03:33:45 +00:00
Michael Kolupaev
84050bc8bb Merge 2013-06-04 11:00:33 +00:00
Michael Kolupaev
f7aedd227d Merge 2013-06-03 13:17:17 +00:00
Michael Kolupaev
dd72f5b8b8 clickhouse: switched to ExpressionAnalyzer [#CONV-7444]. 2013-06-03 10:18:41 +00:00
Michael Kolupaev
503ca18634 clickhouse: removed heuristic for FINAL [#CONV-7363]. 2013-05-20 15:48:38 +00:00
Michael Kolupaev
8bc64303be clickhouse: addition to previous commit [#CONV-6705]. 2013-05-15 13:45:44 +00:00
Michael Kolupaev
c0b803d204 clickhouse: addition to previous commit [#CONV-6705]. 2013-05-15 13:33:19 +00:00
Michael Kolupaev
ea836bbdce clickhouse: addition to previous commit [#CONV-6705]. 2013-05-15 12:34:26 +00:00
Michael Kolupaev
471f6b3a66 Merge 2013-05-15 12:32:40 +00:00
Michael Kolupaev
5c386bb038 clickhouse: fixed sampling [#CONV-7363]. 2013-05-15 11:32:31 +00:00
Michael Kolupaev
e03e85184f clickhouse: fixed FINAL ans SAMPLE broken by some changes in Expression [#CONV-7363]. 2013-05-15 09:55:09 +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
d38fd54295 dbms: fixed cyclic references (leak) [#CONV-2944]. 2013-05-05 20:07:11 +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
Michael Kolupaev
e3999c23af clickhouse: code indentation [#CONV-2807]. 2013-04-29 11:34:06 +00:00
Michael Kolupaev
ffdeac3136 clickhouse: fixed FINAL with one data part [#CONV-7363]. 2013-04-29 11:20:10 +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
Michael Kolupaev
12e73e0692 clickhouse: fixed reading sign column with FINAL modifier [#CONV-7363]. 2013-04-25 11:37:20 +00:00
Vyacheslav Alipov
cff712858a Merge 2013-04-24 12:52:49 +00:00
Michael Kolupaev
fb180683c1 clickhouse: faster SELECT ... FINAL [#CONV-7363]. 2013-04-24 12:17:29 +00:00
Michael Kolupaev
a263b0b265 clickhouse: fixed FINAL [#CONV-7363]. 2013-04-24 11:39:12 +00:00
Michael Kolupaev
5be6bd2408 Merge 2013-04-24 10:31:32 +00:00
Michael Kolupaev
77ae92d8ab Merge 2013-04-23 11:35:09 +00:00
Michael Kolupaev
2c135ca1e2 clickhouse: slightly improved comment [#CONV-7363]. 2013-04-23 11:12:36 +00:00
Michael Kolupaev
d97d22919e Merge 2013-04-23 11:08:41 +00:00
Alexey Milovidov
2bf90fb924 Renamed file [#CONV-6992]. 2013-04-08 19:47:25 +00:00
Michael Kolupaev
21fa1370c7 clickhouse: rewound last change, it was slightly incorrect [#CONV-2807]. 2013-03-14 12:54:59 +00:00
Michael Kolupaev
ad0f1cfa3a Merge 2013-03-14 12:52:22 +00:00
Michael Kolupaev
b6404afed4 Merge 2013-03-14 12:38:15 +00:00
Michael Kolupaev
c4bbb1fe45 Merge 2013-03-14 12:11:23 +00:00
Michael Kolupaev
a163bfcd49 Merge 2013-03-14 11:43:43 +00:00
Michael Kolupaev
15f31802f6 clickhouse: fixed arrays in TinyLog [#CONV-2944]. 2013-03-07 17:44:32 +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
2a05c2829c clickhouse: StorageLog now stores all marks in one file [#CONV-6705]. 2013-02-26 13:06:01 +00:00
Michael Kolupaev
58d5f65e60 clickhouse: StorageLog: fixed build [#CONV-2944]. 2013-02-26 11:48:09 +00:00
Michael Kolupaev
276961cc60 clickhouse: StorageLog: fixed renaming and inserting [#CONV-2944]. 2013-02-26 11:47:15 +00:00
Michael Kolupaev
86eb06064a clickhouse: fixed renaming TinyLog tables with arrays again [#CONV-2944]. 2013-02-26 11:37:49 +00:00
Michael Kolupaev
550ff5fb8e clickhouse: fixed renaming TinyLog tables with arrays [#CONV-2944]. 2013-02-26 11:28:00 +00:00
Michael Kolupaev
0ddaa9048e clickhouse: fixed build [#CONV-2944]. 2013-02-25 10:51:52 +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
1eaec724a5 Merge 2013-02-21 09:38:25 +00:00
Michael Kolupaev
fa771f6573 clickhouse: slightly refactored storages [#CONV-6561]. 2013-02-21 09:11:18 +00:00
Alexey Milovidov
7d180f9e71 Merge 2013-02-20 23:25:28 +00:00
Michael Kolupaev
bb9fccdd95 Merge 2013-02-20 10:29:26 +00:00
Michael Kolupaev
38fbcfe065 Merge 2013-02-18 17:30:06 +00:00
Michael Kolupaev
fbd139a549 Merge 2013-02-18 13:10:59 +00:00
Michael Kolupaev
e05d3398c0 Merge 2013-02-14 12:51:52 +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
97287129aa clickhouse: Chunks: fixed [#CONV-6705]. 2013-02-11 11:59:21 +00:00
Michael Kolupaev
19707dc7ca Merge 2013-02-11 11:42:36 +00:00
Michael Kolupaev
f5cac625c6 Merge 2013-02-11 11:22:15 +00:00
Michael Kolupaev
65a18f7afa Merge 2013-02-11 10:11:59 +00:00
Michael Kolupaev
d1cb4373b3 Merge 2013-02-11 09:48:01 +00:00
Michael Kolupaev
dc15d81295 Merge 2013-02-11 09:40:37 +00:00
Michael Kolupaev
e73afea49d Merge 2013-02-11 09:32:49 +00:00
Michael Kolupaev
acbce5e549 Merge 2013-02-11 09:29:29 +00:00
Michael Kolupaev
ca0051f30a Merge 2013-02-11 09:22:52 +00:00
Michael Kolupaev
f177dca440 Merge 2013-02-11 09:19:48 +00:00
Michael Kolupaev
7aee5959e5 clickhouse: probably fixed undefined behavior in Chunks storage [#CONV-6705]. 2013-02-11 08:53:34 +00:00
Alexey Milovidov
a9dbf44e52 dbms: fixed error [#CONV-6705]. 2013-02-09 01:03:11 +00:00
Michael Kolupaev
4b26a26e8c clickhouse: fixed warnings [#CONV-6705]. 2013-02-08 17:09:14 +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
d24d0f7f78 clickhouse: fixed tests [#CONV-6561]. 2013-02-07 08:52:38 +00:00
Michael Kolupaev
e7c3e10814 clickhouse: slightly refactored storage creation [#CONV-6561]. 2013-02-06 11:26:35 +00:00
Michael Kolupaev
379b668e23 clickhouse: removing data lazily [#CONV-6561]. 2013-02-05 09:52:13 +00:00
Alexey Milovidov
66580580d4 dbms: addition to prev. revision [#CONV-2944]. 2013-02-01 20:26:42 +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
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
8b1342557c dbms: improved loading time [#CONV-2944]. 2013-01-17 19:56:01 +00:00
Alexey Milovidov
5b341830e9 Merge 2013-01-14 18:22:07 +00:00
Michael Kolupaev
190179d7ba dbms: fixed typo in comment [#CONV-2944]. 2013-01-09 10:19:24 +00:00
Alexey Milovidov
f800b5b769 dbms: using special array for Row and instead of std::vector<AggregateFunctionPlainPtrs> (experimental) [#CONV-2944]. 2013-01-07 00:57:43 +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
b312f42808 dbms: reverted previous modification [#CONV-2944]. 2012-12-16 00:23:41 +00:00
Alexey Milovidov
62a8ecc749 dbms: probably improved performance of inserting, merging and sorting [#CONV-2944]. 2012-12-15 23:10:14 +00:00
Alexey Milovidov
150e508652 dbms: fixed error in error message [#CONV-2944]. 2012-12-15 04:42:42 +00:00
Alexey Milovidov
4a06e09f79 dbms: tiny improvement [#CONV-2944]. 2012-12-15 02:11:37 +00:00
Alexey Milovidov
2c9ff38ab2 dbms: fixed error [#CONV-2944]. 2012-12-13 20:28:10 +00:00
Michael Kolupaev
c77e8e98ef clickhouse: improved integer sample size processing [#6201]. 2012-12-13 10:08:54 +00:00
Michael Kolupaev
60bf093973 clickhouse: added minor diagnostic output [#6201]. 2012-12-13 09:38:36 +00:00
Michael Kolupaev
93143369ce clickhouse: added support for non-UInt32 sampling columns [#6201]. 2012-12-13 09:32:08 +00:00
Michael Kolupaev
a5e5b3dd9f clickhouse: fixed SAMPLE by count [#6201]. 2012-12-12 16:39:32 +00:00
Michael Kolupaev
b9de3987f2 clickhouse: fixed [#6201]. 2012-12-12 16:26:18 +00:00
Michael Kolupaev
b5681acdb7 clickhouse: fixed [#6201]. 2012-12-12 16:11:27 +00:00
Michael Kolupaev
81883201ec clickhouse: fixed [#6201]. 2012-12-12 15:45:08 +00:00
Michael Kolupaev
3f2da2d2e3 clickhouse: fixed [#6201]. 2012-12-12 15:37:43 +00:00
Michael Kolupaev
8973044210 Merge 2012-12-12 15:23:26 +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
Alexey Milovidov
de13137958 dbms: changed signature of IDataType::serializeBinary [#CONV-2944]. 2012-12-11 20:31:39 +00:00
Michael Kolupaev
7f27cbbcb7 Merge 2012-12-10 10:23:10 +00:00
Alexey Milovidov
60ae1a07b1 dbms: fixed warning [#CONV-2944]. 2012-12-06 17:36:51 +00:00
Michael Kolupaev
2b9f4ca2bf Merge 2012-12-06 13:07:29 +00:00
Michael Kolupaev
35184afdc2 Merge 2012-12-06 12:51:15 +00:00
Michael Kolupaev
655b7e0300 Merge 2012-12-06 12:24:08 +00:00
Michael Kolupaev
8600340828 Merge 2012-12-06 11:48:41 +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
03c96075f9 Merge 2012-12-05 13:39:38 +00:00
Michael Kolupaev
5c9f35b2a3 Merge 2012-12-05 13:31:33 +00:00
Michael Kolupaev
dba35f0364 Merge 2012-12-05 12:44:55 +00:00
Michael Kolupaev
b6139c17bc Merge 2012-12-03 10:43:25 +00:00
Michael Kolupaev
01fa6de3bc Merge 2012-12-03 10:03:47 +00:00
Michael Kolupaev
02973d945b clickhouse: fixed compiler warning [#CONV-6108]. 2012-12-03 09:39:04 +00:00
Michael Kolupaev
2d8026c0b0 Merge 2012-12-03 08:52:58 +00:00
Michael Kolupaev
c54004b880 Merge 2012-11-30 08:33:36 +00:00
Alexey Milovidov
b167cc3711 dbms: tiny improvement [#CONV-2944]. 2012-11-30 05:40:28 +00:00
Alexey Milovidov
f339e0e401 dbms: addition to prev. revision [#CONV-2944]. 2012-11-30 05:30:17 +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
5aa8c9efc4 Merge 2012-11-30 02:01:02 +00:00
Alexey Milovidov
a09c023956 dbms: addition to prev. revision [#CONV-2944]. 2012-11-30 00:59:02 +00:00
Alexey Milovidov
a0972784b1 Merge 2012-11-30 00:52:45 +00:00
Michael Kolupaev
e49cd16868 Merge 2012-11-29 17:43:23 +00:00
Michael Kolupaev
9ad859149f Merge 2012-11-29 17:04:12 +00:00
Michael Kolupaev
e255b5e249 Merge 2012-11-29 16:39:29 +00:00
Michael Kolupaev
21ef4655ca Merge 2012-11-29 12:26:34 +00:00
Michael Kolupaev
c2ba1fc202 Merge 2012-11-29 12:24:08 +00:00
Michael Kolupaev
fa2066d350 Merge 2012-11-29 11:50:16 +00:00
Michael Kolupaev
906f1f0026 Merge 2012-11-29 11:48:27 +00:00
Michael Kolupaev
5306e4e1ff Merge 2012-11-29 11:32:29 +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