Commit Graph

103 Commits

Author SHA1 Message Date
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
Vitaliy Lyudvichenko
202ba912ce Vertical merging algorithm for MergeTree engines. [#METR-23305] 2016-11-29 22:41:31 +03:00
Alexey Milovidov
9018906e1a Better [#METR-2944]. 2016-11-20 15:43:20 +03:00
Alexey Milovidov
6b2755bf2a Non significant change [#METR-2944]. 2016-09-23 23:33:06 +03:00
Alexey Arno
b7ca838dc0 dbms: Server: cleanups [#METR-19266] 2016-09-11 13:06:34 +03:00
Alexey Milovidov
6cc8dadd6d Fixed error [#METR-21993]. 2016-08-11 00:20:46 +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 Milovidov
55ddf44693 Whitespaces [#METR-22173]. 2016-08-05 05:40:45 +03:00
Alexey Milovidov
61b9996d9e Better [#METR-22173]. 2016-08-05 05:28:34 +03:00
Alexey Milovidov
fb5981871a Avoid copying ColumnWithTypeAndName [#METR-22173]. 2016-08-05 02:35:07 +03:00
Alexey Arno
beeeb0ab13 dbms: NULL support for MergeTree [#METR-19266] 2016-07-21 19:22:24 +03:00
Alexey Arno
252d7994e7 dbms: cleanup [#METR-19266] 2016-07-19 13:57:57 +03:00
Alexey Milovidov
4c7eb03b63 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 13:35:44 +03:00
Alexey Milovidov
4b7f461e46 Using std::shared_ptr for columns [#METR-21503]. 2016-05-28 08:31:36 +03:00
Alexey Milovidov
70273d65f6 Better diagnostics [#METR-21183]. 2016-05-04 21:04:36 +03:00
Alexey Milovidov
13c7d0983a dbms: cutting dependency [#METR-2944].. 2016-01-12 00:46:36 +03:00
Alexey Milovidov
43350f51bb dbms: don't thrash mark_cache on merges (and ALTER MODIFY TYPE) [#METR-19575]. 2015-12-26 03:59:09 +03:00
Alexey Milovidov
c7b9b29325 dbms: almost surely fixed error [#METR-19369]. 2015-12-21 23:17:24 +03:00
Alexey Milovidov
2aeb48be2d dbms: added backoff on slow reads [#METR-17579]. 2015-12-13 07:52:13 +03:00
Alexey Milovidov
733324645f dbms: aggregation by arrays: preparation [#METR-13168]. 2015-10-04 06:17:36 +03:00
Andrey Mironov
7b149be2c6 Merge 2015-09-16 20:49:08 +03:00
Andrey Mironov
5caf4e401f dbms: style corrections and comments [#METR-16457] 2015-09-09 20:46:56 +03:00
Andrey Mironov
e8111d7e07 Merge 2015-09-03 15:07:46 +03:00
Andrey Mironov
5ca53c8b10 Merge 2015-09-03 12:17:25 +03:00
Andrey Mironov
9cc9cb241f Merge 2015-09-02 20:11:47 +03:00
Andrey Mironov
288f46936a Merge 2015-09-02 18:48:10 +03:00
Andrey Mironov
70ec50316e Merge 2015-09-02 18:32:17 +03:00
Andrey Mironov
cbe8fb0b67 Merge 2015-09-01 17:15:07 +03:00
Andrey Mironov
b2fa52394b dbms: support final with new code [#METR-16457] 2015-09-01 15:24:38 +03:00
Andrey Mironov
bc5007fc36 Merge 2015-08-31 23:22:06 +03:00
Andrey Mironov
7b818fe243 dbms: somehow fix memory corruption [#METR-16457] 2015-08-31 22:14:45 +03:00
Andrey Mironov
77a0a22de6 dbms: existing_memory support for ReadBufferAIO.cpp 2015-08-31 19:49:09 +03:00
Andrey Mironov
84d24ae336 merge branch 'master' 2015-08-31 18:50:06 +03:00
Alexey Milovidov
bc6598371c dbms: fixed comment [#METR-2944]. 2015-07-27 16:36:22 +03:00
Alexey Milovidov
c0e029bb1b dbms: renamed ColumnWithNameAndType to ColumnWithTypeAndName for clarification [#METR-2944]. 2015-07-17 04:27:35 +03:00
Andrey Mironov
a27057d4b9 Merge 2015-07-08 20:59:44 +03:00
Andrey Mironov
a5bfc70920 Merge 2015-07-07 18:30:10 +03:00
Andrey Mironov
54d5517757 Merge 2015-06-24 20:05:40 +03:00
Andrey Mironov
b18764404a Merge 2015-06-24 14:03:53 +03:00
Alexey Milovidov
114b3de689 dbms: cut dependencies [#METR-2944]. 2015-04-16 09:12:35 +03:00
Alexey Arno
43e47bf4d5 dbms: Server: Compute the size of the file subset we plan to read. [#METR-15090] 2015-04-14 13:33:00 +03:00
Alexey Arno
bd36fad435 dbms: Server: Code cleanups. [#METR-15090] 2015-04-13 18:33:58 +03:00
Alexey Arno
e27cb9cb75 Merge 2015-04-13 18:02:39 +03:00
Alexey Milovidov
cac503ff82 Merge 2015-04-12 07:39:20 +03:00
Alexey Arno
b5c1932b8c Merge 2015-04-10 20:51:39 +03:00
Alexey Arno
0c4d61becc Merge 2015-04-10 20:49:30 +03:00
Alexey Arno
1ef3ae9dc4 dbms: Server: feature development. [#METR-15090] 2015-04-09 16:34:16 +03:00
Alexey Milovidov
7d4bf16d06 dbms: fixed Block::insertDefault method for elements of nested data structures (it is used in AddedDefaultsBlockInputStream, InterpreterInsertQuery) [#METR-15896]. 2015-04-09 05:10:06 +03:00