Commit Graph

21 Commits

Author SHA1 Message Date
f1yegor
b4c23f122a Translated comments 2017-04-02 20:37:49 +03:00
Alexey Milovidov
310736cd7e Moved headers and sources to same place [#CLICKHOUSE-3]. 2017-04-01 12:22:42 +03:00
Alexey Milovidov
137ad95929 Changed tabs to spaces in code [#CLICKHOUSE-3]. 2017-04-01 11:35:09 +03:00
Alexey Milovidov
916552f175 Improved formatting of lambda expressions [#METR-23947]. 2017-01-12 04:55:14 +03:00
Alexey Milovidov
d89ee33ce2 Squashed commit of the following:
commit c567d4e1fe
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:35:01 2017 +0300

    Style [#METR-2944].

commit 26bf3e1228
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:33:11 2017 +0300

    Miscellaneous [#METR-2944].

commit eb946f4c6f
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:30:19 2017 +0300

    Miscellaneous [#METR-2944].

commit 78c867a147
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:11:41 2017 +0300

    Miscellaneous [#METR-2944].

commit 6604c5c83c
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:56:15 2017 +0300

    Miscellaneous [#METR-2944].

commit 23fbf05c1d
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:47:52 2017 +0300

    Miscellaneous [#METR-2944].

commit 98772faf11
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:46:05 2017 +0300

    Miscellaneous [#METR-2944].

commit 3dc636ab9f
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:39:46 2017 +0300

    Miscellaneous [#METR-2944].

commit 3e16aee954
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:38:03 2017 +0300

    Miscellaneous [#METR-2944].

commit ae7e7e90eb
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:34:15 2017 +0300

    Miscellaneous [#METR-2944].
2017-01-06 20:41: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
924402f33e dbms: Server: merged from master [#METR-19266] 2016-10-19 18:00:56 +03:00
Alexey Milovidov
4d65dd3b37 Get rid of buggy code (that coincidently was useless too) [#METR-2944]. 2016-09-04 03:01:48 +03:00
Alexey Arno
568fe119fb dbms: Got rid of useless display code for CASE and IS NULL/IS NOT NULL. Also simplified CASE implementation. [#METR-19266] 2016-08-12 17:06:58 +03:00
Alexey Arno
18340adbe8 dbms: better [#METR-19266] 2016-07-26 15:58:51 +03:00
Alexey Milovidov
8c4abcdd43 Using std::shared_ptr for functions and AST [#METR-21503]. 2016-05-28 18:42:22 +03:00
Alexey Arno
a8379e7bc1 dbms: Server: Fixed syntax coloring issue. [#METR-19697] 2016-05-05 18:26:36 +03:00
Alexey Arno
286baa8611 Merge 2016-05-04 02:19:14 +03:00
Andrey Mironov
1506cc25c0 dbms: allow conversion of most types to enum (not enum to enum though)[#METR-19265] 2015-12-25 17:45:58 +03:00
Andrey Mironov
40f060fae8 dbms: allow type in CAST(expression AS type) without back quotes [#METR-19265] 2015-12-25 15:06:17 +03:00
Alexey Milovidov
071c1af212 dbms: fixed error [#METR-17606]. 2015-08-09 08:10:43 +03:00
Alexey Milovidov
ca3a36c3e1 dbms: addition to prev. revision [#METR-17606]. 2015-08-07 02:46:15 +03:00
Alexey Milovidov
5ed70eeb27 dbms: preparation [#METR-17606]. 2015-08-06 07:28:59 +03:00
Alexey Milovidov
e072db7da2 dbms: preparation to more compact query formatting [#METR-17606]. 2015-08-06 06:26:27 +03:00
Alexey Milovidov
4eac023043 dbms: addition to prev. revision [#METR-17606]. 2015-08-06 00:39:42 +03:00