Commit Graph

1046 Commits

Author SHA1 Message Date
Alexey Milovidov
fc43827a6c Preparation [#METR-2944]. 2016-12-12 06:33:34 +03:00
Alexey Milovidov
c937d75a78 Merging [#METR-19266]. 2016-12-10 09:10:29 +03:00
Alexey Milovidov
f4815364f6 Merging [#METR-19266]. 2016-12-10 08:03:12 +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
514715589b Preparation [#METR-23747]. 2016-12-08 05:49:04 +03:00
proller
76dc51aae5 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-12-07 22:08:09 +03:00
Alexey Milovidov
072f2fc7b8 Merges: start to lower maximum size of merge only when number of free entries in pool/queue is lower than specified threshold [#METR-21504]. 2016-12-06 06:09:07 +03:00
Alexey Milovidov
0717bfa4d2 Simplified LevelMergeSelector [#METR-21504]. 2016-12-06 00:34:46 +03:00
Vitaliy Lyudvichenko
202ba912ce Vertical merging algorithm for MergeTree engines. [#METR-23305] 2016-11-29 22:41:31 +03:00
proller
b529f29bb7 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-29 19:57:01 +03:00
Alexey Milovidov
0a2d1ebbb3 Attempt to improve merge selecting algorithm [#METR-23632]. 2016-11-28 06:46:08 +03:00
Alexey Milovidov
cac8f9216f MergeSelector: attempt to do something that has sense [#METR-23632]. 2016-11-28 06:17:31 +03:00
proller
26fe10a7b4 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-25 03:22:30 +03:00
Alexey Milovidov
8e5889cf0e Improved merge selecting algorithm for Replicated tables [#METR-23615]. 2016-11-25 01:41:27 +03:00
proller
3b335b5546 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-24 22:58:40 +03:00
alexey-milovidov
8c2e228856 Revert "New "vertical" algorithm for MergeTrees' parts merges" 2016-11-24 23:08:54 +04:00
proller
e855c16f4a Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-24 21:25:56 +03:00
alexey-milovidov
8544a8b852 Merge pull request #171 from ludv1x/METR-23305
New "vertical" algorithm for MergeTrees' parts merges
2016-11-24 22:07:41 +04:00
proller
8c07957e38 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-24 04:01:18 +03:00
alexey-milovidov
fdabcd4e38 Merge pull request #192 from ludv1x/enums-fix
Fixed Enum usage in PK expressions.
2016-11-24 03:13:16 +04:00
proller
c919c02ed4 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-24 00:04:38 +03:00
Alexey Milovidov
a2e9359b18 Fixed rare deadlock after startup when structure of query_log was changed [#METR-23594]. 2016-11-23 23:41:39 +03:00
Vitaliy Lyudvichenko
4f9064ca19 Fixed case when pk column is wrapped by functions. 2016-11-23 22:58:33 +03:00
Vitaliy Lyudvichenko
d27951b4a7 Added requested changes. [#METR-23473] 2016-11-23 16:33:05 +03:00
Vitaliy Lyudvichenko
e07fc7cea5 Fixed Enum usage in PK expressions. [#METR-23473]
Added check for duplicates of column names in CREATE query.
2016-11-23 16:19:15 +03:00
Vitaliy Lyudvichenko
ef593d1b01 Added merge_tree.enable_vertical_merge_algorithm setting. 2016-11-23 15:59:25 +03:00
Vitaliy Lyudvichenko
588add5a49 Added requested changes.
Also fixed single thread read from empty storage Log.
2016-11-23 15:52:12 +03:00
Vitaliy Lyudvichenko
2cd5b8b604 Updated MergeInfo and progress callbacks with respect to vertical merge alg. 2016-11-23 15:52:12 +03:00
Vitaliy Lyudvichenko
ec9bcd8054 Vertical merging algorithm for ordinary MergeTreee. 2016-11-23 15:47:19 +03:00
proller
eeeacd0805 merge upstream 2016-11-23 01:33:02 +03:00
Alexey Milovidov
bba5dcbcfa Fixed deadlock [#METR-23557]. 2016-11-22 22:27:45 +03:00
Alexey Milovidov
94e344ee38 Part checks don't lock ALTERs [#METR-22214]. 2016-11-22 21:49:17 +03:00
proller
0b40a13ea7 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-22 14:56:57 +03:00
Alexey Milovidov
9018906e1a Better [#METR-2944]. 2016-11-20 15:43:20 +03:00
proller
61e6ee9100 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-18 15:14:34 +03:00
Alexey Milovidov
a44e5193b0 Better backpressure for INSERT SELECT into MergeTree [#METR-22327]. 2016-11-18 05:05:25 +03:00
proller
881319c4ec Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-18 04:48:21 +03:00
Alexey Milovidov
b19e61757e Little improvement for large number of small inserts [#METR-22327]. 2016-11-18 04:03:57 +03:00
proller
8fec8e2ac4 simple get works 2016-11-16 02:55:45 +03:00
Alexey Milovidov
e7fccc4044 Modified backpressure method for MergeTree [#METR-23488]. 2016-11-14 21:19:08 +03:00
Vitaliy Lyudvichenko
107f7b34c7 Added requested PR changes, 2nd iteration. 2016-11-14 02:57:18 +03:00
Vitaliy Lyudvichenko
bf924009b9 Added support of seekable files for StorageFile, more options for clickhouse-local. [#METR-23101] 2016-11-09 22:05:35 +03:00
Vitaliy Lyudvichenko
2242cfd6b0 Put DatabaseMemory class into separated file. 2016-11-09 22:05:35 +03:00
Vitaliy Lyudvichenko
0e2eb5436b Added StorageFile and template for clickhouse-local app. 2016-11-09 22:03:47 +03:00
Alexey Milovidov
34a9af27bf Inreased default ALTERs safety threshold [#METR-2944]. 2016-11-09 17:14:39 +03:00
Alexey Milovidov
efa056fc77 Attempt to improve merge selecting algorithm [#METR-21840]. 2016-11-05 04:11:51 +03:00
Alexey Milovidov
aaec9d1db6 Attempt for improvement [#METR-21840]. 2016-11-01 22:20:24 +03:00
Vladimir Smirnov
d36f52502e Make it compilable on OS X
It's still hackish and dirty, but server and client compies.

Server starts, but throwes meaningless exception on any query.

Client seems to be working fine.

Linux compilation might (but shouldn't) be broken (not tested).
2016-11-01 17:59:21 +01:00
Alexey Milovidov
a3a8b49e80 MergeSelector: development [#METR-21841]. 2016-11-01 14:26:36 +03:00
Alexey Milovidov
91dbf74ac0 MergeSelector: development [#METR-21841]. 2016-11-01 11:38:55 +03:00