thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 05:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,854 Commits 9,136 Branches 1,774 Tags 2 GiB
4c55802552
Commit Graph

15077 Commits

Author SHA1 Message Date
chertus
1a7313eaa0 resolve class name conflict 2018-12-05 15:27:21 +03:00
chertus
3db00b7b98 Merge branch 'master' into issue-3578 2018-12-05 14:43:14 +03:00
Nikolai Kochetov
a451a9282b Fix deadlock in DatabaseOrdinary in case of exception while loading tables. 2018-12-05 14:20:55 +03:00
chertus
dcb003bebf fix for review: rename variable CLICKHOUSE-3578 2018-12-04 23:10:43 +03:00
chertus
a71d03737c send defaults via serialized ColumnsDescription CLICKHOUSE-3578 2018-12-04 23:03:04 +03:00
alexey-milovidov
1d7948c7bf
Merge pull request #3749 from proller/fix14 
Fix dmesg error netlink: '...': attribute type 1 has an invalid length.
 2018-12-04 20:36:26 +03:00
alexey-milovidov
b6ea2d5396
Merge pull request #3751 from abyss7/issues/3583 
Fix `RangeHashedDictionary` getter against `ColumnConst`
 2018-12-04 20:28:39 +03:00
chertus
933c055104 CLICKHOUSE-3578 review proress 2018-12-04 17:09:47 +03:00
chenxing.xc
8256c19b29 address comments 2018-12-04 21:19:00 +08:00
Ivan Lezhankin
6089b26ef0 Fix |RangeHashedDictionary| getter against |ColumnConst| 2018-12-04 16:15:20 +03:00
proller
65e1e2af13 Fix dmesg error netlink: '...': attribute type 1 has an invalid length. 2018-12-04 15:18:37 +03:00
Nikolai Kochetov
2723b0efbf Fix build. 2018-12-04 15:12:52 +03:00
Nikolai Kochetov
b87d81512f Fix merging aggregate data for NULL key. 2018-12-04 13:31:15 +03:00
Nikolai Kochetov
730796dc38 Fix merging aggregate data for NULL key. 2018-12-04 13:29:27 +03:00
Nikolai Kochetov
de524a0158 Fix merging aggregate data for NULL key. 2018-12-04 13:27:44 +03:00
root
6da945b2a7 fix integration test_insert_into_distributed allow_experimental_low_cardinality_type 2018-12-04 15:11:39 +08:00
chenxing.xc
b4ee9cf17b address comments 2018-12-04 11:48:38 +08:00
root
192092c2bd fix test 00800_low_cardinality_distributed_insert.sql cluster 2018-12-04 11:21:42 +08:00
Nikolai Kochetov
98499b1140 LowCardinality optimization for single nullable column. 2018-12-03 21:00:20 +03:00
alesapin
170f90ffe7
Update README.md 2018-12-03 19:08:26 +03:00
root
02125f29c0 fix test_inserts_low_cardinality 2018-12-03 21:22:29 +08:00
root
8c9e9649fb Add test and code comment. 2018-12-03 21:11:26 +08:00
Persiyanov Dmitriy Andreevich
4ec2a2792c style guide 2018-12-03 14:28:22 +03:00
root
fb06c5ab6b Merge remote-tracking branch 'master/master' into update_23 2018-12-03 19:20:35 +08:00
alesapin
03ce4c5bc5
Merge branch 'master' into master 2018-12-03 13:02:34 +03:00
alesapin
0090aaf8ee Add missed header 2018-12-03 12:12:03 +03:00
alexey-milovidov
cec49357da
Merge pull request #3581 from yandex/alter-order-by 
ALTER MODIFY ORDER BY
 2018-12-03 07:15:07 +03:00
alexey-milovidov
f6c264b70b
Every function in its own file, part 9 (#3733) 
* Every function in its own file, part 9 [#CLICKHOUSE-2]

* Every function in its own file, part 9 [#CLICKHOUSE-2]
 2018-12-03 06:17:06 +03:00
alexey-milovidov
02636b3388
Merge pull request #3729 from amosbird/dryrun 
Function execution with dry runs
 2018-12-02 22:45:07 +03:00
alexey-milovidov
48b30edcf5
Merge branch 'master' into alter-order-by 2018-12-02 21:06:38 +03:00
alexey-milovidov
af110b8202
Merge pull request #3693 from yandex/simplier_merge_read_logic 
Simplify merge stream read logic
 2018-12-02 20:59:43 +03:00
Amos Bird
3cc0829cc1 Function execution with dry runs 
This commit prevents stateful functions like rowNumberInAllBlocks from being modified in getHeader() calls.
 2018-12-02 19:02:04 +08:00
Amos Bird
65b654a1b6 Versatile StorageJoin 
This commit does the following:

1. StorageJoin with simple keys now supports reading
2. StorageJoin can be created with Join settings applied. Syntax is
similar to MergeTree and Kafka
3. Left Any StorageJoin with one simple key can be used as a
dictionary-like structure by function joinGet.

Examples are listed in the related test file.
 2018-12-02 16:49:39 +08:00
Alexey Milovidov
2930da2880 Every function in its own file, part 8 [#CLICKHOUSE-2] 2018-12-02 05:52:49 +03:00
Alexey Milovidov
70a1275d50 Every function in its own file, part 8 [#CLICKHOUSE-2] 2018-12-02 05:47:47 +03:00
Alexey Milovidov
dbbf148a98 Every function in its own file, part 8 [#CLICKHOUSE-2] 2018-12-02 04:57:01 +03:00
alexey-milovidov
01d39892f5
Merge pull request #3725 from vitlibar/CLICKHOUSE-4127-fix-assertion-in-debug-build 
CLICKHOUSE-4127: Fix assertion in debug build.
 2018-12-02 03:51:46 +03:00
Alexey Milovidov
c9b8cd0626 Fixed errors and improved PR #3724 2018-12-02 03:47:34 +03:00
alexey-milovidov
c5dac3d496
Merge pull request #3724 from ClickHouse-Ninja/master 
timeSlots: add optional parameter 'Size'
 2018-12-02 03:34:52 +03:00
Vitaly Baranov
7c03b35bc4 CLICKHOUSE-4127: Fix assertion in debug build. 
Do reading faster if the structure isn't altered.
 2018-12-01 15:42:56 +03:00
Kirill Shvakov
566644b171 timeSlots: add optional parameter 'Size' 2018-12-01 10:01:20 +02:00
Alexey Milovidov
2cf627457a Fixed error #3720 2018-12-01 05:38:54 +03:00
Alexey Milovidov
b7d9910bd3 Merge branch 'master' into dont-allocate-too-much-memory-to-parse-query 2018-12-01 04:54:01 +03:00
Alexey Milovidov
024a4ba73c Fixed build after merge #3689 2018-12-01 02:52:20 +03:00
alexey-milovidov
bf7b68cf95
Merge pull request #3689 from abyss7/CLICKHOUSE-3936 
CLICKHOUSE-3936
 2018-12-01 01:50:04 +03:00
alexey-milovidov
32b0b61d25
Merge pull request #3699 from amosbird/master 
NonJoinedStream[ALL] bypasses max_block_size
 2018-12-01 01:48:48 +03:00
alexey-milovidov
2a6b7b3d00
Merge pull request #3719 from yandex/fix-buffer-read-locking 
Fix destination table locking for Buffer engine reads
 2018-12-01 01:27:39 +03:00
Alexey Milovidov
be80b7b188 Added suggestion from Nikolay Kochetov #3720 2018-11-30 22:47:47 +03:00
Alexey Milovidov
ca1d38914a Don't log to stderr within RE2 library [#CLICKHOUSE-2] 2018-11-30 22:37:31 +03:00
Persiyanov Dmitriy Andreevich
d982d39b1d remove NameRoundToExp2 & co 2018-11-30 19:13:40 +03:00
Persiyanov Dmitriy Andreevich
be91c76dd2 Merge branch 'master' into feature/roundDown-function 2018-11-30 19:07:49 +03:00
Persiyanov Dmitriy Andreevich
4a48414a5c working with numeric types 2018-11-30 18:57:06 +03:00
Alexey Milovidov
621e622f79 Added test [#CLICKHOUSE-4169] 2018-11-30 18:41:24 +03:00
Alexey Milovidov
35f6fb5ae6 Avoid memory over-allocation when large value of "max_query_size" is specified [#CLICKHOUSE-4169] 2018-11-30 18:36:41 +03:00
Alexey Zatelepin
2d71338b78 examine structure of the destination table of Buffer storage under lock 2018-11-30 18:34:24 +03:00
Amos Bird
d092d35fa9 NonJoinedStream[ALL] bypasses max_block_size 2018-11-30 22:59:17 +08:00
alexey-milovidov
cee0d48ce6
Merge pull request #3703 from dqminh/fix-empty-fixed-string 
Fix buffer overflow for EmptyImpl with FixedString
 2018-11-30 17:30:35 +03:00
proller
cd2af4b6d2 Update Contributors 2018-11-30 16:49:53 +03:00
Persiyanov Dmitriy Andreevich
5d3034c560 almost works w/ different types 2018-11-30 14:15:58 +03:00
Daniel Dao
eb91b19a99
Fix buffer overflow for EmptyImpl with FixedString 
Signed-off-by: Daniel Dao <dqminh89@gmail.com>
 2018-11-30 02:17:01 +00:00
proller
44ddd28e14 Auto version update to [18.14.17] [54409] 2018-11-29 19:17:29 +03:00
alesapin
51f73651dd Inject columns after creating header 2018-11-29 18:16:08 +03:00
proller
1cc69100f1 Fix macos build 2018-11-29 17:37:56 +03:00
alesapin
fc379c1d5c Inject column names before types 2018-11-29 15:03:58 +03:00
alesapin
b2fd3e804a Add special logic for alter 2018-11-29 14:55:34 +03:00
alesapin
8f3b7e063f Merge remote-tracking branch 'origin/master' into simplier_merge_read_logic 2018-11-29 12:20:22 +03:00
alesapin
e2e88324d0 Rename MergeTree streams for select 2018-11-29 12:19:42 +03:00
Nikolai Kochetov
f7f5ad3952 Fix build. 2018-11-29 11:23:27 +03:00
Nikolai Kochetov
95e4297601 Fix tests. 2018-11-29 11:19:14 +03:00
Nikolai Kochetov
a75430cbf7 Fix build. 2018-11-29 10:58:59 +03:00
alesapin
a0862efc17 Merge remote-tracking branch 'origin/master' into simplier_merge_read_logic 2018-11-29 10:58:45 +03:00
Persiyanov Dmitriy Andreevich
614af51fb7 test 2018-11-29 03:32:52 +03:00
alexey-milovidov
9cc36d3d3c
Merge pull request #3692 from yandex/fix-create-table-engine-parsing 
Fix CREATE TABLE engine parsing
 2018-11-29 00:22:20 +03:00
proller
c5eb678187 PerformanceTest fix --secure (#3690) 
* fix

* PerformanceTest fix --secure

* clean
 2018-11-29 00:21:22 +03:00
Alexey Milovidov
b92bcb3385 Added test #3694 2018-11-28 22:12:19 +03:00
Alexey Milovidov
46d8f2f985 Added test #3694 2018-11-28 22:09:17 +03:00
Gleb Kanterov
75919bd91e Update server/config.xml for tests 
- add test_unavailable_shard cluster
 2018-11-28 19:46:19 +01:00
Alexey Milovidov
b4d218a890 Fixed race condition, part 1 (ad-hoc) [#CLICKHOUSE-2] 2018-11-28 21:40:02 +03:00
Alexey Milovidov
97280bb361 Whitespace [#CLICKHOUSE-2] 2018-11-28 21:28:30 +03:00
alesapin
d4059ba507 Inject default column 2018-11-28 20:21:27 +03:00
Nikolai Kochetov
14ff6ae6d4 Added test. 2018-11-28 20:13:38 +03:00
Nikolai Kochetov
540a99c93a Fix engine parsing in create query. 2018-11-28 19:52:46 +03:00
Alexey Milovidov
25c98efa6d Added instruction [#CLICKHOUSE-2] 2018-11-28 19:51:43 +03:00
Alexey Milovidov
f615b062d8 Fixed build [#CLICKHOUSE-2] 2018-11-28 19:29:56 +03:00
Alexey Zatelepin
f425803418 don't overwrite table metadata file in case of offline ALTER after ATTACH [#CLIKCHOUSE-3859] 2018-11-28 19:05:29 +03:00
Ivan
448846fc0d
Merge branch 'master' into CLICKHOUSE-3936 2018-11-28 18:59:57 +03:00
Ivan Lezhankin
8b5a05947c Remove redundant information from RWLock. 
And fix broken exception in some race conditions
 2018-11-28 18:50:52 +03:00
Alexey Milovidov
42631ba857 Fixed bad code #3688 2018-11-28 18:31:09 +03:00
Alexey Milovidov
32baabd9b0 Fixed bad code #3688 2018-11-28 18:27:23 +03:00
Alexey Zatelepin
57f25e978a update comments and docs [#CLICKHOUSE-3859] 2018-11-28 18:12:44 +03:00
alesapin
23aa6595cd Missed file 2018-11-28 18:05:53 +03:00
alesapin
b7cdd8fe7f Trying to simplify merge reading logic 2018-11-28 18:05:28 +03:00
Alexey Milovidov
8c1c024472 Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-28 17:50:17 +03:00
Alexey Milovidov
4c527b84d2 Fixed build #3688 2018-11-28 17:50:02 +03:00
alexey-milovidov
6f007f45a1
Merge pull request #3673 from yandex/fix-insert-distributed-sync 
Fix insert_distributed_sync
 2018-11-28 17:48:06 +03:00
alexey-milovidov
a4fd7f4eb3
Update configReadClient.h 2018-11-28 17:45:58 +03:00
alexey-milovidov
a991781937
Update configReadClient.cpp 2018-11-28 17:45:01 +03:00
proller
eea1ca8920 Merge remote-tracking branch 'upstream/master' into fix4 2018-11-28 17:42:33 +03:00
proller
7e9d053d5d Benchmark: use client config for ssl options 2018-11-28 17:41:51 +03:00
alexey-milovidov
b8cb6c8f5e
Merge pull request #3687 from yandex/date-type-and-number-comparsion 
Date type and number comparsion
 2018-11-28 17:34:46 +03:00
Alexey Milovidov
52fea90a86 Removed useless code [#CLICKHOUSE-2] 2018-11-28 17:33:40 +03:00
Alexey Zatelepin
1b27fb046d Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/programs/server/Server.cpp
 2018-11-28 16:47:07 +03:00
Alexey Milovidov
3c551b43b8 Updated comment [#CLICKHOUSE-2] 2018-11-28 16:40:24 +03:00
Alexey Zatelepin
f3519bb297 add test for mixing MODIFY PRIMARY KEY and MODIFY ORDER BY statements [#CLICKHOUSE-3859] 2018-11-28 16:34:57 +03:00
Alexey Zatelepin
9ae79c60e8 get rid of (ASTPtr *) in AlterCommands::apply [#CLICKHOUSE-3859] 2018-11-28 16:34:57 +03:00
Nikolai Kochetov
3fabaa28eb Updated test with Date and numbers comparsion. 2018-11-28 16:20:55 +03:00
proller
107cf2c9b2 Add secure option to clickhouse-benchmark and clickhouse-performance-test 2018-11-28 15:19:01 +03:00
Nikolai Kochetov
05ac77dbde Added test with Date and numbers comparsion. 2018-11-28 15:10:01 +03:00
Alexey Zatelepin
ceea7bde2e better names in ZooKeeperNodeCache [#CLICKHOUSE-3859] 2018-11-28 14:40:59 +03:00
proller
dd2371e071 CLICKHOUSE-4137 DictionaryFactory, DictionarySourceFactory (#3653) 
* Split ComplexKeyCacheDictionary to faster compile (part2)

* Dictionaries as lib WIP

* wip

* clean

* Fix build with old capnp

* fix

* wip

* fixes

* fix

* clean

* clean

* clean

* wip

* wip

* wip

* flat

* wip

* cache

* clean

* wip

* faster

* fix style

* fixes

* clean

* clean

* Split CacheDictionary.cpp for faster compile

* fix

* fix

* Less memory usage while compiling

* missing file

* format

* Update registerDictionaries.h

* clean
 2018-11-28 14:37:12 +03:00
Nikolai Kochetov
6bd61d17c9 Disable Date and numeric types comparsion. 2018-11-28 14:11:10 +03:00
Alexey Milovidov
0dfa73221c Removed temporary compatibility fix for Yandex.Metrika. [#CLICKHOUSE-2] 2018-11-28 13:37:08 +03:00
root
6f699e9f94 b 2018-11-28 14:22:21 +08:00
root
5a120db014 Compatible with LowCardinality type data write 2018-11-28 14:19:45 +08:00
root
94164ef250 Compatible with LowCardinality type data write 2018-11-28 12:51:04 +08:00
root
c19199e23e Merge remote-tracking branch 'master/master' 2018-11-28 12:46:25 +08:00
alexey-milovidov
e95bf5d888
Merge pull request #3681 from yandex/fix-low-cardinality-permutation 
Fix low cardinality permutation
 2018-11-27 22:40:38 +03:00
Alexey Milovidov
cdb272848c Fixed typo in comment [#CLICKHOUSE-2] 2018-11-27 21:44:19 +03:00
Alexey Milovidov
b1bc7481d9 Whitespace #3603 2018-11-27 21:43:55 +03:00
alexey-milovidov
a12927a439
Merge pull request #3603 from vitlibar/CLICKHOUSE-4127 
CLICKHOUSE-4127: Fix ALTER of destination table for the BUFFER engine.
 2018-11-27 21:38:40 +03:00
Nikolai Kochetov
8085ce442c Added test for LowCardinality order by. 2018-11-27 21:09:37 +03:00
Nikolai Kochetov
65e5494326 Fixed size for LowCardinality dictionary permutation. 2018-11-27 21:08:54 +03:00
alexey-milovidov
b77043c462
Merge pull request #3680 from yandex/background-processing-pool-fix-race-condition 
Fixed race condition in BackgroundProcessingPool
 2018-11-27 20:41:07 +03:00
Alexey Zatelepin
e085bc9816 adapt code of #3609 [#CLICKHOUSE-3859] 2018-11-27 20:07:10 +03:00
Ivan Lezhankin
470f96ce19 Minor refactoring 2018-11-27 19:45:45 +03:00
proller
f1791e94e2
Do not write preprocessed configs to /etc/ (#2443) 2018-11-27 19:11:46 +03:00
proller
1ea31e0491
Fix icu link #3631 (#3671) 2018-11-27 18:34:21 +03:00
Alexey Milovidov
dba43be6c8 Fixed race condition in BackgroundProcessingPool [#CLICKHOUSE-2] 2018-11-27 17:59:10 +03:00
Alexey Zatelepin
499ad5eb62 fix test (MATERIALIZED columns in both Distributed and local tables don't work) [#CLICKHOUSE-4161] 2018-11-27 15:42:11 +03:00
Vitaly Baranov
44ca56c731 CLICKHOUSE-4127: Convert destination table's data when reading from 
StorageBuffer.
 2018-11-27 03:43:58 +03:00
Alexey Milovidov
2115c31dda Fixed wrong exception message [#CLICKHOUSE-2] 2018-11-26 20:11:04 +03:00
alexey-milovidov
7e9e5c383a
Merge pull request #3670 from abyss7/CLICKHOUSE-3766 
Rename method partition() → alterPartition()
 2018-11-26 20:09:37 +03:00
alexey-milovidov
a7d75c527b
Merge pull request #3652 from yandex/unquote-partition 
Don't quote single-field partition keys
 2018-11-26 19:57:01 +03:00
alexey-milovidov
e00ce0bb57
Every function in its own file, part 7 (#3666) 
* Every function in its own file, part 7 [#CLICKHOUSE-2]

* Every function in its own file, part 7 [#CLICKHOUSE-2]

* Every function in its own file, part 7 [#CLICKHOUSE-2]

* Every function in its own file, part 7 [#CLICKHOUSE-2]

* Every function in its own file, part 7 [#CLICKHOUSE-2]

* Fixed build #3666
 2018-11-26 19:20:40 +03:00
alesapin
6c0d9f6ea0 Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-26 18:18:58 +03:00
alesapin
5a6f9a5ff9 Replace function mysql with function file 2018-11-26 18:18:45 +03:00
Alexey Zatelepin
f38a320909 fix insert batching test (the INSERT queries are rewritten differently now) [#CLICKHOUSE-4161] 2018-11-26 17:57:33 +03:00
Alexey Zatelepin
f09cb566b1 add tests [#CLICKHOUSE-4161] 2018-11-26 17:57:33 +03:00
Alexey Zatelepin
01501fa8db correct column list for rewritten INSERT query into Distributed [#CLICKHOUSE-4161] 2018-11-26 17:57:25 +03:00
Ivan Lezhankin
73aa7f2027 Rename method partition() → alterPartition() 
Also fix build with internal shared libraries.
 2018-11-26 17:43:40 +03:00
Alexey Milovidov
e793a27cc3 Restored old test util #3665 2018-11-26 16:57:54 +03:00
Alexey Zatelepin
d3d9242462 Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/src/Parsers/ASTAlterQuery.h
	dbms/src/Parsers/ParserAlterQuery.cpp
	dbms/src/Storages/AlterCommands.cpp
	dbms/src/Storages/AlterCommands.h
 2018-11-26 16:01:48 +03:00
Alexey Zatelepin
3a3dda5ec5 use standard Tuple serialization [#CLICKHOUSE-4054] 2018-11-26 15:41:17 +03:00
alesapin
565100c716 Add option to disable host net 2018-11-26 13:23:03 +03:00
Alexey Milovidov
5a0feee45e Removed "conditional computations" feature, because it is not ready #2272 2018-11-26 04:39:04 +03:00
Alexey Milovidov
c77930fe30 Whitespaces [#CLICKHOUSE-2] 2018-11-26 03:56:50 +03:00
alexey-milovidov
0b2848b0f2
Merge pull request #3662 from yandex/fixed-error-in-lower-upper-utf8 
Fixed error in lowerUTF8 and upperUTF8 functions
 2018-11-26 02:24:41 +03:00
alexey-milovidov
5b1eaba276
Every function in its own file, part 6 (#3661) 
* Every function in its own file, part 6 [#CLICKHOUSE-2]

* Every function in its own file, part 6 [#CLICKHOUSE-2]

* Every function in its own file, part 6 [#CLICKHOUSE-2]
 2018-11-26 02:24:26 +03:00
Alexey Milovidov
ed48b38454 Added two more bugs [#CLICKHOUSE-2] 2018-11-26 02:23:01 +03:00
Alexey Milovidov
4cb7f2896c Fixed error in lowerUTF8 and upperUTF8 functions [#CLICKHOUSE-2] 2018-11-26 01:26:36 +03:00
chenxing.xc
ff6e849c0f address review comments | 2018-11-25 12:22:01 +08:00
Alexey Milovidov
68e0a687c8 Removed unused method [#CLICKHOUSE-2] 2018-11-25 04:24:03 +03:00
Alexey Milovidov
eac2d032bb Better performance test [#CLICKHOUSE-2] 2018-11-25 04:16:48 +03:00
Alexey Milovidov
5a045ff11c Fixed error in URL functions [#CLICKHOUSE-2] 2018-11-25 03:31:24 +03:00
Alexey Milovidov
b53c1ea913 Removed useless include [#CLICKHOUSE-2] 2018-11-25 03:16:14 +03:00
Alexey Milovidov
af9ad0f8ae Fixed bad code [#CLICKHOUSE-2] 2018-11-25 03:15:43 +03:00
Alexey Milovidov
141e9799e4 Fixed error with "extractURLParameter" function (read after buffer); improved performance; added support for zero bytes in URLs; renamed Chars_t type [#CLICKHOUSE-2] 2018-11-25 03:08:50 +03:00
Alexey Milovidov
244e64a757 Removed bug [#CLICKHOUSE-3] 2018-11-24 06:22:38 +03:00
Alexey Milovidov
fc9c7680b0 Added a test from Kodieg #2680 2018-11-24 06:20:05 +03:00
Alexey Milovidov
73e3a7b662 Fixed bad code; added generic implementation for "arrayReverse" function; added test [#CLICKHOUSE-3] 2018-11-24 06:14:54 +03:00
Alexey Milovidov
7d6fffff48 More style checks [#CLICKHOUSE-3] 2018-11-24 04:48:06 +03:00
Alexey Milovidov
e82241553a Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-24 04:20:37 +03:00
Alexey Milovidov
bbed8a8ca8 Fixed bad code [#CLICKHOUSE-3] 2018-11-24 04:20:27 +03:00
alexey-milovidov
bedca47bca
Merge pull request #3649 from yandex/low-cardinaliry-left-array-join 
Low cardinaliry left array join
 2018-11-24 04:16:38 +03:00
alexey-milovidov
905a4ffc04
Merge pull request #3651 from yandex/fix-functions-with-low-cardinality-argument-and-array-result 
Fix functions with low cardinality argument and array result
 2018-11-24 04:15:20 +03:00
proller
ad6ae4fdbe Fix build on mac (caused by #3631) (#3654) 
* Fix build on mac (caused by #3631)

* fix
 2018-11-24 04:15:00 +03:00
Alexey Milovidov
cc06488ddc Whitespace #2601 2018-11-24 03:10:51 +03:00
Alexey Milovidov
1e449b2e16 Added another compatibility alias #3638 2018-11-24 02:14:18 +03:00
Alexey Milovidov
fac15418aa Added a test just in case #3584 2018-11-24 02:10:38 +03:00
Alexey Milovidov
954c974507 Added "POWER" alias to "pow" function; made some math functions case insensitive for compatibility #3638 2018-11-24 00:14:28 +03:00
Alexey Milovidov
6e2a6d9894 Added performance test #3350 2018-11-24 00:04:14 +03:00
alexey-milovidov
507990d5f2
Merge branch 'master' into master 2018-11-23 23:41:38 +03:00
Alexey Milovidov
910d57c1b5 Better test #3406 2018-11-23 22:52:24 +03:00
Alexey Milovidov
af6f91e762 Added comment #3350 2018-11-23 22:47:15 +03:00
Alexey Milovidov
62e30de715 Whitespaces #3350 2018-11-23 21:54:23 +03:00
Alexey Milovidov
dbbacf4f87 Added more style checks [#CLICKHOUSE-3] 2018-11-23 21:52:00 +03:00
alexey-milovidov
af013285e9
Merge branch 'master' into base64_functions 2018-11-23 21:33:56 +03:00
Alexey Milovidov
2bd5e2b1eb https://stackoverflow.com/questions/44067609/getting-error-importmismatcherror-while-running-py-test 2018-11-23 20:56:50 +03:00
alexey-milovidov
221388c01d
Merge pull request #3650 from yandex/script_for_integration_tests_in_docker 
Add script and image for running integration tests in docker
 2018-11-23 20:40:06 +03:00
Nikolai Kochetov
ced3937e87 Added test. 2018-11-23 20:00:45 +03:00
Nikolai Kochetov
560e0a04d0 Fix functions with low cardinality argumant and array result. 2018-11-23 19:09:07 +03:00
Nikolai Kochetov
de16f36256 Fix functions with low cardinality argumant and array result. 2018-11-23 18:59:45 +03:00
Alexey Milovidov
15ad4b9b1b Whitespaces [#CLICKHOUSE-2] 2018-11-23 18:56:20 +03:00
alesapin
3cfe5283e3 Fix readme and add net=host 2018-11-23 18:51:36 +03:00
alesapin
fc7007b78e Add script and image for running integration tests in docker 2018-11-23 18:10:07 +03:00
Nikolai Kochetov
bbc6a11940 Added test for left array join with low cardinality. 2018-11-23 17:19:16 +03:00
alexey-milovidov
ac29388224
Merge pull request #3632 from yandex/fix-low-cardinality-distributed-group-by 
Fix low cardinality distributed group by
 2018-11-23 16:45:56 +03:00
alexey-milovidov
0822f500f8
Merge pull request #3642 from yandex/odbc_bridge_die_with_server 
ODBC bridge die with server
 2018-11-23 16:44:53 +03:00
alexey-milovidov
c6bc4279ee
Merge pull request #3377 from s-mx/CLICKHOUSE-4032 
Added support for column COMMENTs in table definition.
 2018-11-23 16:43:58 +03:00
Nikolai Kochetov
449ab47350 Disable low cardinality default implementation for emptyArrayToSingle function. 2018-11-23 16:29:14 +03:00
Nikolai Kochetov
f3aa1292a9 Remove null map cache from ColumnUnique. 2018-11-23 14:55:06 +03:00
Nikolai Kochetov
d64fe4204a Remove null map cache from ColumnUnique. 2018-11-23 13:47:01 +03:00
Nikolai Kochetov
e74b1edb35 Remove null map cache from ColumnUnique. 2018-11-23 13:18:50 +03:00
alesapin
7f40494330 Enable keep alive only with patched poco 2018-11-23 12:24:59 +03:00
Nikolai Kochetov
ce2d69745d Merge branch 'fix-low-cardinality-distributed-group-by' of github.com:yandex/ClickHouse into fix-low-cardinality-distributed-group-by 2018-11-23 11:13:25 +03:00
Nikolai Kochetov
7fea1397d6 Remove null map cache from ColumnUnique. 2018-11-23 11:11:54 +03:00
alesapin
d31d30c8e1 Fix comments, naming, log about kill inability and better test 2018-11-23 11:08:35 +03:00
alexey-milovidov
3729c4e532
Update ReadBufferFromHDFS.h 2018-11-23 03:20:33 +03:00
Alexey Milovidov
2a225174d4 Added performance test #3406 2018-11-23 02:45:16 +03:00
alexey-milovidov
1002ed7487
Merge branch 'master' into 3958/many_templates 2018-11-23 01:48:42 +03:00
Alexey Milovidov
c0e97a97cd Resolved inconsistencies in documentation #3539 2018-11-23 01:00:03 +03:00
alexey-milovidov
12045a0e0e
Merge pull request #3641 from yandex/fix-array-mapped-functions-with-low-cardinality-lambda 
Fix array mapped functions with low cardinality lambda
 2018-11-23 00:40:16 +03:00
alexey-milovidov
733ab51089
Merge pull request #3643 from yandex/fix-parallel-inputs-processor-deadlock 
Fix deadlock in ParallelInputsProcessor in case thread creation fails.
 2018-11-23 00:30:01 +03:00
Alexey Milovidov
64c6951b1a More correct documentation #3644 2018-11-23 00:28:38 +03:00
Alexey Milovidov
d3bb69be74 More correct documentation + miscellaneous name change #3644 2018-11-23 00:27:52 +03:00
alexey-milovidov
49d2d8a1b8
Merge pull request #3644 from proller/fix4 
Add VERSION_INT (ClickHouse version in integer format like 18014009) …
 2018-11-23 00:22:19 +03:00
alexey-milovidov
2c2d75cceb
Don't allow exceptions without code (#3645) 
* Don't allow exceptions without code #3633

* Don't allow exceptions without code #3633
 2018-11-23 00:19:58 +03:00
alexey-milovidov
b680029030
Update ColumnsDescription.cpp 2018-11-22 22:36:56 +03:00
proller
f410c93fb1 Add VERSION_INT (ClickHouse version in integer format like 18014009) to system.metrics and system.build_options 2018-11-22 21:24:38 +03:00
Alexey Milovidov
2afabbe05c Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-22 21:13:29 +03:00
Alexey Milovidov
a5d1fc0ca7 Removed unused constructor #3633 2018-11-22 21:09:17 +03:00
Alexey Zatelepin
8b25084637 fix deadlock in ParallelInputsProcessor in case thread creation fails [#CLICKHOUSE-4155] 2018-11-22 20:29:49 +03:00
alesapin
2b2195d4de Fix stupid if 2018-11-22 19:01:17 +03:00
alesapin
1e879850bb Kill odbc-bridge with clickhouse-server 2018-11-22 18:59:00 +03:00
Nikolai Kochetov
510703fc7c Added test 2018-11-22 18:57:38 +03:00
Nikolai Kochetov
a29fd043a4 Added test 2018-11-22 18:53:03 +03:00
Nikolai Kochetov
4721b16b51 Fix array mapped functions with low cardinality lambda argument. 2018-11-22 18:52:53 +03:00
alexey-milovidov
53904efc6f
Merge pull request #3639 from s-mx/patch-2 
add DROP TABLE IF EXISTS in test
 2018-11-22 18:29:10 +03:00
KochetovNicolai
b8882ddd90
Update config.xml 
Fix cluster ports in config.xml
 2018-11-22 18:09:55 +03:00
Alexey Milovidov
7b919c9b2b Removed unused constructor #3633 2018-11-22 18:09:19 +03:00
Alexey Milovidov
093557dbde Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-22 18:08:28 +03:00
Alexey Milovidov
e53eb702a1 Usability of client error message when it cannot load data for suggestions [#CLICKHOUSE-2] 2018-11-22 18:07:32 +03:00
Sabyanin Maxim
35fce9c3ac
add DROP TABLE IF EXISTS in test 2018-11-22 17:32:28 +03:00
Sabyanin Maxim
3a67b505c5 Merge branch 'master' of https://github.com/yandex/ClickHouse into CLICKHOUSE-4032 2018-11-22 16:54:10 +03:00
Sabyanin Maxim
060fce3899 make ReplicatedMergeTree work with comments. ignore empty comments when make column_comments hashmap 2018-11-22 16:51:43 +03:00
Nikolai Kochetov
41951a926e Fix test cluster config. 2018-11-22 12:18:13 +03:00
Alexey Milovidov
ab5d76fc42 Fixed error introduced in #3553 and prevent it happening 2018-11-21 23:56:37 +03:00
Alexey Milovidov
6f48ebbb06 Better exception message in case of "unknown identifier" [#CLICKHOUSE-4142] 2018-11-21 23:35:55 +03:00
proller
1d40c2c871 Better link and deps (#3631) 
* try fix 1

* Better deps

* fix

* fix

* fix

* Update CMakeLists.txt

* Update CMakeLists.txt

* fix

* fix

* fix

* disable old

* Update find_odbc.cmake
 2018-11-21 22:20:27 +03:00
Nikolai Kochetov
eac03c1c83 Added test. #3615 2018-11-21 21:59:58 +03:00
Nikolai Kochetov
4d96e88058 Fix distributed group by LowCardinality(Nullable). #3615 2018-11-21 21:59:33 +03:00
Persiyanov Dmitriy Andreevich
b3e694e3eb ugly version 2018-11-21 13:10:22 +03:00
alesapin
ff5629263b Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-21 12:06:40 +03:00
alesapin
7d20d499a1 Switch integration tests to 18.10 2018-11-21 12:05:13 +03:00
alexey-milovidov
5038f13b08
Merge pull request #3514 from abyss7/CLICKHOUSE-3766 
Implement 'ALTER … FREEZE' command
 2018-11-21 07:17:21 +03:00
alexey-milovidov
be409f29b6
Update clickhouse-test 2018-11-21 07:16:47 +03:00
alexey-milovidov
0bc9776e2a
Update Cluster.cpp 2018-11-21 07:06:40 +03:00
alexey-milovidov
af8db3e9ec
Update Cluster.h 2018-11-21 07:04:53 +03:00
alexey-milovidov
96fdc2a390
Update Cluster.h 2018-11-21 07:04:24 +03:00
alexey-milovidov
5ee36769db
Update Cluster.cpp 2018-11-21 07:04:05 +03:00
alexey-milovidov
5cf9beabe3
Update StorageDistributed.cpp 2018-11-21 07:02:56 +03:00
alexey-milovidov
866917ad32
Update Cluster.cpp 2018-11-21 07:02:19 +03:00
chenxing.xc
86f1a18185 withdraw INSERT INFILE feature 2018-11-21 11:59:24 +08:00
alexey-milovidov
f67e54dbf3
Merge pull request #3594 from yandex/CLICKHOUSE-4112 
Add http connection pool between replicas
 2018-11-21 06:57:22 +03:00
alexey-milovidov
235dc66881
Merge pull request #3564 from amosbird/master 
Implement dictGet[OrDefault]
 2018-11-21 06:48:10 +03:00
alexey-milovidov
0d627c7230
Update FunctionsExternalDictionaries.h 2018-11-21 06:48:01 +03:00
alexey-milovidov
9b0226a73d
Merge pull request #3588 from zhang2014/fix/predicate 
ISSUES-1777 qualified subqueries when optimize predicate
 2018-11-21 06:20:37 +03:00
Alexey Milovidov
7febe64c82 Failproof #3589 2018-11-21 06:19:29 +03:00
Alexey Milovidov
7e6d9ed82b Correct calculation of avg_value_size_hint #3589 2018-11-21 06:18:42 +03:00
Alexey Milovidov
31561ef25a Fixed error; added test #3589 2018-11-21 06:09:56 +03:00
Alexey Milovidov
2cef50669a Better error message #3589 2018-11-21 05:40:23 +03:00
alexey-milovidov
2e15e52b74
Merge pull request #3628 from yandex/first-significant-subdomain-performance 
Attempt to fight back performance of firstSignificantSubdomain function
 2018-11-21 05:39:56 +03:00
Alexey Milovidov
843fc0097b Addition to prev. revision #3601 2018-11-21 04:00:50 +03:00
Alexey Milovidov
7a6fd980fe Added performance test #3601 2018-11-21 03:59:17 +03:00
Alexey Milovidov
2662594865 Attempt to fight back performance of firstSignificantSubdomain function #3601 2018-11-21 03:46:06 +03:00
Alexey Milovidov
c09a93e78b Added a test #3601 2018-11-21 03:22:23 +03:00
alexey-milovidov
8590348dc6
Merge pull request #3601 from hatarist/patch-1 
Update firstSignificantSubdomain function
 2018-11-21 03:00:59 +03:00
alexey-milovidov
87e5d40858
Merge pull request #3626 from yandex/types-clarification 
More clean NearestFieldType.
 2018-11-21 02:55:46 +03:00
Alexey Milovidov
78e72a1962 Little better #3624 2018-11-20 23:09:20 +03:00
alexey-milovidov
3d7c78c3f6
Merge pull request #3619 from amosbird/nit 
Remove redundant query context attachment
 2018-11-20 22:37:40 +03:00
alexey-milovidov
a41485f69d
Merge pull request #3624 from yandex/types-clarification 
Fixed code that was not quite correct
 2018-11-20 22:37:10 +03:00
alexey-milovidov
596e136b73
Update InterpreterInsertQuery.cpp 2018-11-20 21:36:13 +03:00
alexey-milovidov
8ff62c9da6
Update InterpreterInsertQuery.cpp 2018-11-20 21:31:39 +03:00
alexey-milovidov
7a98d55415
Update ReadBufferFromHDFS.h 2018-11-20 21:31:21 +03:00
alexey-milovidov
5e0b679f04
Merge pull request #3620 from proller/fix13 
Fix build with old capnp
 2018-11-20 21:19:40 +03:00
alexey-milovidov
98ed411da3
Update Field.h 2018-11-20 20:37:50 +03:00
Alexey Milovidov
38d2e9efa2 Fixed code that was not quite correct 2018-11-20 20:36:21 +03:00
alesapin
57ea89c5f3 Merge branch 'master' into CLICKHOUSE-4112 2018-11-20 20:23:08 +03:00
alesapin
f08e090bda Better uri scheme check and fix in poco submodule 2018-11-20 20:21:32 +03:00
Ivan Lezhankin
1e070a7c51 Move FREEZE_ALL command source code inside |PartitionCommand| 2018-11-20 20:13:59 +03:00
Marek Vavruša
8fad726d95 Added null guards for all CurrentThread::attachToIfDetached() 
refs #3622
 2018-11-20 09:10:34 -08:00
proller
2deb523265 Fix build with old capnp 2018-11-20 18:10:28 +03:00
Ivan Lezhankin
74fe350451 Refactor partition commands handling into separate interface method. 2018-11-20 17:59:34 +03:00
Amos Bird
ab8821255c Remove redundant query context attachment 2018-11-20 22:21:48 +08:00
alesapin
00f1329c59 Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-20 17:04:07 +03:00
alexey-milovidov
a008a41374
Merge pull request #3609 from s-mx/CLICKHOUSE-4090 
Add primary_key, order_key, partition_key and sample_key to system.tables.
 2018-11-20 16:39:54 +03:00
alesapin
01e2137364 CLICKHOUSE-4112: Add keepalive for http connections 2018-11-20 16:15:44 +03:00
Sabyanin Maxim
7d175e4666 Merge branch 'CLICKHOUSE-4090' of github.com:s-mx/ClickHouse into CLICKHOUSE-4090 2018-11-20 15:22:54 +03:00
Sabyanin Maxim
e3fc18fcb8 add getters of expressions names in StorageReplicatedMergeTree 2018-11-20 15:19:12 +03:00
chenxing.xc
939368cf08 Merge remote-tracking branch 'hdfs/master' 2018-11-20 19:28:40 +08:00
root
cc7ec374d5 better 2018-11-20 16:10:33 +08:00
alexey-milovidov
6aa2313dec
Merge pull request #3580 from abyss7/fix-quantile-datetime 
Some fixes to quantile*() functions related to DateTime argument type
 2018-11-19 21:28:06 +03:00
alexey-milovidov
de5d4b6256
Update AggregateFunctionQuantile.h 2018-11-19 21:25:57 +03:00
Sabyanin Maxim
4ac727e7ad fix style 2018-11-19 20:21:34 +03:00
alexey-milovidov
72fb78a0f8
Update StorageBuffer.cpp 2018-11-19 18:20:34 +03:00
alexey-milovidov
9a3701cc50
Update StorageBuffer.cpp 2018-11-19 18:20:05 +03:00
alexey-milovidov
33eb64269f
Update StorageBuffer.cpp 2018-11-19 18:14:44 +03:00
Alexey Milovidov
c843bc1d58 utils/check-style/check-style -n 2018-11-19 18:09:19 +03:00
alexey-milovidov
5a40a67500
Update StorageSystemColumns.cpp 2018-11-19 18:07:43 +03:00
alexey-milovidov
6ad4519c81
Update IStorage.h 2018-11-19 18:05:48 +03:00
Sabyanin Maxim
08fc057a15 make is_in_primary_key and etcetera work. add test. 2018-11-19 17:31:16 +03:00
Ivan Lezhankin
b63f0a5a9f Minor refactoring 2018-11-19 17:25:42 +03:00
Alexey Milovidov
2f3b4ba851 Better exception message [#CLICKHOUSE-4143] 2018-11-19 15:31:26 +03:00
chenxing.xc
76843c2dc0 hdfs read support 2018-11-19 16:17:09 +08:00
Vitaly Baranov
a029034d8c CLICKHOUSE-4127: Fix ALTER of destination table for the BUFFER engine. 2018-11-19 09:14:36 +03:00
alexey-milovidov
e7fb653d0c
Update HTTPCommon.cpp 2018-11-19 01:20:36 +03:00
alexey-milovidov
f35d300d33
Update HTTPCommon.cpp 2018-11-19 01:15:42 +03:00
alexey-milovidov
786bf36aee
Update DDLWorker.cpp 2018-11-19 01:04:11 +03:00
Igor Hatarist
faa4cac4da
Update firstSignificantSubdomain function 
Added gov, mil, edu 2nd level domains
 2018-11-18 06:37:43 +03:00
proller
ddf231e57f BI-154 Fix isLocal detection 2018-11-17 21:52:47 +03:00
chertus
b4b58b292f remove hack for StorageDistributed & insert_sample_with_metadata 2018-11-16 22:19:47 +03:00
alesapin
2a4a8d180b Try to change stupid naming 2018-11-16 16:33:43 +03:00
alesapin
0266f058c9 Merge branch 'master' into CLICKHOUSE-4112 2018-11-16 16:21:27 +03:00
alesapin
d4ce674b93 Add http connection pool between replicas 2018-11-16 16:15:17 +03:00
proller
160ffb2283
Build fixes (clang 7.0.0+) (#3582) 2018-11-16 15:22:51 +03:00
Sabyanin Maxim
49dc9939d4 fix serializing of ColumnsDescription 2018-11-16 15:01:52 +03:00
Gleb Kanterov
1b8e5f9b47 Optimization to skip unused shards for Distributed engine 
Hide behind `distributed_optimize_skip_select_on_unused_shards` setting.
 2018-11-16 10:21:06 +00:00
chertus
811b824b01 AddingDefaultsBlockInputStream fixed types optimisation 2018-11-15 23:26:51 +03:00
Alexey Zatelepin
ffb54509db add tests [#CLICKHOUSE-3859] 2018-11-15 22:34:50 +03:00
chertus
c642e16ee1 clearer evaluateMissingDefaults [CLICKHOUSE-3578] 2018-11-15 19:57:20 +03:00
chertus
13646eb4c4 move BlockMissingValues from Block to IBlockInputStream::getMissingValues() 2018-11-15 18:57:20 +03:00
zhang2014
c23447ba3a ISSUES-1777 qualified subqueries when optimize predicate 2018-11-15 23:23:44 +08:00
chertus
65d34ca231 do not override current_database in context [CLICKHOUSE-3578] 2018-11-15 18:03:13 +03:00
Amos Bird
eec50adbeb Implement dictGet[OrDefault] 2018-11-15 21:48:00 +08:00
Sabyanin Maxim
d9e6789f78 make MergeTree work with comments 2018-11-15 16:12:27 +03:00
chertus
5c67e02205 fix build 2018-11-15 13:39:13 +03:00
chertus
8284de8268 fix build 2018-11-15 13:32:20 +03:00
chertus
0e1044b165 Merge branch 'master' into issue-3578 2018-11-15 13:28:53 +03:00
Amos Bird
9021bfb2f1 Fix variant assignments 2018-11-15 17:29:53 +08:00
Sabyanin Maxim
035049d1a8 make modify column comment work 2018-11-15 01:46:39 +03:00
chertus
ebf3d60186 column defaults without CapNProto [CLICKHOUSE-3578] 2018-11-14 21:20:16 +03:00
Alexey Zatelepin
b071547b2d add checks for ALTER MODIFY ORDER BY [#CLICKHOUSE-3859] 2018-11-14 20:12:32 +03:00
Ivan Lezhankin
fc272ecded Some fixes to quantile*() functions related to DateTime argument type 2018-11-14 18:04:23 +03:00
Alexandr Krasheninnikov
177a00f09a Merge https://github.com/yandex/ClickHouse into base64_functions 2018-11-14 12:32:42 +03:00
Alexandr Krasheninnikov
050abdf2b6 Auto detect of codec 2018-11-14 12:07:20 +03:00
Alexey Milovidov
e3b0cecdec Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-14 04:59:40 +03:00
Alexey Milovidov
2daab83a23 Fixed bad and wrong code #3553 2018-11-14 04:59:32 +03:00
alexey-milovidov
3b2cd38beb
Merge pull request #3570 from yandex/fix-with-with-alias-only 
Fix WITH with alias only
 2018-11-14 04:22:38 +03:00
Alexey Milovidov
1aa89ed63a Fixed code after review #3553 2018-11-14 04:20:46 +03:00
proller
37a9af5a68 CLICKHOUSE-4109 mlock clickhouse (#3553) 
* CLICKHOUSE-4109 mlock clickhouse

* wip

* Fix

* wip

* fix

* fix

* better place

* wip

* clean

* tidy

* fix
 2018-11-14 04:11:13 +03:00
Alexey Milovidov
d3349ebde8 Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-14 04:04:29 +03:00
Alexey Milovidov
d1b86225ef Fixed bad code #3565 2018-11-14 04:04:09 +03:00
alexey-milovidov
2f16ec5c79
Merge pull request #3568 from yandex/fix-low-cardinality-nullable-perf 
Fix perf in IColumnUnique::size func.
 2018-11-14 03:27:05 +03:00
Alexey Milovidov
ead153e9e4 Better code #3565 2018-11-13 22:48:47 +03:00
Alexey Milovidov
69e57187d2 Fixed error; removed unique_ptr #3565 2018-11-13 22:43:17 +03:00
Sabyanin Maxim
3e4c981db2 small changes 2018-11-13 22:17:40 +03:00
Alexey Milovidov
7eb9fdef97 Removed Analyzers [#CLICKHOUSE-2] 2018-11-13 21:55:00 +03:00
Alexey Milovidov
5441b6c3d2 Whitespace [#CLICKHOUSE-3] 2018-11-13 21:54:38 +03:00
Alexey Milovidov
4b0645cb25 Fixed error in #3565 2018-11-13 21:41:07 +03:00
Alexey Milovidov
c997f0b56a Added a test for ATTACHing parts before ALTER (just in case) [#CLICKHOUSE-3] 2018-11-13 20:18:38 +03:00
chertus
9d3325f56e one more fix for bad merge of branches 2018-11-13 16:36:53 +03:00
Alexey Zatelepin
29b34365e6 Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/src/Interpreters/ExpressionAnalyzer.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
 2018-11-13 16:27:19 +03:00
Alexey Zatelepin
2cc0aae82c rearrange AST members in MergeTreeData [#CLICKHOUSE-3859] 2018-11-13 16:15:17 +03:00
Alexey Zatelepin
7167bfd7b3 fix prewhere with FINAL for VersionedCollapsingMergeTree [#CLICKHOUSE-3859] 2018-11-13 16:15:12 +03:00
Alexey Zatelepin
8b85822192 store original key ASTs, and not extracted ASTExpressionLists [#CLICKHOUSE-3859] 2018-11-13 16:14:44 +03:00
Alexey Zatelepin
31a6a6b4fd calculate ReplicatedMergeTreeTableMetadata diff [#CLICKHOUSE-3859] 2018-11-13 16:13:55 +03:00
Alexey Zatelepin
74c48ed226 apply metadata changes on startup [#CLICKHOUSE-3859] 2018-11-13 16:13:50 +03:00
Alexey Zatelepin
96d7eee785 fix use-after-free in ZooKeeperNodeCache [#CLICKHOUSE-3859] 2018-11-13 16:13:46 +03:00
Alexey Zatelepin
106800b857 apply changes in ReplicatedMergeTreeAlterThread [#CLICKHOUSE-3859] 2018-11-13 16:13:40 +03:00
Alexey Zatelepin
4036ec83af write metadata znode in StorageReplicatedMergeTree::alter() [#CLICKHOUSE-3859] 2018-11-13 16:13:34 +03:00