Commit Graph

13 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
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
dcbe183d41 dbms: merged with master [#METR-19266] 2016-07-11 13:09:16 +03:00
Alexey Milovidov
e6e6953bf3 Miscellaneous modifications [#METR-2944]. 2016-07-10 05:33:50 +03:00
Alexey Arno
f52403f623 dbms: Server: Feature development. [#METR-19266] 2016-07-06 12:47:55 +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
286baa8611 Merge 2016-05-04 02:19:14 +03:00
Alexey Milovidov
f7c09d58a5 Attempt to improve performance [#METR-20892]. 2016-04-15 03:33:21 +03:00
Andrey Mironov
a57f996770 dbms: fix transform() accepting non constant second argument 2015-12-08 12:16:40 +03:00
Alexey Milovidov
bb283e6602 dbms: added support for different numeric types in function has [#METR-18382]. 2015-10-12 10:05:54 +03:00
Alexey Milovidov
8d09c7f618 dbms: additions [#METR-15987]. 2015-06-03 06:55:29 +03:00
Alexey Milovidov
c341bd2c60 dbms: function 'transform': added support for non-const argument with default value [#METR-15987]. 2015-06-03 06:29:28 +03:00