Commit Graph

278 Commits

Author SHA1 Message Date
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
Pavel Kartavyy
5dfbd57bad ExpressionAnalyzer: make aliases and ast consistent after constant if optimization 2016-11-30 16:19:39 +03:00
Pavel Kartavyy
106bb24fd8 ExpressionAnalyzer: added more tests for aliases. fix bug [#METR-23545] 2016-11-29 22:19:15 +03:00
Pavel Kartavyy
84a89b3b3d ExpressionAnalyzer: optimize if with constant condition [#METR-23545] 2016-11-24 17:18:44 +03:00
Alexey Milovidov
b0fa239612 Fixed error [#METR-2944]. 2016-11-21 03:56:59 +03:00
Alexey Milovidov
ef3fb70123 Fixed error [#METR-2944]. 2016-11-21 03:36:50 +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 Milovidov
902c70bfa9 Fixed error with duplicate columns in subqueries [#METR-22381]. 2016-08-20 20:10:00 +03:00
Alexey Milovidov
70d7451c8c Miscellaneous [#METR-2944]. 2016-08-17 05:44:45 +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 Milovidov
8224217e25 Fixed build [#METR-2944]. 2016-08-11 23:59:17 +03:00
Alexey Arno
3fcf4347cd dbms: More comments. Cleanups. Moved a lot of FunctionsArray code into implementation file. [#METR-19266] 2016-08-11 19:47:28 +03:00
Alexey Milovidov
9f51a59322 Merge branch 'master' of github.com:yandex/ClickHouse 2016-08-11 03:47:47 +03:00
Alexey Milovidov
715cb482fa Miscellaneous [#METR-2807]. 2016-08-11 03:47:01 +03:00
Alexey Milovidov
b0256b9935 Fixed stack overflow [#METR-22219]. 2016-08-10 21:49:10 +03:00
Alexey Milovidov
1d2a5086d2 Fixed incompatibility [#METR-22226]. 2016-07-28 23:25:38 +03:00
Alexey Milovidov
f1aab70e3d Fixed incompatibility with new parser of JOINs [#METR-22206]. 2016-07-26 22:43:58 +03:00
Alexey Milovidov
5f423e9023 Fixing incompatibilities [#METR-2944]. 2016-07-23 05:42:42 +03:00
Alexey Milovidov
dc665c67c5 Fixing incompatibilities [#METR-2944]. 2016-07-23 05:25:09 +03:00
Alexey Milovidov
130ec8b58b Compatibility with new parser and AST of tables list [#METR-2944]. 2016-07-22 23:39:28 +03:00
Alexey Milovidov
55ed2904f4 Allowed for certain aggregate functions to have case insensitive names for compatibility [#METR-22087]. 2016-07-14 08:22:09 +03:00
Alexey Milovidov
a01534e6ab Added syntactic sugar for count(DISTINCT ...) and 'count_distinct_implementation' setting [#METR-22035]. 2016-07-10 18:52:35 +03:00
Alexey Milovidov
003d63023b Fixed error [#METR-18149]. 2016-07-10 10:24:24 +03:00
Alexey Milovidov
4858a2518e Fixed error after moving from Poco::SharedPtr to std::shared_ptr [#METR-21503]. 2016-05-30 23:31:03 +03:00
Alexey Milovidov
128f4a963c Using std::shared_ptr for functions and AST [#METR-21503]. 2016-05-28 19:25:09 +03:00
Alexey Milovidov
9eb249afa6 Using std::shared_ptr for functions and AST [#METR-21503]. 2016-05-28 19:19:27 +03:00
Alexey Milovidov
e336ba10eb Using std::shared_ptr for functions and AST [#METR-21503]. 2016-05-28 18:56: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 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
61ae4e5547 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 11:15:50 +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 Arno
286baa8611 Merge 2016-05-04 02:19:14 +03:00
Alexey Milovidov
c43b34d3f0 Added function 'indexHint' [#METR-20940]. 2016-04-16 02:10:29 +03:00
Alexey Milovidov
f5247021b1 Fixed error [#METR-20296]. 2016-03-05 06:17:11 +03:00
Alexey Milovidov
36e4bcc125 Better diagnostics [#METR-19808]. 2016-03-05 05:30:20 +03:00
Alexey Milovidov
9a53bd2a3e dbms: tiny fixes (tnx. orantius) [#METR-2944]. 2016-01-13 04:02:10 +03:00
Alexey Milovidov
ab1b725779 dbms: less dependencies [#METR-2944]. 2016-01-13 03:32:59 +03:00
Alexey Milovidov
13c7d0983a dbms: cutting dependency [#METR-2944].. 2016-01-12 00:46:36 +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
c483485eaf dbms: create a separate type for Tuple in Field [#METR-19265] 2015-12-25 15:06:17 +03:00
Andrey Mironov
13f56d4465 dbms: use CAST internally whenever a conversion is required [#METR-19265] 2015-12-25 15:06:16 +03:00
Andrey Mironov
49236beee8 dbms: CAST(expression AS type) [#METR-19265] 2015-12-25 15:06:16 +03:00
Alexey Milovidov
ce70e528e0 dbms: fixed error with max_subquery_depth and GLOBAL subqueries [#METR-19569]. 2015-12-25 04:37:17 +03:00
Andrey Mironov
9d16702f84 dbms: unconditionally move evaluation of storage ALIASes to InterpterSelectQuery [#METR-19317] 2015-12-15 17:15:06 +03:00
Alexey Milovidov
109eec92ff dbms: fixed error with UNION ALL and subqueries in IN [#METR-18808]. 2015-11-13 23:50:51 +03:00
Alexey Milovidov
c3a196904f dbms: fixed error with ARRAY JOIN and UNION ALL [#METR-18646]. 2015-11-05 03:42:18 +03:00