Commit Graph

210 Commits

Author SHA1 Message Date
Alexey Milovidov
2b4f3b5d34 Renamed method (less confusion) [#METR-2944]. 2017-01-02 23:12:12 +03:00
Alexey Milovidov
b3e85e6469 Addition to prev. revision [#METR-22442]. 2016-12-11 14:59:55 +03:00
Alexey Milovidov
436d2c43c9 Addition to prev. revision [#METR-22442]. 2016-12-11 14:47:09 +03:00
Alexey Milovidov
ce6556639e Fixed tests after merge [#METR-19266] [#METR-22442]. 2016-12-11 14:33:51 +03:00
Alexey Milovidov
c937d75a78 Merging [#METR-19266]. 2016-12-10 09:10:29 +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 Milovidov
c8c86208aa Fixed error with ALTER of Enums in Nested fields [#METR-22442]. 2016-11-20 11:57:11 +03:00
Alexey Milovidov
ef85902daa Little better [#METR-22327]. 2016-11-18 06:15:49 +03:00
Alexey Milovidov
0700f53665 Fixed error with 'intersects previous part' [#METR-22327]. 2016-11-18 03:19:35 +03:00
Alexey Milovidov
ba48688f25 MergeSelector: development [#METR-21840]. 2016-10-30 11:15:55 +03:00
Alexey Milovidov
74c3b30622 dbms: Simplified logic of selecting merges [#METR-21841]. 2016-10-28 01:50:02 +03:00
Alexey Milovidov
9af5ce1e3b Separate compilation of ProfileEvents; comments [#METR-23237]. 2016-10-24 05:02:37 +03:00
Alexey Arno
a75cfb6df5 Merge branch 'master' into METR-19266 [#METR-19266] 2016-10-21 19:53:35 +03:00
Alexey Arno
6c40d9b51e dbms: Server: fixes [#METR-19266] 2016-10-19 21:18:02 +03:00
Yuri Dyachenko
297a1547c5 more usable settings for delayed insert. issue: #METR-22563 2016-10-19 20:58:27 +03:00
Alexey Arno
b5ff08bce6 dbms: Server: semantic cleanup [#METR-19266] 2016-10-19 10:15:26 +03:00
Alexey Arno
443613c153 dbms: Fixed bug in ALTER TABLE ... MODIFY COLUMN. [#METR-19622] 2016-09-02 18:43:43 +03:00
Alexey Arno
9528405fe4 dbms: Extended CAST to nullable types. Added ALTER TABLE ... MODIFY COLUMN ... for nullable types. A column with a nullable type can have a default value in CREATE TABLE. [#METR-19266] 2016-08-29 19:57:59 +03:00
Alexey Arno
22dc2f96a1 dbms: cleanup [#METR-19266] 2016-08-18 19:11:20 +03:00
Alexey Arno
e2b6e10ec1 dbms: Various fixes + more comments [#METR-19266] 2016-08-10 22:12:29 +03:00
Alexey Arno
531ff3d5ac dbms: Merged with master [#METR-19266] 2016-08-05 18:44:19 +03:00
Alexey Arno
1fe6786b78 dbms: NULL support for MergeTree [#METR-19266] 2016-07-24 22:32:21 +03:00
Alexey Arno
beeeb0ab13 dbms: NULL support for MergeTree [#METR-19266] 2016-07-21 19:22:24 +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
5ded454986 Added 'WITH NAME' section to ALTER TABLE ... FREEZE PARTITION query [#METR-21884]. 2016-06-28 23:50:37 +03:00
Alexey Milovidov
b8ca97a891 Added check for constants in primary key [#METR-2944]. 2016-06-21 20:06:12 +03:00
Alexey Milovidov
e8ffd48e49 Loosen safety threshold on amount of ALTER changes [#METR-21615]. 2016-06-06 22:50:30 +03:00
Alexey Milovidov
168ca22435 Fixed error when too long merges cannot be successful [#METR-21616]. 2016-06-06 22:16:34 +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
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
f2ccbc9802 Better exception message [#METR-21479]. 2016-05-26 00:35:57 +03:00
Alexey Milovidov
8f50b30268 Alter primary key: development [#METR-21119]. 2016-05-18 00:07:10 +03:00
Alexey Milovidov
9a60b90941 Alter primary key: development [#METR-21119]. 2016-05-17 23:11:43 +03:00
Alexey Milovidov
bf265e264a Alter primary key: development [#METR-21119]. 2016-05-17 02:04:03 +03:00
Alexey Milovidov
6942819013 Altering primary key [#METR-21119]. 2016-05-14 00:08:19 +03:00
Alexey Milovidov
07f04d70d3 Merge 2016-04-24 12:44:47 +03:00
Alexey Milovidov
c6722da2b2 Merge 2016-04-19 00:38:06 +03:00
Alexey Milovidov
d6ba48a610 Merge 2016-04-15 22:37:19 +03:00
Alexey Milovidov
3923c7abce Merge 2016-04-15 20:42:51 +03:00
Alexey Milovidov
d79174b2ce Preparation [#METR-20644]. 2016-04-15 20:13:51 +03:00
Alexey Arno
35e16aed04 dbms: Bug fix: under certain circumstances, ClickHouse would fail to attach a partition whose name coincides with the name of another partition that was previously dropped [#METR-20825] 2016-04-14 19:21:17 +03:00
Alexey Milovidov
b1ee71c026 Fixed build [#METR-2944]. 2016-04-13 23:46:11 +03:00
Alexey Milovidov
8b9cf82c6c More checking [#METR-12588]. 2016-04-13 07:48:41 +03:00
Alexey Milovidov
3973277936 Allowed to modify 'max_files_to_modify_in_alter_columns' [#METR-20763]. 2016-04-05 21:18:16 +03:00
Alexey Arno
21ff6d9f94 dbms: Comment updates. Naming simplfications. Use better hashing. [#METR-18510] 2016-03-29 19:29:39 +03:00
Alexey Arno
32a38485e6 Merge 2016-03-25 14:48:45 +03:00
Alexey Milovidov
0194495b99 Fixed build [#METR-2807]. 2016-03-07 11:10:52 +03:00