Commit Graph

229 Commits

Author SHA1 Message Date
Alexey Milovidov
2b4f3b5d34 Renamed method (less confusion) [#METR-2944]. 2017-01-02 23:12:12 +03:00
Alexey Milovidov
baf29f5c48 NULLs support: fixed totally wrong code [#METR-19266]. 2016-12-30 08:13:14 +03:00
Alexey Milovidov
442ff1d3b8 StorageBuffer: simplification; added metrics [#METR-23888]. 2016-12-20 02:55:13 +03:00
Alexey Milovidov
e2ed20999c Fixed build on clang [#METR-2944]. 2016-12-12 08:53:37 +03:00
Alexey Milovidov
e53e32130d Merging [#METR-19266]. 2016-12-10 07:58:40 +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
Vitaliy Lyudvichenko
202ba912ce Vertical merging algorithm for MergeTree engines. [#METR-23305] 2016-11-29 22:41:31 +03:00
alexey-milovidov
8c2e228856 Revert "New "vertical" algorithm for MergeTrees' parts merges" 2016-11-24 23:08:54 +04:00
Vitaliy Lyudvichenko
588add5a49 Added requested changes.
Also fixed single thread read from empty storage Log.
2016-11-23 15:52:12 +03:00
Alexey Arno
924402f33e dbms: Server: merged from master [#METR-19266] 2016-10-19 18:00:56 +03:00
Alexey Milovidov
6b2755bf2a Non significant change [#METR-2944]. 2016-09-23 23:33:06 +03:00
Alexey Arno
b7ca838dc0 dbms: Server: cleanups [#METR-19266] 2016-09-11 13:06:34 +03:00
Yuri Dyachenko
e5825f790f use std::enable_shared_from_this for IStorage 2016-08-29 16:28:34 +03:00
Alexey Arno
824341c1c2 dbms: made code more readable [#METR-19266] 2016-08-24 13:27:19 +03:00
Alexey Arno
cd0541134a dbms: post-testing fixes [#METR-19266] 2016-08-24 03:39:38 +03:00
Alexey Arno
f4e77aaf97 dbms: Better code for functions processing. Code cleanup. [#METR-19266] 2016-08-15 14:14:29 +03:00
Alexey Arno
e2b6e10ec1 dbms: Various fixes + more comments [#METR-19266] 2016-08-10 22:12:29 +03:00
Alexey Arno
531ff3d5ac dbms: Merged with master [#METR-19266] 2016-08-05 18:44:19 +03:00
Alexey Milovidov
55ddf44693 Whitespaces [#METR-22173]. 2016-08-05 05:40:45 +03:00
Alexey Milovidov
61b9996d9e Better [#METR-22173]. 2016-08-05 05:28:34 +03:00
Alexey Milovidov
fb5981871a Avoid copying ColumnWithTypeAndName [#METR-22173]. 2016-08-05 02:35:07 +03:00
Alexey Arno
d0d1ad3be1 dbms: improvements [#METR-19266] 2016-07-14 15:58:30 +03:00
Alexey Arno
ec30520c89 dbms: improvements [#METR-19266] 2016-07-13 20:05:52 +03:00
Alexey Arno
c336359299 dbms: improvements [#METR-19266] 2016-07-13 20:00:10 +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
0bf5406662 dbms: adding support for nulls in the Log engine [#METR-19266] 2016-07-13 13:45:43 +03:00
Alexey Arno
a15cce69aa dbms: adding support for nulls in the Log engine [#METR-19266] 2016-07-13 13:35:00 +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
646d70a545 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 17:14:18 +03:00
Alexey Milovidov
3c1c9d46f7 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 15:22:22 +03:00
Alexey Milovidov
4c7eb03b63 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 13:35:44 +03:00
Alexey Milovidov
be394f2c84 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 10:48:40 +03:00
Alexey Milovidov
4b7f461e46 Using std::shared_ptr for columns [#METR-21503]. 2016-05-28 08:31:36 +03:00
Alexey Milovidov
5fc44df6b5 Squashed commit of the following:
commit f9b478181cd49224154cc350fb57df7121842f1c
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Mar 19 04:06:36 2016 +0300

    Database engines: development [#METR-19997].

commit f7a10a67761ccfd05f3dac32d6444920cd8d4d60
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Mar 19 03:44:37 2016 +0300

    Database engines: development [#METR-19997].

commit bd98a8558e98bad2bed278e5762c4e0fc66e6f38
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Mar 19 00:33:59 2016 +0300

    Database engines: development [#METR-19997].

commit 19712fd884c22a4e2c2b67474086dea8f44e7c7b
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Mar 19 00:03:11 2016 +0300

    Database engines: development [#METR-19997].

commit 50274d6df7e91fcc34aab8a8c72347daa2c6512f
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Mar 18 23:24:57 2016 +0300

    Database engines: development [#METR-19997].

commit 4a0b99b19b34e90ef8b7be2d199f6232e36ef3f7
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Mar 18 22:50:36 2016 +0300

    Database engines: development [#METR-19997].

commit 44ff3ebba7a3e460a27a89f31ddf199dbea1d182
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Mar 18 15:09:17 2016 +0300

    Database engines: development [#METR-19997].

commit 137c31f3004cfd282473b6acb01cbe1b4ca2aadd
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Mar 18 03:26:34 2016 +0300

    Database engines: development [#METR-19997].

commit aa4c0496d4afe4a691164254be2bd5600542b38a
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Mar 18 03:22:59 2016 +0300

    Database engines: development [#METR-19997].

commit 5a94d1f0607450a2dac28a4d7df8b1393a864c23
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Mar 18 01:02:40 2016 +0300

    Database engines: development [#METR-19997].

commit 50fd5b52ea1141955a5dfba0dcb191f3289ac25b
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Thu Mar 17 23:23:40 2016 +0300

    Database engines: development [#METR-19997].

commit a333d91b058e4f56dd83a6d2878c3c2bd8efc002
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Thu Mar 17 20:29:07 2016 +0300

    Database engines: development [#METR-19997].

commit f81d366e7ac8348436f2698d040f8e341743a024
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Thu Mar 17 01:30:23 2016 +0300

    Database engines: development [#METR-19997].

commit d0696860c9060827896214c08d147c759ea79376
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Wed Mar 16 21:55:31 2016 +0300

    Database engines: development [#METR-19997].

commit 46a168c2ada140a0e95cd8d4b9d8ba9bac855d11
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Wed Mar 16 08:00:58 2016 +0300

    Database engines: development [#METR-19997].

commit 20a2bad161454225fc1b5f9b919b842fbebc3231
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Wed Mar 16 06:51:10 2016 +0300

    Database engines: development [#METR-19997].

commit ca0a77fcc2a8d0b276eb3743c53551ad3fe16314
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Wed Mar 16 06:02:20 2016 +0300

    Reverted erroneous modification [#METR-19997].

commit 1370bdcc4594182f6ef2b146f9afabfe1c295080
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Wed Mar 16 00:41:34 2016 +0300

    Database engines: development [#METR-19997].

commit 16e72c67041cae6471509d3f0f3d4a9aa7b7dc0f
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Tue Mar 15 00:41:48 2016 +0300

    Database engines: development [#METR-19997].
2016-03-19 04:18:49 +03:00
Alexey Milovidov
13c7d0983a dbms: cutting dependency [#METR-2944].. 2016-01-12 00:46:36 +03:00
Alexey Milovidov
c9a8f19def dbms: fixed error with tuples of consts [#METR-18586]. 2015-10-29 00:21:18 +03:00
Alexey Milovidov
918422ad48 Moved files [#METR-17973]. 2015-10-05 04:35:28 +03:00
Alexey Milovidov
733324645f dbms: aggregation by arrays: preparation [#METR-13168]. 2015-10-04 06:17: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
c0e029bb1b dbms: renamed ColumnWithNameAndType to ColumnWithTypeAndName for clarification [#METR-2944]. 2015-07-17 04:27:35 +03:00
Alexey Milovidov
d71b7ca1b0 dbms: better diagnostics [#METR-12542]. 2015-07-01 23:14:23 +03:00
Alexey Milovidov
c94bd2fc09 dbms: removed useless code [#METR-16739]. 2015-06-08 23:22:02 +03:00
Alexey Milovidov
628c32c840 dbms: using setting 'max_read_buffer_size' in Log and TinyLog tables [#METR-15090]. 2015-04-12 07:47:03 +03:00
Alexey Milovidov
543c4c92cb dbms: removed dead code; healing corrupted nested columns [#METR-15896]. 2015-04-09 03:37:08 +03:00
Alexey Milovidov
b11974f99a Merge 2015-04-03 02:58:26 +03:00
Alexey Milovidov
2d04fed3a3 dbms: improved performance of reading string column [#METR-2944]. 2015-02-15 15:38:21 +03:00
Alexey Milovidov
6927823716 dbms: little better [#METR-2944]. 2015-01-25 08:07:51 +03:00
Alexey Milovidov
1be4bd0663 Fixed errors in clang (part 1) [#METR-2807]. 2015-01-21 06:56:28 +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
Alexey Milovidov
2d5192c4a0 dbms: StorageBuffer: development [#METR-13297]. 2014-10-26 03:01:36 +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
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
9508cb93cf FileChecker migrated to boost::propertytree 2014-08-28 20:10:46 +04:00
Pavel Kartavyy
f53a889cc6 Revert "dbms: FileChecker migrated to json [#METR-11709]"
This reverts commit ab0aa4022f738334d15ad4522775c1343dd25fe9.
2014-08-28 20:10:46 +04:00
Pavel Kartavyy
dc16847ce1 dbms: FileChecker migrated to json [#METR-11709] 2014-08-06 17:23:38 +04:00
Pavel Kartavyy
bdea8e78e7 dbms: FileChecker simplified [#METR-11709] 2014-08-05 16:50:20 +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
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
108a7850a5 dbms: improved performance on short queries [#METR-11571]. 2014-06-26 04:58:14 +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
Alexey Milovidov
eba3126077 dbms: style [#METR-10071]. 2014-03-27 23:09:23 +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
14620b3347 Merge 2014-01-22 12:50:19 +00:00
Sergey Fedorov
9cc974568e Merge 2014-01-17 15:19:20 +00:00
Michael Kolupaev
fd05f7ea53 clickhouse: fixed a leak of file descriptors and memory. [#METR-9664] 2014-01-15 16:12:48 +00:00
Alexey Milovidov
2765113a08 dbms: removed old code [#METR-2944]. 2013-12-23 03:10:55 +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
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
fe0dd1d0b2 dbms: improvement [#CONV-2944]. 2013-06-21 20:34:19 +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
91a062a575 Merge 2013-06-15 08:38:30 +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
fa771f6573 clickhouse: slightly refactored storages [#CONV-6561]. 2013-02-21 09:11:18 +00:00
Michael Kolupaev
97287129aa clickhouse: Chunks: fixed [#CONV-6705]. 2013-02-11 11:59:21 +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
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
Alexey Milovidov
8068c5df89 dbms: fixed error [#CONV-2944]. 2012-09-19 18:45:01 +00:00
Alexey Milovidov
c9e3956100 dbms: development [#CONV-2944]. 2012-08-30 20:35:02 +00:00
Alexey Milovidov
b664b11192 dbms: development [#CONV-2944]. 2012-08-29 20:07:24 +00:00
Alexey Milovidov
cb3b6208bb dbms: development [#CONV-5097]. 2012-06-22 17:13:03 +00:00
Alexey Milovidov
1df16f6b9d dbms: development [#CONV-5097]. 2012-06-22 17:00:59 +00:00
Alexey Milovidov
81ccb40e5e dbms: development [#CONV-5097]. 2012-06-22 16:54:51 +00:00
Alexey Milovidov
2961d42e9d dbms: development [#CONV-2944]. 2012-06-21 16:33:00 +00:00
Alexey Milovidov
3482ab7686 dbms: lazy opening of files [#CONV-2944]. 2012-06-21 16:16:58 +00:00
Alexey Milovidov
c9f9913ef5 dbms: development [#CONV-2944]. 2012-06-20 17:54:38 +00:00
Alexey Milovidov
9a18d75b99 dbms: development [#CONV-2944]. 2012-06-18 06:19:13 +00:00
Alexey Milovidov
6a01fbf8c5 dbms: development [#CONV-2944]. 2012-05-30 04:45:49 +00:00
Alexey Milovidov
e727d7cf90 dbms: development [#CONV-2944]. 2012-05-22 18:32:45 +00:00
Alexey Milovidov
075f636bb3 dbms: development [#CONV-2944]. 2012-03-05 02:34:20 +00:00
Alexey Milovidov
7fc40e1847 dbms: development [#CONV-2944]. 2012-02-27 07:54:16 +00:00
Alexey Milovidov
997be7eea9 dbms: development [#CONV-2944]. 2012-01-10 22:11:51 +00:00
Alexey Milovidov
b9822b02b8 dbms: development [#CONV-2944]. 2012-01-09 19:20:48 +00:00
Alexey Milovidov
d51ae544fc dbms: development [#CONV-2944]. 2011-11-05 23:31:19 +00:00
Alexey Milovidov
859a86b382 dbms: development [#CONV-2944]. 2011-11-01 17:12:11 +00:00
Alexey Milovidov
67b02812f6 dbms: development. 2011-10-31 17:55:06 +00:00
Alexey Milovidov
b1b0d3836a dbms: development [#CONV-2944]. 2011-10-31 06:37:12 +00:00
Alexey Milovidov
c65e913754 dbms: development [#CONV-2944]. 2011-09-04 21:23:19 +00:00
Alexey Milovidov
9b153918e7 dbms: development [#CONV-2944]. 2011-08-28 02:22:23 +00:00
Alexey Milovidov
476e8446e6 dbms: development [#CONV-2944]. 2011-08-15 02:24:44 +00:00
Alexey Milovidov
624b31602c dbms: development [#CONV-2944]. 2011-08-15 01:12:57 +00:00
Alexey Milovidov
54808431ec dbms: development [#CONV-2944]. 2011-08-09 15:57:33 +00:00
Alexey Milovidov
f0afeaf7e9 dbms: development. 2010-05-24 18:58:14 +00:00
Alexey Milovidov
8c8fe0439f dbms: development. 2010-03-18 20:52:28 +00:00
Alexey Milovidov
fb5ca4d182 dbms: development. 2010-03-18 20:32:35 +00:00
Alexey Milovidov
6ef3ffc267 dbms: development. 2010-03-18 19:32:14 +00:00