Commit Graph

3796 Commits

Author SHA1 Message Date
alesapin
27419c965e Merge with master 2019-09-09 14:13:36 +03:00
alexey-milovidov
8389200229
Merge pull request #6832 from CurtizJ/merging_input_function
Merging #5450 (table function input).
2019-09-07 20:16:45 +03:00
alexey-milovidov
be8341d174
Merge pull request #6851 from Akazz/minor_fixes_in_tests-1
Fixing a few things in stateless tests
2019-09-06 22:00:54 +03:00
filimonov
526afd44ed Make SensitiveDataMasker a singleton. (#6810)
Among other things, it is used to filter logs, which are being written even after the global server context is deinitialized, so we can't keep masker there.
2019-09-06 20:48:27 +03:00
akazz
f511337028 Fixing minor things 2019-09-06 18:54:33 +03:00
Anton Popov
69da4f30b3
Merge branch 'master' into merging_input_function 2019-09-06 16:20:00 +03:00
alesapin
0c9a9dee1c Merge with master 2019-09-06 11:53:32 +03:00
alexey-milovidov
3d8ec8fb33
Merge pull request #6823 from yandex/fancyqlx-master
Merge #6167
2019-09-06 03:18:26 +03:00
Olga Khvostikova
f90642ce23
Merge pull request #6610 from CurtizJ/merging_with_ties_and_with_fill
WITH TIES modifier for LIMIT and WITH FILL modifier for ORDER BY. (continuation of #5069)
2019-09-05 22:45:48 +03:00
CurtizJ
b04cea7463 minor fixes of table function input 2019-09-05 16:17:01 +03:00
Nikolai Kochetov
e1e600b8b3 Update test with sample and prewhere. 2019-09-05 10:42:14 +03:00
Nikolai Kochetov
0d1846baab Update test create table if not exists sample_prewhere 2019-09-04 19:46:10 +03:00
Nikolai Kochetov
3bd453985b Merge branch 'master' of https://github.com/fancyqlx/ClickHouse into fancyqlx-master 2019-09-04 18:48:12 +03:00
alesapin
3ffa9fa972 Resolve conflict 2019-09-04 15:44:12 +03:00
alesapin
8b6abab486 Merge branch 'master' into ObjatieGroba-feature_multiple_disks 2019-09-04 15:41:27 +03:00
CurtizJ
7accc09066 Merge branch 'palasonic-add-input-function' of https://github.com/palasonic1/ClickHouse into merging_input_function 2019-09-04 15:25:20 +03:00
alexey-milovidov
b2e80b0cd9
Merge branch 'master' into query_masking 2019-09-03 22:58:15 +03:00
alexey-milovidov
4f7d472cb7
Merge pull request #6048 from Akazz/ternary-logic-light
Correct implementation of ternary logic for AND/OR
2019-09-03 22:09:56 +03:00
alexey-milovidov
5f33fd946f
Merge pull request #6711 from dimarub2000/exception_while_insert
Exception check added in client when sending insertion data.
2019-09-03 21:47:48 +03:00
alexey-milovidov
152dba1b2e
Merge pull request #6796 from CurtizJ/fix-flappy-ttl-test
Fix column TTL with user defaults.
2019-09-03 21:35:00 +03:00
alexey-milovidov
845a612b95
Merge pull request #6773 from infinivision/fix_issue_6575
fix DataTypeAggregateFunction deserialization
2019-09-03 21:19:41 +03:00
Zhichang Yu
fd0947899d fix 00980_shard_aggregation_state_deserialization.sql 2019-09-03 23:47:09 +08:00
alexey-milovidov
87e061d0e1
Merge pull request #6733 from 4ertus2/some
Add subquery_requires_alias setting (disabled by default)
2019-09-03 14:34:28 +03:00
CurtizJ
22badef1a2 Merge remote-tracking branch 'upstream/master' into merging_with_ties_and_with_fill 2019-09-03 13:47:18 +03:00
Anton Popov
aeb1860e62
Update 01006_ttl_with_default_2.sql 2019-09-03 13:31:52 +03:00
CurtizJ
ba98c038ab fix column ttl with user defaults 2019-09-03 13:27:02 +03:00
Zhichang Yu
fb5c11146a added functional test for shard bitmap deserialization 2019-09-03 17:39:15 +08:00
alesapin
e7308c1f21 Merge branch 'master' into ObjatieGroba-feature_multiple_disks 2019-09-03 11:02:32 +03:00
alexey-milovidov
cda9ac7385
Merge pull request #6780 from yandex/fix_mergex_column_only_stream
Move initialization of MergedColumnOnlyStream to constructor
2019-09-03 01:37:51 +03:00
alesapin
04a3db5857 Better test 2019-09-02 22:32:08 +03:00
Alexey Milovidov
457bc541ee Merge branch 'master' of github.com:yandex/ClickHouse 2019-09-02 22:13:22 +03:00
Alexey Milovidov
2b0af524cb Added a test #2282 2019-09-02 22:13:12 +03:00
alexey-milovidov
f180f7dd3d
Merge pull request #6779 from proller/fix27
CLICKHOUSE-4644 function arrayEnumerateUniqRanked: fix for empty arrays
2019-09-02 21:40:35 +03:00
CurtizJ
257df66b02 fix flappy ttl test 2019-09-02 21:29:56 +03:00
alesapin
f0c5ee5877 Merge with master 2019-09-02 20:34:18 +03:00
alesapin
5af8c196bd Move initialization of MergedColumnOnlyStream to constructor 2019-09-02 19:31:09 +03:00
proller
184e2ef9ab CLICKHOUSE-4644 arrayEnumerateUniqRanked: fix for empty arrays 2019-09-02 18:49:25 +03:00
Alexey Milovidov
7bf411548f Merge branch 'master' of github.com:yandex/ClickHouse into add-test-for-deadlock-system-tables 2019-09-02 18:04:15 +03:00
CurtizJ
de5e2b4d6b Merge remote-tracking branch 'upstream/master' into merging_with_ties_and_with_fill 2019-09-02 17:34:49 +03:00
chertus
bc95027cee better setting name: joined_subquery_requires_alias 2019-09-02 15:53:31 +03:00
chertus
2c0d569fa8 Merge branch 'master' into some 2019-09-02 15:32:24 +03:00
Alexander Tokmakov
e2928481a3 Merge branch 'master' into merging_template_format 2019-09-02 12:41:34 +03:00
alesapin
e7ee9b7a67 Merge master 2019-09-02 11:46:00 +03:00
Alexey Milovidov
e5ad85ba26 Fixed test 2019-09-02 03:21:42 +03:00
Alexey Milovidov
de2586cd15 Merge branch 'master' into add-test-for-deadlock-system-tables 2019-09-02 00:59:25 +03:00
Alexey Milovidov
7d1b1de895 Temporarily remove all LIVE VIEW tests 2019-09-02 00:49:11 +03:00
Alexey Milovidov
ba1c70add0 Merge branch 'add-test-for-deadlock-system-tables' of github.com:yandex/ClickHouse into add-test-for-deadlock-system-tables 2019-09-01 22:21:22 +03:00
Alexey Milovidov
45a9b4e184 Merge branch 'master' into add-test-for-deadlock-system-tables 2019-09-01 22:20:04 +03:00
Alexey Milovidov
8917572087 Speed up another test in cases when query_log is large (such as on production servers) 2019-09-01 18:28:43 +03:00
Alexey Milovidov
55f11b3675 Speed up test for "text_log" in cases when text_log is large (such as on production servers) 2019-09-01 18:25:46 +03:00