Commit Graph

294 Commits

Author SHA1 Message Date
Alexey Milovidov
02cb56653a Merging [#METR-19266]. 2016-12-10 09:22:03 +03:00
Alexey Milovidov
2aa02d0547 Merging [#METR-19266]. 2016-12-10 09:12:21 +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
Vladimir Chebotarev
bcc5500f91 cmake: More options. [#METR-23701] 2016-12-05 15:43:14 +03:00
artpaul
a2b4b85ed5 show type of argument in case of type missmatching 2016-12-02 13:59:23 +05:00
artpaul
7eb7cc38f7 move impls of FunctionsString to cpp 2016-12-02 12:32:39 +05:00
artpaul
41fda59c95 move impls of FunctionsArray to cpp 2016-12-02 12:15:35 +05:00
Alexey Milovidov
23257cd562 Added functions arraySort and arrayReverseSort [#METR-23547]. 2016-11-20 09:44:38 +03:00
Pavel Kartavyy
aac646ccfc update after review 2016-11-16 18:52:35 +03:00
Pavel Kartavyy
bdb7e9745b add hasColumnInTable function [#METR-23248] 2016-11-16 18:52:35 +03:00
Alexey Arno
55bb0f00b7 dbms: Server: fixes [#METR-19266] 2016-10-21 17:15:25 +03:00
Alexey Arno
ef2dd96ee4 dbms: Server: fixes [#METR-19266] 2016-10-21 16:14:41 +03:00
Alexey Arno
6c40d9b51e dbms: Server: fixes [#METR-19266] 2016-10-19 21:18:02 +03:00
Alexey Arno
924402f33e dbms: Server: merged from master [#METR-19266] 2016-10-19 18:00:56 +03:00
Alexey Arno
a4f2f74b8e dbms: Server: changes to make the code a tad more readable [#METR-19266] 2016-10-18 15:36:36 +03:00
Alexey Arno
a1da591237 dbms: Server: Fixed display of arrays . [#METR-19266] 2016-09-21 14:00:04 +03:00
Alexey Arno
bd53eb8054 dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-21 11:24:48 +03:00
Alexey Arno
bad88a8062 dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-20 19:59:14 +03:00
Alexey Arno
045169a065 dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-20 16:51:45 +03:00
Alexey Arno
a38fef4c60 dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-20 10:27:45 +03:00
Alexey Arno
58fec71f0f dbms: Server: Do not pay attention to this commit. [#METR-19266] 2016-09-19 19:57:52 +03:00
Alexey Arno
dd300f6618 dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-19 19:04:53 +03:00
Alexey Arno
89bc411ab1 dbms: Server: Bug fix. [#METR-19266] 2016-09-19 17:50:56 +03:00
Alexey Arno
c81eb1d730 dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-19 12:40:17 +03:00
Alexey Arno
94187aff43 Merge branch 'METR-19266' of github.com:yandex/ClickHouse into METR-19266 [#METR-19266] 2016-09-19 11:46:54 +03:00
Alexey Arno
8718c95e1e dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-19 11:46:48 +03:00
Alexey Arno
85383ab7bf dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-19 11:20:10 +03:00
Alexey Milovidov
365be3c026 Fixed warning with gcc 6 [#METR-2944]. 2016-09-19 09:24:18 +03:00
Alexey Milovidov
6dd008a034 Added 'runningDifference' function [#METR-22730]. 2016-09-17 01:00:30 +03:00
Alexey Arno
16f8f33051 dbms: Server: a little better [#METR-19266] 2016-09-16 22:55:29 +03:00
Alexey Arno
e0347308b9 dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-16 19:11:36 +03:00
Alexey Arno
11484598e3 dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-16 00:55:07 +03:00
Alexey Arno
5a7b98d29a dbms: Server: Adding nullable type support to functions manipulating arrays. [#METR-19266] 2016-09-16 00:27:34 +03:00
Alexey Arno
59043c680e dbms: Server: Ongoing work. Do not pay attention. [#METR-19266] 2016-09-12 17:16:21 +03:00
Alexey Arno
ef7eb14979 dbms: Server: Adding nullable types support for arrays. Ongoing. [#METR-19266] 2016-09-11 10:40:47 +03:00
Alexey Milovidov
b85dc1bc0f convertCharset: development [#METR-22482]. 2016-08-26 05:24:17 +03:00
Alexey Milovidov
d9db19acea Function 'convertCharset': development [#METR-22482]. 2016-08-26 00:44:47 +03:00
Alexey Arno
f65e7b4a0f dbms: improvements [#METR-19266] 2016-08-18 17:25:02 +03:00
Alexey Arno
8b9742431e dbms: cleanup [#METR-19266] 2016-08-17 19:31:00 +03:00
Alexey Arno
c4f348619d dbms: cleanup [#METR-19266] 2016-08-17 16:38:33 +03:00
Alexey Arno
74ccf71a2a dbms: cleanup [#METR-19266] 2016-08-17 14:54:21 +03:00
Alexey Milovidov
e387d94275 More verbose error message when conversion function cannot parse value from string [#METR-22408]. 2016-08-17 10:51:39 +03:00
Alexey Milovidov
09563dc4da More verbose error message when conversion function cannot parse value from string [#METR-22408]. 2016-08-17 10:47:03 +03:00
Alexey Milovidov
1d6e77fd9b More verbose error message when conversion function cannot parse value from string [#METR-22408]. 2016-08-17 10:41:44 +03:00
Alexey Milovidov
dc0f76bc87 More verbose error message when conversion function cannot parse value from string [#METR-22408]. 2016-08-17 10:40:06 +03:00
Alexey Milovidov
d13190a2db Fixed error with 'visibleWidth' function when applied to Array(Enum...) or Tuple(Enum...) [#METR-22432]. 2016-08-17 09:25:01 +03:00
Alexey Arno
821f1e6482 dbms: cleanup [#METR-19266] 2016-08-17 01:40:05 +03:00
Alexey Arno
be2a305366 dbms: cleanup [#METR-19266] 2016-08-16 16:31:42 +03:00
Alexey Arno
8340f8fd07 dbms: better [#METR-19266] 2016-08-15 20:10:30 +03:00
Alexey Arno
44a135f656 dbms: better [#METR-19266] 2016-08-15 17:36:01 +03:00