Commit Graph

203 Commits

Author SHA1 Message Date
Vitaliy Lyudvichenko
4b566304ca Tests are passed. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
82af2278fc Avoid code duplication near MergeTreeBlockInputStream. [#CLICKHOUSE-2]
Add preferred_block_size_bytes for non-uniform reader. [#CLICKHOUSE-2902]

Make enums test more deterministic. [#CLICKHOUSE-2]

Refactored MergeTree readers.

Tabs -> spaces.

Move include/DB/ -> src/.
2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
74a92cb8d9 Add test for OPTIMIZE FINAL and more diagnostics. [#CLICKHOUSE-2886] 2017-04-04 15:54:21 +03:00
Alexey Milovidov
310736cd7e Moved headers and sources to same place [#CLICKHOUSE-3]. 2017-04-01 12:22:42 +03:00
Alexey Milovidov
137ad95929 Changed tabs to spaces in code [#CLICKHOUSE-3]. 2017-04-01 11:35:09 +03:00
Alexey Milovidov
4e67e05835 Fixed error [#CLICKHOUSE-2]. 2017-03-14 03:14:19 +03:00
Alexey Milovidov
26788e3938 Formatting [#CLICKHOUSE-2]. 2017-03-13 21:01:46 +03:00
f1yegor
401425bb89 translate comments 2017-03-12 20:18:07 +01:00
Vitaliy Lyudvichenko
1c38a89785 Add source_part_names column into system.merges. [#CLICKHOUSE-2145] 2017-01-24 22:26:29 +04:00
Vitaliy Lyudvichenko
07d720565c Added profile events for INSERTs. [#METR-23930]
Added new column and CurrentMetrics data into system.events table.
Removed unnecessary code from Context and Merge list. [#METR-23911]
2016-12-31 02:39:53 +03:00
Vitaliy Lyudvichenko
108bfac17e Added memory tracking events and columns for merges. [#METR-23911] 2016-12-31 02:39:53 +03:00
Vitaliy Lyudvichenko
ba2b32b0ad Added vertical_merge_algorithm_min_columns_to_activate option. [#METR-23783] 2016-12-22 16:19:03 +03:00
Vitaliy Lyudvichenko
e2bd364844 Added whole block optimization. [#METR-23783] 2016-12-22 16:19:02 +03:00
Alexey Milovidov
536f88ea55 Adjusted coefficients [#METR-23916]. 2016-12-22 05:04:32 +03:00
Alexey Milovidov
7ebbf72ca6 Removed unused variable [#METR-23305]. 2016-12-22 04:27:41 +03:00
Vitaliy Lyudvichenko
e39b41e158 Typo and codestyle fix. 2016-12-18 22:38:30 +03:00
Vitaliy Lyudvichenko
5aa1822fb2 Consecutive optimization for vertical merge. [#METR-23783] 2016-12-18 22:12:25 +03:00
Vitaliy Lyudvichenko
8835275713 More detail log for merges. [#METR-23770] [#METR-23769] [#METR-23783] 2016-12-18 22:12:25 +03:00
Vitaliy Lyudvichenko
876ad28dd8 Merge remote-tracking branch 'origin/master' into metrics_refinement 2016-12-12 19:17:23 +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
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
f8eb9028fd Refined query_log, processes and merges metrics.
Also, dbms/CMakeLists.txt was rewritten.
2016-12-09 13:11:25 +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
Vitaliy Lyudvichenko
202ba912ce Vertical merging algorithm for MergeTree engines. [#METR-23305] 2016-11-29 22:41:31 +03:00
Alexey Milovidov
8e5889cf0e Improved merge selecting algorithm for Replicated tables [#METR-23615]. 2016-11-25 01:41:27 +03:00
alexey-milovidov
8c2e228856 Revert "New "vertical" algorithm for MergeTrees' parts merges" 2016-11-24 23:08:54 +04: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
Alexey Milovidov
bba5dcbcfa Fixed deadlock [#METR-23557]. 2016-11-22 22:27:45 +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
ef85902daa Little better [#METR-22327]. 2016-11-18 06:15:49 +03:00
Alexey Milovidov
cfcdb3f881 Added check [#METR-22327]. 2016-11-18 03:20:22 +03: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
933c8f3d68 MergeSelector: development [#METR-21841]. 2016-11-01 01:53:54 +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
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
924402f33e dbms: Server: merged from master [#METR-19266] 2016-10-19 18:00:56 +03:00
Alexey Milovidov
867b73b6b0 Fixed error with cancelling merges on ALTERs [#METR-22524]. 2016-08-26 22:50:04 +03:00
Alexey Milovidov
0cf32c8aed Renamed method [#METR-22400]. 2016-08-13 05:21:17 +03:00
Alexey Arno
531ff3d5ac dbms: Merged with master [#METR-19266] 2016-08-05 18:44:19 +03:00
Alexey Milovidov
6f4fc79cde Better [#METR-2944]. 2016-07-31 06:53:16 +03:00
Alexey Arno
beeeb0ab13 dbms: NULL support for MergeTree [#METR-19266] 2016-07-21 19:22:24 +03:00
Alexey Milovidov
a4a543f1c3 Merge branch 'master' of github.com:yandex/ClickHouse 2016-05-30 21:24:35 +03:00
Alexey Milovidov
d03d19ab57 Updated comment [#METR-2944]. 2016-05-30 21:24:19 +03:00
Alexey Milovidov
3c1c9d46f7 Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 15:22:22 +03:00
Alexey Milovidov
c4407306d5 Always materialize columns while merge [#METR-21119]. 2016-05-18 05:49:52 +03:00
Alexey Milovidov
093f69c45d Added support for FINAL and PARTITION specification for OPTIMIZE query [#METR-21326]. 2016-05-16 21:43:38 +03:00
Alexey Milovidov
07f04d70d3 Merge 2016-04-24 12:44:47 +03:00
Alexey Milovidov
55b580f882 More profile events [#METR-2944]. 2016-04-23 05:39:40 +03:00
Alexey Milovidov
2bb5a4749b Merge 2016-04-15 22:09:42 +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 Milovidov
f41bba57a5 Better [#METR-20691]. 2016-04-01 02:49:31 +03:00
Alexey Milovidov
e1a80f5ded Added support for case when merged data differs from data on another replicas [#METR-20670]. 2016-03-31 04:25:16 +03:00
Alexey Milovidov
04875a022a Removed code for freezing partitions due to unacceptable implementation [#METR-20656]. 2016-03-29 22:39:44 +03:00
Alexey Arno
32a38485e6 Merge 2016-03-25 14:48:45 +03:00
Alexey Milovidov
a75b6ca3dd Fixing warnings on clang [#METR-2807]. 2016-03-07 07:43:14 +03:00
Alexey Arno
6efc98d1f3 Merge 2016-03-01 20:47:53 +03:00
Alexey Arno
113b592380 Merge 2016-01-28 19:06:57 +03:00
Alexey Milovidov
67a07205b7 Merge 2016-01-28 04:00:27 +03:00
Alexey Milovidov
5c90d7d45c Merge 2016-01-26 05:00:25 +03:00
Alexey Arno
a3ea32b985 Merge 2016-01-21 19:30:05 +03:00
Alexey Milovidov
13c7d0983a dbms: cutting dependency [#METR-2944].. 2016-01-12 00:46:36 +03:00
Alexey Milovidov
a5b8166541 dbms: better [#METR-19586]. 2016-01-10 07:43:30 +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
a78ac9c6ee dbms: addition to prev. revision [#METR-18099]. 2015-09-20 09:35:28 +03:00
Alexey Milovidov
615181b3a6 dbms: added last_queue_update column to system.replicas table; clarifications [#METR-17573]. 2015-09-20 08:21:43 +03:00
Alexey Milovidov
a53f7473d3 dbms: removed misleading error messages about canceled merges [#METR-18087]. 2015-09-18 09:39:39 +03:00
Alexey Milovidov
f1655cc62f Merge 2015-08-18 00:09:36 +03:00
Alexey Arno
992e7dc7a5 Merge 2015-07-08 02:11:30 +03:00
Alexey Arno
37f008afd0 dbms: Server: Added support for multiple time zones: part 1 (does not add any new functionality, does not change current functionality) [#METR-15618] 2015-06-26 18:11:31 +03:00
Alexey Milovidov
7f0e6fd3c1 Merge 2015-06-11 03:35:36 +03:00
Alexey Milovidov
124a12095a dbms: added support for selecting stronger compression method [#METR-15386]. 2015-04-17 08:35:53 +03:00
Alexey Milovidov
114b3de689 dbms: cut dependencies [#METR-2944]. 2015-04-16 09:12:35 +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 Milovidov
62ff76c572 Merge 2015-04-10 20:54:52 +03:00
Alexey Milovidov
794ee4baf0 dbms: added line feeds [#METR-2944]. 2015-04-10 20:54:33 +03:00
Alexey Arno
b5c1932b8c Merge 2015-04-10 20:51:39 +03:00
Alexey Arno
c7ab47d84d dbms: Server: min_bytes_to_use_direct_io = 0 means no AIO; various cleanups. [#METR-15090] 2015-04-10 20:09:16 +03:00
Alexey Arno
5cd9ed0582 dbms: Server: Added support for the client-side parameter min_bytes_to_use_direct_io in OPTIMIZE. [#METR-15090] 2015-04-10 18:31:51 +03:00
Alexey Arno
7aa5d023eb dbms: Server: feature development. [#METR-15090] 2015-04-08 19:48:47 +03:00
Alexey Milovidov
291d9daabf Merge 2015-03-14 05:37:53 +03:00
Alexey Milovidov
5c69667f2a dbms: different compression methods on merge: preparation [#METR-15386]. 2015-03-14 05:36:39 +03:00
Alexey Milovidov
b828604a5f Merge 2015-03-14 00:31:23 +03:00
Alexey Milovidov
a9eb28c07d Using std::make_unique [#METR-2807]. 2015-02-11 00:10:58 +03:00
Alexey Milovidov
bba4b0c66c dbms: removed rare-useful repetitive log messages [#METR-2944]. 2014-12-21 04:27:56 +03:00
Andrey Mironov
338314c9c6 dbms: stop merges on ALTER. [#METR-14032] 2014-12-17 16:14:24 +03:00
Alexey Milovidov
a359b09c83 dbms: fixed misleading variable name [#METR-2944]. 2014-11-30 06:21:01 +03:00