Commit Graph

77 Commits

Author SHA1 Message Date
Alexey Milovidov
f4815364f6 Merging [#METR-19266]. 2016-12-10 08:03:12 +03:00
Alexey Milovidov
e97ecb6cf7 Merge branch 'master' into METR-19266
Conflicts:
	dbms/CMakeLists.txt
	dbms/include/DB/Functions/FunctionsArray.h
	dbms/include/DB/Functions/FunctionsString.h
	dbms/include/DB/Parsers/ExpressionListParsers.h
	dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
	dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
	dbms/src/Core/ErrorCodes.cpp
	dbms/src/Parsers/ASTFunction.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
	dbms/src/Storages/MergeTree/MergeTreeReader.cpp
	dbms/src/Storages/StorageLog.cpp
2016-12-10 07:51:36 +03:00
Alexey Milovidov
514715589b Preparation [#METR-23747]. 2016-12-08 05:49:04 +03:00
Alexey Arno
924402f33e dbms: Server: merged from master [#METR-19266] 2016-10-19 18:00:56 +03:00
Yuri Dyachenko
94a2186dde rename ext::share_ptr_helper -> ext::shared_ptr_helper 2016-08-30 22:27:15 +03:00
Yuri Dyachenko
e5825f790f use std::enable_shared_from_this for IStorage 2016-08-29 16:28:34 +03:00
Alexey Arno
cd0541134a dbms: post-testing fixes [#METR-19266] 2016-08-24 03:39:38 +03:00
Alexey Arno
e2b6e10ec1 dbms: Various fixes + more comments [#METR-19266] 2016-08-10 22:12:29 +03:00
Alexey Arno
fa9829ad85 dbms: removed unused code [#METR-19266] 2016-07-13 19:49:06 +03:00
Alexey Arno
69948c5865 dbms: added support for null values in StorageLog + fixed long-standing bug in StorageLog (if we called the ClickHouseClient with max_threads=1, SELECT threw an exception if a table was empty) [#METR-19266] 2016-07-13 19:41:19 +03:00
Alexey Arno
6d753f05e6 dbms: adding support for nulls in the Log engine [#METR-19266] 2016-07-12 21:08:16 +03:00
Alexey Milovidov
4c7eb03b63 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 13:35:44 +03:00
Alexey Milovidov
13c7d0983a dbms: cutting dependency [#METR-2944].. 2016-01-12 00:46:36 +03:00
Alexey Milovidov
a26a43fcc0 dbms: quorum inserts: development [#METR-16779]. 2015-09-10 23:43:42 +03:00
Alexey Milovidov
469b409ba0 dbms: added storage StripeLog (incomplete) [#METR-17716]. 2015-08-16 10:01:41 +03:00
Alexey Milovidov
6927823716 dbms: little better [#METR-2944]. 2015-01-25 08:07:51 +03:00
Alexey Milovidov
1685b293f7 dbms: tiny improvements [#METR-2944]. 2015-01-18 11:25:56 +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
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
Andrey Mironov
731be3e7cf Merge 2014-11-12 13:37:47 +03:00
Andrey Mironov
ec5aa734f9 dbms: cut coupling between dbms and dbms_functions. [#METR-12739] 2014-10-24 13:33:31 +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
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
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
Pavel Kartavyy
8e0a8a4d74 dbms: StorageChunks - added support for check query [#METR-11709] 2014-08-05 14:53:26 +04:00
Pavel Kartavyy
b34c8e47ab dbms.StorageLog: added support for checkData query [#METR-11709] 2014-08-05 14:53:26 +04:00
Michael Kolupaev
2c8e5cd239 Passing new db name to IStorage::rename. [#METR-12038] 2014-07-28 18:50:51 +04:00
Alexey Milovidov
a3caebf31b dbms: tiny improvement [#METR-10931]. 2014-04-23 02:43:55 +04:00
Sergey Fedorov
6395e841f9 Merge 2014-03-28 18:36:24 +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
Sergey Fedorov
79feefb6a7 storages: index on virtual columns fully supported [METR-9172] 2014-02-11 18:38:21 +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
9cc974568e Merge 2014-01-17 15:19:20 +00:00
Alexey Milovidov
0a40b9f24c dbms: fixed one of errors [#METR-9454]. 2013-12-12 22:55:47 +00:00
Alexey Milovidov
7dca2f21b9 Merge 2013-09-26 19:16:43 +00:00
Alexey Milovidov
8fc69c2a8e dbms: more fsync [#CONV-2944]. 2013-09-15 01:40:29 +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
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
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
7eaba87293 clickhouse: added comment [#CONV-6705]. 2013-02-11 08:55:51 +00:00
Michael Kolupaev
6f2c6559c8 clickhouse: added Chunks storage [#CONV-6705]. 2013-02-07 13:03:19 +00:00
Michael Kolupaev
e7c3e10814 clickhouse: slightly refactored storage creation [#CONV-6561]. 2013-02-06 11:26:35 +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
Alexey Milovidov
7f4348ecdc dbms: added locks to storages Memory and Log [#CONV-2944]. 2012-11-30 04:28:13 +00:00