thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 13:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,778 Commits 9,138 Branches 1,774 Tags 2 GiB
c89df916ab
Commit Graph

15018 Commits

Author SHA1 Message Date
Alexey Milovidov
b250a95c48 Added test #3220 2018-12-12 16:29:58 +03:00
alesapin
282b303a1c Link libglibc-compatibility to dbms at last position (#3816) 
* Link libglibc-compatibility to dbms at last position

* Don't replace getrandom if it doesn't exists in libc
 2018-12-12 15:51:40 +03:00
Alexey Milovidov
626c085a06 Removed garbage #3653 2018-12-11 22:00:13 +03:00
shangshujie
5de9577ecd add test function 2018-12-11 18:29:59 +08:00
shangshujie
ccdaf6a31b add java string hash, hive string hash, for compatible with java world 2018-12-11 16:41:23 +08:00
alexey-milovidov
7af621f6f7
Merge pull request #3728 from amosbird/join 
Versatile StorageJoin
 2018-12-10 23:16:53 +03:00
alexey-milovidov
3877aad6ef
Merge pull request #3773 from 4ertus2/joins 
InDepthNodeVisitor for AST traversal
 2018-12-10 22:44:22 +03:00
alexey-milovidov
fb15713979
Merge pull request #3794 from amosbird/aba 
Guard `force_restore_data_flag_file` removal
 2018-12-10 21:56:45 +03:00
alexey-milovidov
58c9746a91
Update loadMetadata.cpp 2018-12-10 21:56:37 +03:00
alexey-milovidov
a083e6bc64
Merge pull request #3799 from yandex/low-cardinality-join 
Low cardinality join
 2018-12-10 21:46:42 +03:00
Alexey Milovidov
76167f382a Merge branch 'master' of github.com:yandex/ClickHouse 2018-12-10 21:19:46 +03:00
Alexey Milovidov
22aa593d6b Fixed global variable buffer read overflow [#CLICKHOUSE-4191] 2018-12-10 21:19:37 +03:00
alexey-milovidov
cea269883c
Merge pull request #3803 from yandex/low-cardinality-native-format-conversion-2 
LowCardinality support for old clients, part 2
 2018-12-10 21:03:43 +03:00
alexey-milovidov
3be02d5214
Merge pull request #3807 from amosbird/nitfix 
Fix copy-paste error.
 2018-12-10 20:52:08 +03:00
KochetovNicolai
635b16ac4b
Update MergeTreeDataPart.cpp 
Skip size check for LowCardinality column file.
 2018-12-10 20:47:18 +03:00
Amos Bird
197d73d5bc Fix copy-paste error. 2018-12-11 01:31:10 +08:00
chertus
3dd36cee14 Merge branch 'master' into joins 2018-12-10 19:20:45 +03:00
alesapin
77c884b7ff Merge branch 'master' of github.com:yandex/ClickHouse 2018-12-10 19:07:47 +03:00
alesapin
0612910277 Remove redundant container 2018-12-10 19:07:31 +03:00
Alexey Milovidov
aec8c149dc Fixed test [#CLICKHOUSE-4191] 2018-12-10 18:59:56 +03:00
alexey-milovidov
5152e2b8fa
Merge pull request #2658 from yandex/issue-3578 
CLICKHOUSE-3578 apply column defaults for semistructured input formats
 2018-12-10 18:56:22 +03:00
alexey-milovidov
fdae3eefa3
Merge pull request #3805 from proller/fix4 
clang-format of dbms/src/Dictionaries/*
 2018-12-10 18:55:28 +03:00
proller
5e89894b98 Fix style 2018-12-10 18:50:58 +03:00
alexey-milovidov
ce2f3fca50
Merge pull request #3804 from yandex/missing-sql-compatibility-functions 
Support SUBSTRING(expr FROM start FOR length)
 2018-12-10 18:41:03 +03:00
proller
c9e98c8deb clang-format of dbms/src/Dictionaries/* 2018-12-10 18:25:45 +03:00
chertus
9f9bf0cb1b ArrayJoinedColumnsVisitor via InDepthNodeVisitor 2018-12-10 16:49:36 +03:00
chertus
49d80bf8f5 ExecuteScalarSubqueriesVisitor (move code from h to cpp) 2018-12-10 16:19:09 +03:00
chertus
9236e94e1b ExecuteScalarSubqueriesVisitor via InDepthNodeVisitor 2018-12-10 16:02:45 +03:00
Ivan Blinkov
6a90abc543 Support SUBSTRING(expr FROM start FOR length) 2018-12-10 15:54:02 +03:00
Nikolai Kochetov
1a6127dce4 Remove LowCardinality from NativeBlockOutputStream types for old clients. 2018-12-10 15:09:37 +03:00
Nikolai Kochetov
723932930d Added test with low cardinality join. 2018-12-10 14:21:29 +03:00
chertus
66d73025d7 fix RequiredSourceColumnsMatcher lambda 2018-12-10 13:55:27 +03:00
Emmanuel Donin de Rosière
a8c2e59cf6 Merge remote-tracking branch 'upstream/master' 2018-12-10 11:31:13 +01:00
Nikolai Kochetov
e4fd13f237 Remove LowCardinaity for joined keys. 2018-12-10 13:23:45 +03:00
Nikolai Kochetov
61cd6fe2d3 Remove LowCardinaity for joined keys. 2018-12-10 13:21:32 +03:00
Emmanuel Donin de Rosière
982cd749be Better management of DateTime partitionning #3786 
Adding min_time and max_date in system.parts table
 2018-12-10 11:20:19 +01:00
alesapin
0466f6beaf Merge branch 'master' of github.com:yandex/ClickHouse 2018-12-10 12:41:10 +03:00
alesapin
0901694b15 Update integration tests image 2018-12-10 12:40:57 +03:00
Amos Bird
6bc30f225e Guard force_restore_data_flag_file removal 
resemble `force_drop_table` file
 2018-12-09 23:11:46 +08:00
chertus
0c49c19592 fix style 2018-12-08 01:02:33 +03:00
alexey-milovidov
0fdb3b9628
Merge branch 'master' into issue-3578 2018-12-07 23:53:34 +03:00
alexey-milovidov
0b4f0ca7d5
Merge pull request #3744 from yandex/low-cardinality-nullable-group-by 
LowCardinality optimization for single nullable column.
 2018-12-07 23:32:27 +03:00
alexey-milovidov
92ab759ef6
Update Aggregator.h 2018-12-07 23:31:59 +03:00
Alexey Milovidov
ab8ac40682 Fixed test (added normal case that was missed) [#CLICKHOUSE-2] 2018-12-07 23:13:44 +03:00
proller
799edcef78 CLICKHOUSE-4189 Fix segfault (#3788) 
* CLICKHOUSE-4189 Fix segfault

* Update ExpressionActions.cpp

* Update ExpressionActions.cpp
 2018-12-07 23:05:02 +03:00
KochetovNicolai
431cff1613
Update NativeBlockInputStream.cpp 
Fix type for LowCardinality inserts.
 2018-12-07 20:17:50 +03:00
chertus
2afe664d67 RequiredSourceColumnsVisitor via InDepthNodeVisitor 2018-12-07 19:28:20 +03:00
chertus
31c629bf55 GlobalSubqueriesMatcher via InDepthNodeVisitor 2018-12-07 18:36:54 +03:00
chertus
abffefc830 ExternalTablesVisitor via InDepthNodeVisitor 2018-12-07 18:14:50 +03:00
chertus
e26c3327cf fix lost AST chenges in InDepthNodeVisitor 2018-12-07 17:24:47 +03:00
alesapin
21f8a86635 Merge branch 'chenxing-xc-master' 2018-12-07 17:13:11 +03:00
alesapin
dbefb66691 Add kill docker by Ctrl+C, abs path and improve readme 2018-12-07 17:08:25 +03:00
chertus
75af882cf3 fix AST debug print with underline symbol 2018-12-07 15:34:40 +03:00
alesapin
80b49e4c0a Add integration test, put dependent libs to contrib, slightly refine 
code.
 2018-12-07 14:41:24 +03:00
alexey-milovidov
68b5f02b10
Merge pull request #3683 from nicelulu/update_23 
Compatible with LowCardinality type data write
 2018-12-07 07:17:07 +03:00
alexey-milovidov
4305509236
Update DistributedBlockOutputStream.cpp 2018-12-07 07:15:26 +03:00
alexey-milovidov
e7f4d5a12b
Update DistributedBlockOutputStream.cpp 2018-12-07 07:14:52 +03:00
alexey-milovidov
acb4feef26
Merge pull request #3760 from yandex/fix-database-ordinary-load-table-deadlock 
Fix database ordinary load table deadlock
 2018-12-07 07:13:58 +03:00
alexey-milovidov
c5e88307c4
Update DatabaseOrdinary.cpp 2018-12-07 07:11:11 +03:00
alexey-milovidov
58c9e98167
Update DatabaseOrdinary.cpp 2018-12-07 07:10:22 +03:00
alexey-milovidov
d6915bf61d
Merge pull request #3762 from yandex/fix-something-with-columns-alias-and-prewhere 
Fix source columns list for prewhere alias actions.
 2018-12-07 07:09:14 +03:00
alexey-milovidov
16bb923df5
Merge pull request #3769 from yandex/low-cardinality-native-format-conversion 
Support insertion into LowCardinality from old native clients.
 2018-12-07 07:08:43 +03:00
alexey-milovidov
990c7dea03
Merge pull request #3772 from yandex/mutations-default-database 
Add the default database to tables in a mutation query
 2018-12-07 07:06:20 +03:00
Alexey Milovidov
f3c72daf50 Fixed name [#CLICKHOUSE-2] 2018-12-07 06:21:17 +03:00
alexey-milovidov
8ad92ad94f
Merge pull request #3774 from yandex/missing-sql-compatibility-functions 
Some function name aliases and case insensitivity for SQL compatibility
 2018-12-07 02:36:27 +03:00
chertus
6fad51d642 QueryAliasesMatcher via InDepthNodeVisitor (bottom to top) CLICKHOUSE-3996 2018-12-06 22:02:42 +03:00
Alexey Zatelepin
df76b1c23a add examples that require rewrite of SELECT expr list to test [#CLICKHOUSE-3145] 2018-12-06 21:55:28 +03:00
Alexey Zatelepin
d70533d538 AddDefaultDatabaseVisitor now supports IN and descends into all parts of SELECT query #3597 2018-12-06 21:54:59 +03:00
Alexey Zatelepin
4cc4027821 add default database to table identifiers in alter commands #3597 2018-12-06 21:54:52 +03:00
Alexey Zatelepin
8d2cf2dbd1 add failing test #3597 2018-12-06 21:54:33 +03:00
chertus
60dc8fcac2 fixes for review CLICKHOUSE-3578 2018-12-06 20:20:17 +03:00
chertus
ff8fb077a4 InDepthNodeVisitor: extract AST traverse from visitor logic CLICKHOUSE-3996 2018-12-06 18:29:55 +03:00
Ivan Blinkov
21c76a3d63 Make if function name case-insensive #3704 2018-12-06 17:40:32 +03:00
Ivan Blinkov
afcd6f9f09 Make substring function name case-insensitive + add two aliases #3704 2018-12-06 17:30:10 +03:00
Nikolai Kochetov
2bb57ce472 Support insertion into LowCardinality from old native clients. 2018-12-06 17:08:42 +03:00
Ivan Blinkov
ed04453122 Add locate -> position alias #3713 2018-12-06 16:36:23 +03:00
Ivan Blinkov
4ebbe3502d Add replace -> replaceAll alias #3713 2018-12-06 16:23:45 +03:00
Ivan Blinkov
50314e3e91 Avoid repeating constants 2018-12-06 16:22:57 +03:00
alexey-milovidov
3f45fbbb33
Merge pull request #3763 from yandex/missing-sql-compatibility-functions 
Add lcase/ucase functions + make lower/upper case-insensitive #3715
 2018-12-06 03:44:45 +03:00
Ivan Blinkov
e110d0789f Add lcase/ucase + make lower/upper case-insensitive #3715 2018-12-05 19:59:35 +03:00
Nikolai Kochetov
c72152d7fc Added test. 2018-12-05 19:41:19 +03:00
Nikolai Kochetov
2fc0643bc9 Do not use table column aliases in prewhere alias action source columns 2018-12-05 19:36:26 +03:00
Ivan Lezhankin
57c5dbcd2b Code clean-up 2018-12-05 18:48:06 +03:00
Ivan Lezhankin
887e1089f1 Merge branch 'master' into kanterov_skip_unused_shards 2018-12-05 18:17:04 +03:00
Alexey Milovidov
f66b15efb3 Removed useless file #3754 2018-12-05 17:59:48 +03:00
Alexey Zatelepin
c9b97ae86c fix unexpected modification of original ORDER BY ast [#CLICKHOUSE-3859] 2018-12-05 17:02:34 +03:00
proller
61328a2c9b
ARM build fixes (#3754) 2018-12-05 16:41:29 +03:00
Nikolai Kochetov
b6d7871a54 Log exception if metadata was'n loaded. 2018-12-05 16:13:41 +03:00
Nikolai Kochetov
5149f35167 Log exception if metadata was'n loaded. 2018-12-05 16:07:03 +03:00
chertus
8500335ef5 cleanup unused code 2018-12-05 15:49:15 +03:00
Nikolai Kochetov
715d120ed9 Fix deadlock in DatabaseOrdinary in case of exception while loading tables. 2018-12-05 15:46:32 +03:00
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