Commit Graph

830 Commits

Author SHA1 Message Date
Alexey Milovidov
e0b141e3eb Do not remove temporary directory on fetch [#CLICKHOUSE-2894]. 2017-04-29 01:26:39 +03:00
proller
bcb230ebc6 Fix incudes, move code from daemon/OwnPatternFormatter.h 2017-04-27 08:40:27 +03:00
Alexey Milovidov
110defd56f Disabled replicated max parallel fetches/sends, because it does not work properly [#CLICKHOUSE-2960]. 2017-04-20 21:38:17 +03:00
Alexey Milovidov
ee6a7ee204 Allow to disable replicated max parallel fetches/sends [#CLICKHOUSE-2960]. 2017-04-20 21:37:01 +03:00
Alexey Zatelepin
ba254a082e Merge branch 'master' into lagging-replicas-failover
Conflicts:
	dbms/src/Core/ErrorCodes.cpp
2017-04-19 21:31:29 +03:00
Alexey Milovidov
0b5645db1a Better code for parsing part names [#CLICKHOUSE-2]. 2017-04-18 23:38:07 +03:00
Alexey Milovidov
502f42a572 Fixed translation error [#CLICKHOUSE-3]. 2017-04-18 22:13:12 +03:00
Yuri Dyachenko
8fb2b7ee3d fix zookeeper format version 4 2017-04-17 21:15:14 +03:00
alexey-milovidov
9d3e3675fd Update ReplicatedMergeTreeLogEntry.h 2017-04-17 21:15:14 +03:00
alexey-milovidov
acd3c3d4ab Update MergeTreeDataMerger.cpp 2017-04-17 21:15:14 +03:00
Yuri Dyachenko
8792c4f3ca add 'deduplicate' flag into zookeeper 'merge' Entry 2017-04-17 21:15:14 +03:00
Yuri Dyachenko
10082f3ef4 support DEDUPLICATE option in OPTIMIZE query 2017-04-17 21:15:14 +03:00
Yuri Dyachenko
5e61448f25 add support DEDUPLICATE to MergeTreeDataMerger 2017-04-17 21:15:14 +03:00
Alexey Zatelepin
2bd089d589 start counting absolute replica delay when there are problems with queue update [#CLICKHOUSE-2141] 2017-04-17 18:06:12 +03:00
f1yegor
0b243a8b01 translate comments 2017-04-16 23:17:32 +03:00
Alexey Milovidov
676192f16e Fixed errors on clang [#CLICKHOUSE-2902]. 2017-04-15 07:03:12 +03:00
alexey-milovidov
7fcf570c43 Update MergeTreeDataPart.cpp 2017-04-15 06:48:24 +03:00
alexey-milovidov
5a7a155ca1 Update MergeTreeBlockReadUtils.cpp 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
8b54e9fc65 Removed extra diagnostic log messages. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
848c927bb7 Fix race condition. Add test. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
56b00a110a Removed debug code and add docs. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
c78177a28a More accurate prediction. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
f519100946 Split base and derived class implementations. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
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
Alexey Zatelepin
eb4f895ea5 fix integer overflow [#CLICKHOUSE-2927] 2017-04-12 19:10:06 +03:00
Alexey Zatelepin
0e6c38bd63 throw exception for invalid MergeTreeSettings config values [#CLICKHOUSE-2927] 2017-04-12 18:07:58 +03:00
Alexey Zatelepin
e1c9878c34 more descriptive exception message [#CLICKHOUSE-2927] 2017-04-12 18:07:58 +03:00
proller
38e9254d33 fix http methods for ReadWriteBufferFromHTTP (#675) 2017-04-11 17:13:19 +03:00
Alexey Milovidov
a0b9bf5e97 Moved code to cpp [#CLICKHOUSE-2]. 2017-04-08 04:32:05 +03:00
proller
adba3b8e6d delete ReadBufferFromHTTP, use ReadWriteBufferFromHTTP instead 2017-04-06 22:39:25 +03:00
proller
1bc311eefd ReplicatedMergeTree: Max streams to send data [#CLICKHOUSE-2878] (#656)
* ReplicatedMergeTree: Max streams to send data [#CLICKHOUSE-2878]

* fix

* better messages on client

* change code to 429 TOO_MANY_REQUESTS

* wip

* better message

* Update InterserverIOHandler.h

* Update InterserverIOHTTPHandler.cpp

* Update StorageReplicatedMergeTree.cpp
2017-04-06 16:03:23 +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
4f44445ff0 Removed all trailing whitespaces [#CLICKHOUSE-2]. find . -name '*.h' -or -name '*.cpp' -or -name '*.cmake' -or -name 'CMakeLists.txt' -or -name '*.html' -or -name '*.xml' | grep -v contrib | xargs sed -i -r -e 's/\s+$//' 2017-03-31 19:00:30 +03:00
Ravengg
a973e3898d Add remove for part log (#638)
* Add REMOVE_PART

* fix

* fix

* fix codestyle
2017-03-28 20:18:49 +03:00
Alexey Milovidov
e6a41a0256 Fixed error with NULLs [#CLICKHOUSE-2901]. 2017-03-24 07:42:36 +03:00
Alexey Milovidov
c21b4c52c5 Misc [#CLICKHOUSE-3]. 2017-03-21 21:39:07 +03:00
Ravengg
b47cc72701 Fix part log (#591)
* fix_part_log

* fixed language back

* add reset part_log back

* reset part_log when don't need more

* Fix header

* fix
2017-03-14 19:58:34 +04:00
Alexey Milovidov
4e67e05835 Fixed error [#CLICKHOUSE-2]. 2017-03-14 03:14:19 +03:00
Alexey Milovidov
f9b4b2012f Removed zero-width spaces [#CLICKHOUSE-2]. 2017-03-13 21:02:45 +03:00
Alexey Milovidov
26788e3938 Formatting [#CLICKHOUSE-2]. 2017-03-13 21:01:46 +03:00
Alexey Milovidov
a6a18db6da Merge branch 'translate/comments' of https://github.com/f1yegor/ClickHouse into f1yegor-translate/comments 2017-03-13 20:51:22 +03:00
f1yegor
401425bb89 translate comments 2017-03-12 20:18:07 +01:00
Alexey Milovidov
65beb6f961 Added support for NULLS FIRST and LAST in ORDER BY (continued) [#CLICKHOUSE-2882]. 2017-03-12 16:03:07 +03:00
Alexey Milovidov
7532a1d564 Added support for NULLS FIRST and LAST in ORDER BY [#CLICKHOUSE-2882]. 2017-03-12 15:56:59 +03:00
alexey-milovidov
6d5bfc8c6f Refactoring of numeric DataTypes (#581)
* Better code [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].
2017-03-12 14:13:45 +04:00
Ravengg
b079dacfd1 Added part_log with statistics scripts (#549)
* Added part_log

* first_test

* filter and hits_res

* Add renamer and drawer

* Add columns database and table into PartLog

* Add normal way to get table_name and database_name from part

* improve drawer

* add stats for random size parts

* Merge converter and drawer

* make drawer more informative

* add new data

* add new data

* new data

* add long range stats

* for checking best way

* Add add_parts script

* Good style for global merge

* delete commented code

* Fixed spaces to tabs

* Note that Stopwatch is started automatically.

* Style

* Update StorageMergeTree.cpp

* Update StorageReplicatedMergeTree.cpp

* Switch act_time_ms to duration_ms

* Added ability to disable part_log

* fixed getPartLog

* fix usage getPartLog

* fix
2017-03-07 21:13:54 +04:00
Alexey Zatelepin
7090d0861a reinitialize primary key after ALTER [#CLICKHOUSE-2853] 2017-02-21 21:32:04 +04:00
Vitaliy Lyudvichenko
8bcb1fe970 Add support of AggregateFunction constants in VALUES and Set. [#CLICKHOUSE-2845] 2017-02-18 00:36:31 +04:00
Alexey Milovidov
354bed5bd7 Merge branch 'master' of github.com:yandex/ClickHouse 2017-02-13 19:12:46 +03:00
Alexey Milovidov
db9935337c Misc [#CLICKHOUSE-2]. 2017-02-13 19:12:34 +03:00
Alexey Milovidov
bb7247993a Merge branch 'uncompressed-size-in-system-tables' 2017-02-13 01:08:31 +03:00
Alexey Milovidov
7bf5373390 Added comments [#CLICKHOUSE-2831]. 2017-02-13 01:07:38 +03:00
Alexey Milovidov
c9b4a163be Added info about uncompressed size to system.columns table [#CLICKHOUSE-2831]. 2017-02-12 01:31:22 +04:00
alexey-milovidov
4593d363d1 Fix poor distributed insertion scalability (#481)
* Fix poor scalability of INSERT into Distributed table [#CLICKHOUSE-2791].

* Fix poor scalability of INSERT into Distributed table (continued) [#CLICKHOUSE-2791].

* Misc [#CLICKHOUSE-2791].

* Fixed error [#CLICKHOUSE-2791].
2017-02-12 00:20:57 +04:00
Alexey Milovidov
30737aa7a1 Added info about uncompressed size to system.columns table [#CLICKHOUSE-2831]. 2017-02-11 20:43:28 +03:00
Alexey Zatelepin
9918965c5f Allow metadata-only ALTER of primary key columns [#CLICKHOUSE-2027] 2017-02-10 22:19:40 +04:00
Alexey Zatelepin
7b57402291 allow ALTERing Enum types in primary key columns [#CLICKHOUSE-2795] 2017-02-10 22:19:40 +04:00
Alexey Zatelepin
6b47ac1fc0 translate comments [#CLICKHOUSE-3] 2017-02-10 09:05:33 +04:00
Alexey Zatelepin
aace171ef6 forbid multidimensional array columns in MergeTree tables [#CLICKHOUSE-2803] 2017-02-10 09:05:33 +04:00
Alexey Zatelepin
8d001db5d5 forbid altering of date column in MergeTree engines 2017-02-10 09:05:33 +04:00
Alexey Milovidov
d95663865f Miscellaneous [#CLICKHOUSE-2]. 2017-02-09 02:56:40 +03:00
Alexey Zatelepin
4ecfd44015 [#CLICKHOUSE-2115] PR changes:
* do not insert produced value into the cache if the cache has been reset.
* less logging
* cosmetic fixes
2017-01-31 22:45:10 +04:00
Alexey Zatelepin
0fdcdd7bdb Introduce LRUCache::getOrSet(), use it to avoid mark cache stampede [#CLICKHOUSE-2115] 2017-01-31 22:45:10 +04:00
Vitaliy Lyudvichenko
b1bccb0bb2 Query KILL QUERY. [#CLICKHOUSE-2120] 2017-01-27 03:59:39 +04:00
Alex Zatelepin
543b6ee757 ensure that all streams point to to_mark after reading even if max_rows_to_read is zero [#CLICKHOUSE-2775] (#396) 2017-01-25 23:16:31 +04:00
Alexey Zatelepin
281744667d use common cur_mark_idx for all streams [#CLICKHOUSE-2116] 2017-01-25 00:48:58 +04:00
Alexey Zatelepin
dc1f0d96bd add clarifying comment [#CLICKHOUSE-2116] 2017-01-25 00:48:58 +04:00
Alexey Zatelepin
f7ca39da77 translate comments [#CLICKHOUSE-3] 2017-01-25 00:48:58 +04:00
Alexey Zatelepin
32e5713822 do not load marks when reading the whole part [#CLICKHOUSE-2116] 2017-01-25 00:48:58 +04:00
Vitaliy Lyudvichenko
1c38a89785 Add source_part_names column into system.merges. [#CLICKHOUSE-2145] 2017-01-24 22:26:29 +04:00
alexey-milovidov
ed5b521110 Less dependencies 2 (#378)
* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].
2017-01-21 08:24:28 +04:00
Alexey Milovidov
5c1ae060a4 Miscellaneous [#CLICKHOUSE-2761]. 2017-01-20 05:22:18 +03:00
Alexey Milovidov
ffed6b1d5e Added one more column to system.parts [#CLICKHOUSE-2757]. 2017-01-17 23:54:32 +03:00
Alexey Milovidov
e407bf879c system.parts: added a column for primary key size in bytes in RAM [#CLICKHOUSE-2757]. 2017-01-17 23:49:16 +03:00
Alexey Milovidov
58e5dad1a1 Squashed commit of the following:
commit e712f469a5
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:59:13 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 2a00282308
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:58:30 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 9e06f407c8
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:55:14 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 9581620f1e
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:54:22 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 2a8564c68c
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:47:34 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit cf60632d78
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:40:09 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit ee3d1dc6e0
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:22:49 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 65592ef711
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:18:17 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 37972c2573
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:17:06 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit dd909d1499
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:16:28 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 3cf43266ca
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:15:42 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 6731a3df96
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:13:35 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 1b5727e0d5
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:11:18 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit bbcf726a55
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:09:04 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit c03b477d5e
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:06:30 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 2986e2fb04
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:05:44 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 5d6cdef13d
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:04:53 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit f2b819b25c
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:01:47 2017 +0300

    Less dependencies [#CLICKHOUSE-2]
2017-01-14 12:00:19 +03:00
artpaul
402f974fb7 fix where <const> in (<const>) expression; [#METR-24043] 2017-01-10 19:16:37 +05:00
Alexey Milovidov
d89ee33ce2 Squashed commit of the following:
commit c567d4e1fe
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:35:01 2017 +0300

    Style [#METR-2944].

commit 26bf3e1228
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:33:11 2017 +0300

    Miscellaneous [#METR-2944].

commit eb946f4c6f
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:30:19 2017 +0300

    Miscellaneous [#METR-2944].

commit 78c867a147
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:11:41 2017 +0300

    Miscellaneous [#METR-2944].

commit 6604c5c83c
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:56:15 2017 +0300

    Miscellaneous [#METR-2944].

commit 23fbf05c1d
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:47:52 2017 +0300

    Miscellaneous [#METR-2944].

commit 98772faf11
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:46:05 2017 +0300

    Miscellaneous [#METR-2944].

commit 3dc636ab9f
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:39:46 2017 +0300

    Miscellaneous [#METR-2944].

commit 3e16aee954
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:38:03 2017 +0300

    Miscellaneous [#METR-2944].

commit ae7e7e90eb
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:34:15 2017 +0300

    Miscellaneous [#METR-2944].
2017-01-06 20:41:19 +03:00
Alexey Milovidov
f7fa5b73b9 Changed names of files with NULL-related data to be more consistent [#METR-19266]. 2017-01-04 07:15:38 +03:00
Alexey Milovidov
1f3aeb066a Renamed methods for bulk binary serialization (continued) [#METR-2944]. 2017-01-03 02:08:09 +03:00
Alexey Milovidov
701ca28c85 Renamed methods for bulk binary serialization [#METR-2944]. 2017-01-03 01:47:28 +03:00
Alexey Milovidov
3fbb597694 Addition to prev. revision [#METR-2944]. 2017-01-02 23:52:30 +03:00
Alexey Milovidov
ca37f28b5f Renamed methods Block::rows and Block::rowsInFirstColumn [#METR-2944]. 2017-01-02 23:45:27 +03:00
Alexey Milovidov
2b4f3b5d34 Renamed method (less confusion) [#METR-2944]. 2017-01-02 23:12:12 +03: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
Alexey Milovidov
baf29f5c48 NULLs support: fixed totally wrong code [#METR-19266]. 2016-12-30 08:13:14 +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
Alexey Milovidov
54587fec1b Tracking memory used in merges [#METR-23888]. 2016-12-20 05:29:35 +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
c1ecc41804 Fixed error after merge [#METR-19266]. 2016-12-12 10:25:31 +03:00
Alexey Milovidov
54af522de1 Preparation [#METR-2944]. 2016-12-12 10:24:56 +03:00
Alexey Milovidov
8a69df19c4 Fixed error after merge [#METR-19266]. 2016-12-12 09:00:37 +03:00
Alexey Milovidov
de82683197 Fixed build on clang [#METR-2944].[C 2016-12-12 08:56:34 +03:00
Alexey Milovidov
31c4636538 Using internal boost library [#METR-2944]. 2016-12-12 07:59:19 +03:00
Alexey Milovidov
d605bfdc9d Using internal boost library [#METR-2944]. 2016-12-12 07:57:09 +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
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
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
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
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
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
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