Commit Graph

349 Commits

Author SHA1 Message Date
Alexey Zatelepin
c61d4106e8 allow loading all MergeTree settings from a query [#CLICKHOUSE-3000] 2017-10-20 21:28:45 +03:00
Alexey Zatelepin
a7c85e0c89 save index_granularity to ATTACH query if it wasn't set explicitly [#CLICKHOUSE-3000] 2017-10-20 21:28:44 +03:00
Alexey Zatelepin
75c65c7b59 use extended storage definition syntax for MergeTree engines [#CLICKHOUSE-3000] 2017-10-20 21:28:42 +03:00
Marek Vavruša
2ac5a743cc dbms: fix build with OS X built-in clang
The built-in clang doesn’t support value() for
`std::experimental::optional`. It however supports
dereference operator, which is basically the
same thing:

```
/clickhouse/dbms/src/DataStreams/NullableAdapterBlockInputStream.cpp:83:67: error: call to unavailable member function 'value':
                    res.insert({elem.column, elem.type, rename[i].value()});
                                                        ~~~~~~~~~~^~~~~
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/experimental/optional:547:17: note: candidate function has been explicitly made unavailable
    value_type& value()
                ^
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/experimental/optional:539:33: note: candidate function has been explicitly made unavailable
    constexpr value_type const& value() const
```
2017-10-13 18:12:29 -07:00
proller
49f8080e52 Small debud improvement 2017-10-13 21:44:26 +03:00
Amos Bird
f30841d5ab Fix SummingMergeTree argument checking logic.
This patch fixes the Nested Column Name checking logic, which allows nested
columns be explicitly specified in SummingMergeTree engine.
2017-10-13 15:42:32 +03:00
Vladimir Chebotarev
1e0241e262 dbms: CompressionSettingsSelector. [#METR-21516] 2017-10-13 04:08:23 +03:00
KochetovNicolai
83925f1d5e Fix array writing (#1314)
* changed MergedBlockOutputStream [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* disabled checkNoMultidimensionalArrays [#CLICKHOUSE-3341]

* fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341]

* fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341]

* fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341]

* fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341]

* added test [#CLICKHOUSE-3341]

* fixed test [#CLICKHOUSE-3341]

* refactoring and comments [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* Update ColumnArray.h
2017-10-12 23:13:26 +03:00
Alexey Milovidov
d468473d62 Fixed FREEZE PARTITION: using only active data parts; acquire snapshot of parts [#CLICKHOUSE-3369]. 2017-10-12 21:21:17 +03:00
Alexey Zatelepin
6e57272052 don't use partition value as a prefix for FREEZE PARTITION [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
61f0b32757 forbid ALTER of partition key columns for now [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
1be62b567e safeguards to protect against distinct partition values with the same partition_id [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
728a23f60e allow creation of custom-partitioned tables with experimental syntax [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
a10ba0cd91 serialize partition key in Replicated tables metadata [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
909b46de0f add MergeTreeDataFormatVersion constant [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
68cb592277 allow arbitrary partition literals in ALTER PARTITION queries [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
f0995f2741 partition serialization into id and text [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
25bb444d5a absence of partitioning works [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
e9f93028b8 serialize partition and minmax index values [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
2f80c150db save MergeTree data format version and parse part names depending on it [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Milovidov
40884640a1 Merge branch 'master' of github.com:yandex/ClickHouse 2017-09-01 21:21:05 +03:00
Alexey Milovidov
2af8747164 Removed obsolete code [#CLICKHOUSE-3270]. 2017-09-01 21:21:01 +03:00
alexey-milovidov
775d95888a Merge pull request #1163 from yandex/CLICKHOUSE-2931
Introduce SYSTEM queries
2017-09-01 20:45:29 +03:00
Alexey Zatelepin
d2847f22af PR fixes [#CLICKHOUSE-3000] 2017-08-31 23:32:03 +03:00
Alexey Zatelepin
61987df169 check alter of partition key columns [#CLICKHOUSE-3000] 2017-08-31 23:32:03 +03:00
Alexey Zatelepin
645e4b7a53 generalize MinMax index [#CLICKHOUSE-3000] 2017-08-31 23:32:03 +03:00
Alexey Zatelepin
5471979f46 generic partitioning of inserted blocks [#CLICKHOUSE-3000] 2017-08-31 23:32:03 +03:00
Alexey Zatelepin
be1c62d7f8 split partition and minmax index [#CLICKHOUSE-3000] 2017-08-31 23:32:03 +03:00
Alexey Zatelepin
99969ab77a Introduce MergeTreePartitionIndex. Isolate its loading code. [#CLICKHOUSE-3000] 2017-08-31 23:32:03 +03:00
alexey-milovidov
5d14855989 Merge branch 'master' into CLICKHOUSE-2931 2017-08-31 00:23:39 +03:00
Vitaliy Lyudvichenko
84660029ec Don't leave trash part nodes in ZK in case of deleting non-existing duplicated parts. [#CLICKHOUSE-3252] 2017-08-29 20:49:37 +03:00
Vitaliy Lyudvichenko
48f5d8f1a3 Add SYSTEM DROP DNS CACHE. [#CLICKHOUSE-2931] 2017-08-28 20:27:16 +03:00
Alexey Milovidov
3a86673aea Fixed error when part could become broken during ALTER MODIFY of element of Nested column [#CLICKHOUSE-3232]. 2017-08-16 22:41:52 +03:00
Alexey Milovidov
164ad05ae1 Little better [#CLICKHOUSE-3231]. 2017-08-16 22:22:49 +03:00
Alexey Zatelepin
0df4ae6b02 do not use unnecessary temporary objects to query a set of parts [#CLICKHOUSE-3000] 2017-08-15 22:30:52 +03:00
Alexey Zatelepin
f25f0cd759 reduce number of places where partitioning by month is assumed [#CLICKHOUSE-3000] 2017-08-15 22:30:52 +03:00
Vitaliy Lyudvichenko
10c14cfccb Small code enhancements according to clang-tidy. [#CLICKHOUSE-2931] 2017-08-04 17:35:36 +03:00
alexey-milovidov
ae8783aee3 Merge pull request #1045 from prog8/nocompression
Added compression NONE
2017-08-01 23:07:52 +03:00
Pawel Rog
d6a2056851 Applied changes requested by Alexey 2017-08-01 16:48:24 +02:00
Pawel Rog
9f799820d9 Applied changes requested by Alexey 2017-08-01 10:12:15 +02:00
Alexey Milovidov
6578fb2645 Fixed error [#CLICKHOUSE-3191]. 2017-08-01 00:39:24 +03:00
alexey-milovidov
4877aa394c Update MergeTreeData.cpp 2017-07-31 20:44:41 +03:00
Pawel Rog
3a6c444996 Merge branch 'master' into nocompression 2017-07-31 13:36:58 +02:00
Pawel Rog
e1ab721d3d Use compression method from configs 2017-07-31 13:12:28 +02:00
Pawel Rog
a0cc54457e Added compression NONE 2017-07-31 12:44:45 +02:00
Alexey Milovidov
dd1f54bce2 Changed Poco::RWLock to std::shared_lock [#APRILDEV-91]. 2017-07-28 20:34:02 +03:00
alexey-milovidov
d4d266fa18 ColumnConst unification (#1011)
* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* Fixed error in ColumnArray::replicateGeneric [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].
2017-07-21 09:35:58 +03:00
Nikolai Kochetov
283810e8ab merged with master 2017-07-13 23:59:34 +03:00
Nikolai Kochetov
75be0b81d8 removed typeid_cast from IColumn.h 2017-07-13 23:58:19 +03:00
Nikolai Kochetov
8c65d6013e added preferred_max_column_in_block_size_bytes setting, added filtration ratio prediction [#CLICKHOUSE-3065] 2017-07-13 21:45:09 +03:00
Vitaliy Lyudvichenko
b843ea5b3f Resolves #964. Fixed input_format_skip_unknown_fields for negative numbers. [#CLICKHOUSE-3] 2017-07-11 21:36:51 +03:00
Guillaume Tassery
cba9815981 Change Uuid to UUID datatype and make UInt128 a generic type 2017-07-04 12:42:53 +02:00
Guillaume Tassery
525851ec68 sync master 2017-06-30 22:21:42 +02:00
Guillaume Tassery
1231952fca Implement UUID type and toUuid function 2017-06-30 22:01:27 +02:00
Alexey Milovidov
90a1ae1062 Fixed error in prev. revision [#CLICKHOUSE-3091]. 2017-06-25 05:22:10 +03:00
Alexey Milovidov
8228acd3ea Removed obsolete code that was relevant only in extremely rare case of transforming CollapsingMergeTree to ReplicatedCollapsingMergeTree through ATTACHing data parts and while some considerations about data order in table is important [#CLICKHOUSE-3091]. 2017-06-25 03:51:51 +03:00
Alexey Milovidov
6eb06774d3 Addition to prev. revision [#CLICKHOUSE-3091]. 2017-06-22 19:29:15 +03:00
Alexey Milovidov
c96719685c Lowered max_delay_to_insert to one second, because higher values are non practical and could be harmful for usual failover logic in client apps [#CLICKHOUSE-3091]. 2017-06-22 19:17:01 +03:00
Alexey Milovidov
7bdc87adf0 Loosened threshold on broken parts in filesystem [#CLICKHOUSE-3076]. 2017-06-21 22:11:11 +03:00
Alexey Milovidov
5c322f5756 Loosened threshold on amount of replica inconsistency to refuse server startup [#CLICKHOUSE-3076]. 2017-06-21 22:07:08 +03:00
Alexey Milovidov
604de2bfeb Better [#DEVTOOLS-3381]. 2017-06-21 04:24:05 +03:00
Vitaliy Lyudvichenko
1a4b0eb355 Remove tmp part directories on server start. [#CLICKHOUSE-3044] 2017-05-31 18:01:25 +03:00
Vitaliy Lyudvichenko
1e29795cf9 Fix race condition between cleanup and fetch thread. [#CLICKHOUSE-2989]
It was happening during ALTERs.
TODO: stop fetches during ALTER.
2017-05-25 13:08:52 +03:00
Vitaliy Lyudvichenko
d9637c2980 MergeTreeDataPart refactoring. [#CLICKHOUSE-2989]
Use relative_path to store actual part path.
Use renameTo() to move parts.
2017-05-24 23:23:58 +03:00
Vitaliy Lyudvichenko
5618234ee8 Separate tmp part dirs for merges, fetches and inserts. [#CLICKHOUSE-2989] 2017-05-24 23:23:58 +03:00
alexey-milovidov
e7b7f6f73d Update MergeTreeData.cpp 2017-05-15 10:34:40 +04:00
Vitaliy Lyudvichenko
6262fc8650 Fix inccorect columns size in MergeTreeData after ALTER. [#CLICKHOUSE-2] 2017-05-15 10:34:40 +04:00
Alexey Milovidov
a7b9a12759 Returned back Increment and CounterInFile, because they are still needed [#CLICKHOUSE-2]. 2017-05-10 04:08:32 -04:00
Alexey Milovidov
5ca7650c86 Removed Increment and CounterInFile [#CLICKHOUSE-2]. 2017-05-10 02:49:19 -04:00
Alexey Milovidov
0b5645db1a Better code for parsing part names [#CLICKHOUSE-2]. 2017-04-18 23:38:07 +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
e1c9878c34 more descriptive exception message [#CLICKHOUSE-2927] 2017-04-12 18:07:58 +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
65beb6f961 Added support for NULLS FIRST and LAST in ORDER BY (continued) [#CLICKHOUSE-2882]. 2017-03-12 16:03:07 +03: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
Alexey Milovidov
7bf5373390 Added comments [#CLICKHOUSE-2831]. 2017-02-13 01:07:38 +03: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
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
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
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
2b4f3b5d34 Renamed method (less confusion) [#METR-2944]. 2017-01-02 23:12:12 +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
Alexey Milovidov
9018906e1a Better [#METR-2944]. 2016-11-20 15:43:20 +03:00
Alexey Milovidov
c8c86208aa Fixed error with ALTER of Enums in Nested fields [#METR-22442]. 2016-11-20 11:57:11 +03:00
Alexey Milovidov
ef85902daa Little better [#METR-22327]. 2016-11-18 06:15:49 +03:00
Alexey Milovidov
0700f53665 Fixed error with 'intersects previous part' [#METR-22327]. 2016-11-18 03:19:35 +03:00
Alexey Milovidov
ba48688f25 MergeSelector: development [#METR-21840]. 2016-10-30 11:15:55 +03:00