Alexey Milovidov
e53e32130d
Merging [#METR-19266].
2016-12-10 07:58:40 +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
ea11f61433
Added requested changes. [#METR-19372]
2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
855dc56598
Added treshold setting for Vertical merge algorithm. [#METR-23305]
2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
774eb01fd3
Added MergesTime metric. [#METR-23305]
2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
fc4c02c510
StorageSystemMerges refactoring.
2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
f8eb9028fd
Refined query_log, processes and merges metrics.
...
Also, dbms/CMakeLists.txt was rewritten.
2016-12-09 13:11:25 +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
Vladimir Chebotarev
bcc5500f91
cmake: More options. [#METR-23701]
2016-12-05 15:43:14 +03:00
Alexey Milovidov
02eb36fd03
MergeSelector: attempt to make something better [#METR-21504].
2016-12-05 09:31:48 +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
Vitaliy Lyudvichenko
1472629799
Updated pk_condition test after recent changes.
2016-11-28 20:59:39 +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
4c90ffd61d
Merge remote-tracking branch 'upstream/master' into METR-23466
2016-11-27 15:03:35 +03:00
Alexey Milovidov
6209092b15
Added heuristic for merge algorithm [#METR-23615].
2016-11-26 07:08:49 +03:00
proller
26fe10a7b4
Merge remote-tracking branch 'upstream/master' into METR-23466
2016-11-25 03:22:30 +03:00
Alexey Milovidov
7d280a55a3
Fixed error that server could not shutdown while fetching parts [#METR-23616].
2016-11-25 02:18:24 +03:00
Alexey Milovidov
167782c230
Addition to prev. revision [#METR-23615].
2016-11-25 01:43:49 +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
Vitaliy Lyudvichenko
544ef67c28
Fixed IN <Set> usage inside PK expressions.
...
Refactoring of type conversion functions convertFieldToType().
2016-11-24 15:32:04 +03:00
proller
8c07957e38
Merge remote-tracking branch 'upstream/master' into METR-23466
2016-11-24 04:01:18 +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
4f39c04854
Merge remote-tracking branch 'upstream/master' into METR-23466
2016-11-23 01:33:37 +03:00
proller
eeeacd0805
merge upstream
2016-11-23 01:33:02 +03:00
Alexey Milovidov
4cab31a60e
Tiny improvement [#METR-2944].
2016-11-22 23:55:45 +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
Alexey Milovidov
886919a5c9
Removed excessive part checks [#METR-22214].
2016-11-22 21:29:36 +03:00
Alexey Milovidov
3b635bf641
Merge branch 'master' of github.com:yandex/ClickHouse
2016-11-22 20:42:21 +03:00
Alexey Milovidov
a464f2303d
Better logic for ALTER in ReplicatedMergeTree [#METR-22214].
2016-11-22 20:41:45 +03:00
proller
e280569453
Everything [maybe] works!
2016-11-22 18:03:54 +03:00
proller
0b40a13ea7
Merge remote-tracking branch 'upstream/master' into METR-23466
2016-11-22 14:56:57 +03:00
Alexey Milovidov
e2b8236cf4
Fixed error [#METR-2944].
2016-11-20 16:17:51 +03:00
Alexey Milovidov
9018906e1a
Better [#METR-2944].
2016-11-20 15:43:20 +03:00
Alexey Milovidov
c38a9118b1
More tolerant to previous errors [#METR-22327].
2016-11-20 12:17:30 +03:00
Alexey Milovidov
60c62055ba
Added comment [#METR-22327].
2016-11-20 12:13:06 +03:00
Alexey Milovidov
c8c86208aa
Fixed error with ALTER of Enums in Nested fields [#METR-22442].
2016-11-20 11:57:11 +03:00
proller
61e6ee9100
Merge remote-tracking branch 'upstream/master' into METR-23466
2016-11-18 15:14:34 +03:00
Alexey Milovidov
ea0c752852
Investigated flappy test [#METR-23540].
2016-11-18 12:02:49 +03:00
Alexey Milovidov
ef85902daa
Little better [#METR-22327].
2016-11-18 06:15:49 +03:00
Alexey Milovidov
dfd7f54c1c
Little improvement in case of too much parts [#METR-22327].
2016-11-18 05:50:28 +03:00
Alexey Milovidov
e73e4e887a
Better logic when there is very large number of parts in non-replicated MergeTree [#METR-22327].
2016-11-18 05:34: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
Alexey Milovidov
cfcdb3f881
Added check [#METR-22327].
2016-11-18 03:20:22 +03:00
Alexey Milovidov
0700f53665
Fixed error with 'intersects previous part' [#METR-22327].
2016-11-18 03:19:35 +03:00
proller
278fbbb4da
Merge remote-tracking branch 'upstream/master' into METR-23466
2016-11-17 00:02:25 +03:00
Alexey Milovidov
866e64a65e
Fixed deadlock in test when many replicas on single server try to execute multiple attaches and wait for each other [#METR-23507].
2016-11-16 09:08:29 +03:00
Alexey Milovidov
d5155fbe7a
Added quota_key to query_log and processlist [#METR-23505].
2016-11-16 08:09:41 +03:00
Alexey Milovidov
bee6183d35
Fixed error [#METR-2944].
2016-11-16 08:05:14 +03:00
proller
8fec8e2ac4
simple get works
2016-11-16 02:55:45 +03:00
alexey-milovidov
52390b0180
Merge pull request #150 from ludv1x/METR-23101
...
clickhouse-local application and File(...) storage
2016-11-14 04:03:03 +04:00
Vitaliy Lyudvichenko
107f7b34c7
Added requested PR changes, 2nd iteration.
2016-11-14 02:57:18 +03:00
Alexey Milovidov
5b72f0956a
Setting level to zero after ATTACH [#METR-23438].
2016-11-11 20:33:43 +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
efa056fc77
Attempt to improve merge selecting algorithm [#METR-21840].
2016-11-05 04:11:51 +03:00
Alexey Milovidov
8ba7a32410
Fixed error with BackgroundProcesssingPool [#METRIKASUPP-7484].
2016-11-02 18:26:16 +03:00
Alexey Milovidov
22719b1114
MergeSelector: further [#METR-21840].
2016-11-01 23:30:40 +03:00
Alexey Milovidov
aaec9d1db6
Attempt for improvement [#METR-21840].
2016-11-01 22:20:24 +03:00
alexey-milovidov
d1f11af2c2
Merge pull request #151 from Civil/osx_compatibility
...
[WIP] Make it compilable on OS X
2016-11-01 21:09:48 +04: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
5d394a20a1
MergeSelector: changed logic of selection of parts for OPTIMIZE (more like it was before) [#METR-21841].
2016-11-01 18:22:04 +03:00
Alexey Milovidov
ecf2f6b6ab
MergeSelector: development [#METR-21841].
2016-11-01 14:27:29 +03: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
Alexey Milovidov
933c8f3d68
MergeSelector: development [#METR-21841].
2016-11-01 01:53:54 +03:00
Alexey Milovidov
573a84c89a
MergeSelector: development [#METR-21841].
2016-10-31 22:45:22 +03:00
Alexey Milovidov
49602c44a9
MergeSelector: development [#METR-21841].
2016-10-31 22:32:08 +03:00
Alexey Milovidov
4fd7183049
MergeSelector: fixed error [#METR-21841].
2016-10-31 22:11:09 +03:00
Alexey Milovidov
89328b498f
MergeSelector: development [#METR-21841].
2016-10-31 08:35:29 +03:00
Alexey Milovidov
bee00bfcfc
MergeSelector: development [#METR-21841].
2016-10-30 14:05:45 +03:00
Alexey Milovidov
a832a8cd71
MergeSelector: development [#METR-21840].
2016-10-30 11:54:27 +03:00
Alexey Milovidov
4dec8babf1
MergeSelector: development [#METR-21840].
2016-10-30 11:47:47 +03:00
Alexey Milovidov
bab6e9ea22
MergeSelector: development [#METR-21840].
2016-10-30 11:32:05 +03:00
Alexey Milovidov
1b2bbcd359
MergeSelector: development [#METR-21840].
2016-10-30 11:25:07 +03:00
Alexey Milovidov
ba48688f25
MergeSelector: development [#METR-21840].
2016-10-30 11:15:55 +03:00
Alexey Milovidov
c5c63bdf5d
MergeSelector: development [#METR-21840].
2016-10-30 06:39:28 +03:00
Alexey Milovidov
3d48f9d34b
MergeSelector: development [#METR-21840].
2016-10-30 06:12:25 +03:00
Alexey Milovidov
b5156a115d
Additions [#METR-21504].
2016-10-28 02:28:35 +03:00
Alexey Milovidov
74c3b30622
dbms: Simplified logic of selecting merges [#METR-21841].
2016-10-28 01:50:02 +03:00
Alexey Milovidov
687a6d1496
Addition to prev. revision [#METR-2944].
2016-10-25 09:57:12 +03:00
Alexey Milovidov
8be993bd1e
Preparation [#METR-2944].
2016-10-25 09:49:24 +03:00