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
2,520 Commits 9,144 Branches 1,778 Tags 2 GiB
68049a0162
Commit Graph

491 Commits

Author SHA1 Message Date
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