Commit Graph

32 Commits

Author SHA1 Message Date
Alexey Milovidov
137ad95929 Changed tabs to spaces in code [#CLICKHOUSE-3]. 2017-04-01 11:35:09 +03:00
Alexey Milovidov
5546f7f75b Normalized formatting [#CLICKHOUSE-3]. 2017-03-09 07:26:17 +03:00
Alexey Milovidov
58e5dad1a1 Squashed commit of the following:
commit e712f469a5
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:59:13 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 2a00282308
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:58:30 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 9e06f407c8
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:55:14 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 9581620f1e
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:54:22 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 2a8564c68c
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:47:34 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit cf60632d78
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:40:09 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit ee3d1dc6e0
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:22:49 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 65592ef711
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:18:17 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 37972c2573
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:17:06 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit dd909d1499
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:16:28 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 3cf43266ca
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:15:42 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 6731a3df96
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:13:35 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 1b5727e0d5
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:11:18 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit bbcf726a55
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:09:04 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit c03b477d5e
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:06:30 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 2986e2fb04
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:05:44 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 5d6cdef13d
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:04:53 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit f2b819b25c
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:01:47 2017 +0300

    Less dependencies [#CLICKHOUSE-2]
2017-01-14 12:00:19 +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
9018906e1a Better [#METR-2944]. 2016-11-20 15:43:20 +03:00
Alexey Arno
c74ee4e478 dbms: Code cleanup [#METR-19266] 2016-08-12 18:22:28 +03:00
Alexey Arno
e2b6e10ec1 dbms: Various fixes + more comments [#METR-19266] 2016-08-10 22:12:29 +03:00
Alexey Arno
beeeb0ab13 dbms: NULL support for MergeTree [#METR-19266] 2016-07-21 19:22:24 +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
42883fddc4 Added virtual column '_sample_factor' [#METR-20296]. 2016-03-04 07:54:10 +03:00
Alexey Milovidov
43350f51bb dbms: don't thrash mark_cache on merges (and ALTER MODIFY TYPE) [#METR-19575]. 2015-12-26 03:59:09 +03:00
Alexey Milovidov
c7b9b29325 dbms: almost surely fixed error [#METR-19369]. 2015-12-21 23:17:24 +03:00
Alexey Milovidov
2aeb48be2d dbms: added backoff on slow reads [#METR-17579]. 2015-12-13 07:52:13 +03:00
Alexey Milovidov
7fa1a57165 dbms: fixed excessive memory allocation when splitting single-level block in Aggregator [#METR-17000]. 2015-12-05 10:01:18 +03:00
Andrey Mironov
a5bf937335 Merge 2015-09-25 16:39:13 +03:00
Andrey Mironov
bd57afb76c dbms: stop reading from parts without PREWHERE prematurely by calling isCancelled() [#METR-16457] 2015-09-25 16:39:13 +03:00
Andrey Mironov
7b149be2c6 Merge 2015-09-16 20:49:08 +03:00
Andrey Mironov
5caf4e401f dbms: style corrections and comments [#METR-16457] 2015-09-09 20:46:56 +03:00
Andrey Mironov
e8111d7e07 Merge 2015-09-03 15:07:46 +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
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
84d24ae336 merge branch 'master' 2015-08-31 18:50:06 +03:00
Andrey Mironov
fbfaa83b1a Merge 2015-08-25 13:25:45 +03:00
Andrey Mironov
9fea075cb0 Merge 2015-07-24 17:46:29 +03:00
Andrey Mironov
defba956d9 Merge 2015-07-23 16:11:27 +03:00
Andrey Mironov
a27057d4b9 Merge 2015-07-08 20:59:44 +03:00
Andrey Mironov
a5bfc70920 Merge 2015-07-07 18:30:10 +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