chertus
0581545cba
disable Decimal Comparison and Conditional compilation [CLICKHOUSE-3765]
2018-09-05 17:56:55 +03:00
Nikolai Kochetov
21081266e8
Fix test.
2018-09-05 16:04:28 +03:00
alesapin
16eaeefc6e
Fix naming
2018-09-05 15:42:37 +03:00
Nikolai Kochetov
71e08a4cc0
Fix test.
2018-09-05 15:19:15 +03:00
Nikolai Kochetov
1994fb832b
Fix test.
2018-09-05 15:16:37 +03:00
alesapin
2647c13c6b
CLICKHOUSE-3800: Fix naming, move compiled cache size setting to config.xml
2018-09-05 14:37:41 +03:00
Nikolai Kochetov
f18f6323c8
Fix build.
2018-09-05 13:31:00 +03:00
Nikolai Kochetov
46d6c03569
Merge branch 'master' into fix-prewhere-with-aliases
2018-09-05 13:08:07 +03:00
CurtizJ
18da41afe3
Merge remote-tracking branch 'upstream/master' into CLICKHOUSE-3893
2018-09-05 12:49:02 +03:00
CurtizJ
a7bbf83c91
Revert "Revert "Merge branch 'master' into CLICKHOUSE-3893""
...
This reverts commit cdb2c8a770
.
2018-09-05 12:47:57 +03:00
CurtizJ
cdb2c8a770
Revert "Merge branch 'master' into CLICKHOUSE-3893"
...
This reverts commit 0704da5756
, reversing
changes made to 4534d449c1
.
2018-09-05 12:45:57 +03:00
Nikolai Kochetov
8e806d4e3d
Fix test. [#CLICKHOUSE-3944]
2018-09-05 09:21:33 +03:00
alexey-milovidov
d12c1b02bc
Merge pull request #3029 from nvartolomei/nv/tidyup-thread-locals
...
Tidy up thread locals usage across translation units
2018-09-05 00:16:03 +03:00
Alexey Milovidov
035c07d01e
Fixed error with locking in InterpreterDropQuery [#CLICKHOUSE-3959]
2018-09-04 23:56:09 +03:00
alexey-milovidov
1fc94d6fff
Update ExpressionActions.cpp
2018-09-04 22:48:05 +03:00
Nikolai Kochetov
eedd2c50de
Fix test. [#CLICKHOUSE-3944]
2018-09-04 21:59:34 +03:00
Nikolai Kochetov
8b9937ec51
More comments. [#CLICKHOUSE-3944]
2018-09-04 21:50:19 +03:00
Nikolai Kochetov
3c6db8ebc1
Fix prewhere with aliased columns. [#CLICKHOUSE-3944]
2018-09-04 21:28:01 +03:00
chertus
1ea6bc9691
decimal_check_overflow [CLICKHOUSE-3765]
2018-09-04 18:04:23 +03:00
Alexey Zatelepin
4f91833e67
Merge branch 'master' into alter-update
...
Conflicts:
dbms/src/Parsers/ASTIdentifier.cpp
2018-09-04 17:39:08 +03:00
Alexey Zatelepin
b6a5bbc4e9
move validation to MutationsInterpreter [#CLICKHOUSE-13]
2018-09-04 17:33:48 +03:00
Alexey Zatelepin
dc0c731c10
later mutation stages now work with IN (SELECT ...) [#CLICKHOUSE-13]
2018-09-04 14:39:10 +03:00
Nicolae Vartolomei
e28753061f
Tidy up thread locals usage across translation units
...
Fixes #3015 .
2018-09-03 22:36:16 +01:00
Alexey Zatelepin
d4d1020798
execute UPDATEs and DELETEs in stages [#CLICKHOUSE-13]
2018-09-03 22:34:49 +03:00
alesapin
a7bd2b42e8
CLICKHOUSE-3800: Review fixes
2018-09-03 13:14:05 +03:00
alesapin
83574eed7c
Merge remote-tracking branch 'upstream/master'
2018-09-03 13:11:33 +03:00
alesapin
11d248ba10
Resolve conflict
2018-09-03 13:11:10 +03:00
CurtizJ
3bc743c50d
do not merge blocks into one
2018-09-03 12:49:04 +03:00
alexey-milovidov
7d8f0a6140
Merge pull request #3022 from yandex/padded-arena
...
Padded Arena
2018-09-03 05:39:42 +03:00
Alexey Milovidov
3873ab1adb
Fixed tests in Sandbox [#CLICKHOUSE-2]
2018-09-03 05:32:29 +03:00
Alexey Milovidov
cb0af7c3af
Removed unused aggregation method [#CLICKHOUSE-2]
2018-09-03 03:33:29 +03:00
Alexey Milovidov
8e17652f0d
Removed AggregationMethodConcat, because AggregationMethodSerialized appeared to be far superior [#CLICKHOUSE-2]
2018-09-03 03:07:05 +03:00
Alexey Milovidov
0b2ec39f11
Miscellaneous [#CLICKHOUSE-2]
2018-09-03 03:00:56 +03:00
Alexey Milovidov
13aac718a3
Reverted wrong change [#CLICKHOUSE-2]
2018-09-03 01:24:46 +03:00
Alexey Milovidov
1de3f144f6
Padding chunks in Arena in attempt to improve performance [#CLICKHOUSE-2]
2018-09-03 00:28:25 +03:00
Alexey Milovidov
4b01c2d9ba
Added comment [#CLICKHOUSE-2]
2018-09-02 22:49:12 +03:00
Alexey Milovidov
24675aed1a
Addition to prev. revision [#CLICKHOUSE-2]
2018-09-02 08:01:21 +03:00
Alexey Milovidov
77ccc8c65c
Addition to prev. revision [#CLICKHOUSE-2]
2018-09-02 07:58:55 +03:00
Alexey Milovidov
ff13752d01
Addition to prev. revision [#CLICKHOUSE-2]
2018-09-02 06:47:14 +03:00
Alexey Milovidov
538edbb8e2
Addition to prev. revision [#CLICKHOUSE-2]
2018-09-02 06:33:48 +03:00
Alexey Milovidov
fc27be314b
Avoid temporary nullptr references [#CLICKHOUSE-2]
2018-09-02 06:00:04 +03:00
Alexey Milovidov
f97d9e8f3f
Fixed build #2957
2018-09-02 03:25:33 +03:00
Alexey Milovidov
f7107f12b4
Merge branch 'master' into extra-warnings
2018-09-02 03:13:36 +03:00
alexey-milovidov
16dc142a05
Merge pull request #3017 from yandex/ubsan-fixes
...
Fixes for UBSan.
2018-09-02 03:12:20 +03:00
Alexey Milovidov
c75cc14703
Fixed error in UBSan [#CLICKHOUSE-2]
2018-09-01 23:28:46 +03:00
Alexey Milovidov
751cf62262
Added documentation for CurrentMetrics #3010
2018-09-01 22:51:38 +03:00
alexey-milovidov
64b48b5fcf
Merge pull request #2907 from zhang2014/feature/support_join_for_table_function
...
ISSUES-2906 support join for table function
2018-09-01 20:49:49 +03:00
alexey-milovidov
889e060993
Merge pull request #3006 from VadimPE/CLICKHOUSE-1660
...
CLICKHOUSE-1660 Added duplicated columns removal in USING(...)
2018-09-01 20:43:54 +03:00
Alexey Milovidov
8f54125884
Minor modifications #2808
2018-09-01 06:17:43 +03:00
alexey-milovidov
6d5092518f
Merge pull request #2808 from chenxing-xc/master
...
Aligned aggregate state #2754
2018-09-01 05:38:11 +03:00
alesapin
66eb5402b0
Fix style
2018-08-31 16:25:33 +03:00
alesapin
a3ebbea3a0
Fix style
2018-08-31 16:23:56 +03:00
alesapin
650d15696f
CLICKHOUSE-3800: Add memory comsumption profile_event of compiled expression cache
2018-08-31 15:39:27 +03:00
alesapin
ac6ab62c6f
CLICKHOUSE-3800: Remove use after free of context
2018-08-31 13:27:08 +03:00
VadimPE
db8e63ff67
CLICKHOUSE-1660 Added duplicated columns removal in USING(...)
2018-08-31 13:00:46 +03:00
alesapin
711b228a30
Merge remote-tracking branch 'upstream/master'
2018-08-31 10:15:33 +03:00
alexey-milovidov
a05cdfbb45
Merge branch 'master' into extra-warnings
2018-08-31 03:03:44 +03:00
Alexey Milovidov
0c6c1e83a3
Avoid excessive padding in Pretty formats [#CLICKHOUSE-2]
2018-08-31 02:34:12 +03:00
Alexey Milovidov
5df5df8971
utils/check-style/check-style -n
2018-08-31 00:13:34 +03:00
alexey-milovidov
3b8e3c854c
Merge pull request #3000 from proller/fix3
...
CLICKHOUSE-3940 Fix crash on join
2018-08-30 22:52:59 +03:00
alexey-milovidov
f22b12b698
Update Join.cpp
2018-08-30 22:52:28 +03:00
Alexey Milovidov
76eaacf1be
Fixed tests in Sandbox [#CLICKHOUSE-2]
2018-08-30 22:27:36 +03:00
alesapin
ed34ffc94e
Merge branch 'master' into master
2018-08-30 19:34:29 +03:00
alesapin
6e64067a70
CLICKHOUSE-3800: Move cache to context, change hashing algorithm, add drop instruction for compiled expressions cache
2018-08-30 19:31:20 +03:00
proller
81960a2690
CLICKHOUSE-3940 Fix crash on join
2018-08-30 18:44:30 +03:00
Alexey Zatelepin
dc2a4c21e9
execute ALTER UPDATE [#CLICKHOUSE-13]
2018-08-30 16:56:43 +03:00
VadimPE
5551f2902c
CLICKHOUSE-1660
2018-08-30 15:32:11 +03:00
alexey-milovidov
b05c62be9f
Merge pull request #2994 from CurtizJ/CLICKHOUSE-3935
...
ClickHouse-3935 Fix bug with qualified columns in where clause
2018-08-30 15:01:47 +03:00
alexey-milovidov
2e22a14c5c
Merge pull request #2997 from VadimPE/fix_exception_message
...
Fix error message in exception message for DROP TABLE/PARTITION
2018-08-30 14:19:58 +03:00
VadimPE
81893ae577
Fix error message
2018-08-30 12:33:31 +03:00
CurtizJ
764aa70d04
fix bug with quailified columns in where clause
2018-08-30 01:09:04 +03:00
CurtizJ
b43d403815
Revert "fix bug with quailified columns in where clause"
...
This reverts commit e007fd2b9e
.
2018-08-30 01:04:45 +03:00
alesapin
647446c45e
CLICKHOUSE-3800: More correct compilated function call counter
2018-08-29 23:05:31 +03:00
CurtizJ
e007fd2b9e
fix bug with quailified columns in where clause
2018-08-29 22:45:29 +03:00
alexey-milovidov
794b4d30a8
Merge pull request #2989 from yandex/fix-context-lifetime-try-2-quick
...
Fix lifetime of Context reference in functions (first quick variant) …
2018-08-29 21:32:48 +03:00
alexey-milovidov
07408490b6
Merge pull request #2982 from VadimPE/CLICKHOUSE-3934
...
CLICKHOUSE-3934 add join_default_strictness
2018-08-29 21:32:03 +03:00
alexey-milovidov
b99bf0c558
Update Settings.h
2018-08-29 21:27:41 +03:00
alesapin
06adf19053
CLICKHOUSE-3800: Remove tab
2018-08-29 20:51:23 +03:00
alesapin
d2a5efb11b
CLICKHOUSE-3800: Add perf test
2018-08-29 20:49:43 +03:00
Alexey Milovidov
3361247126
Fix lifetime of Context reference in functions (first quick variant) [#CLICKHOUSE-2]
2018-08-29 18:36:24 +03:00
Alexey Milovidov
4ebfaa768e
Miscellaneous [#CLICKHOUSE-2]
2018-08-29 18:16:34 +03:00
VadimPE
f253719eac
CLICKHOUSE-3934 add SettingsJoinStrictness
2018-08-29 18:15:42 +03:00
alesapin
7498105b67
CLICKHOUSE-3800: Fix hash and equals functions
2018-08-29 18:14:44 +03:00
Alexey Milovidov
697067f207
Fix lifetime of Context reference in functions (first quick variant) [#CLICKHOUSE-2]
2018-08-29 17:59:08 +03:00
VadimPE
d626ae11a7
CLICKHOUSE-3934
2018-08-29 16:54:43 +03:00
Vadim Plakhtinskiy
f0c16900aa
CLICKHOUSE-3934 fix bug with CROSS JOIN
2018-08-29 16:51:07 +03:00
chertus
a69c936b44
improve field visitors for UUID CLICKHOUSE-3249
2018-08-29 14:58:40 +03:00
alesapin
a8db29c714
Merge remote-tracking branch 'upstream/master'
2018-08-29 11:42:50 +03:00
Alexey Milovidov
2581d88f0e
Better error message: avoid confusion when column is named a [#CLICKHOUSE-3]
2018-08-28 23:39:18 +03:00
Alexey Milovidov
f45afa37a8
Miscellaneous [#CLICKHOUSE-3]
2018-08-28 21:25:40 +03:00
alesapin
1a85271702
CLICKHOUSE-3800: Add expression cache
2018-08-28 20:06:42 +03:00
Vadim
9a0802f5bd
fix documentation
2018-08-28 17:52:27 +03:00
Vadim
98abde8480
Update ExpressionAnalyzer.cpp
2018-08-28 17:41:15 +03:00
Vadim
096b5e6a9d
Update ExpressionAnalyzer.cpp
2018-08-28 17:40:07 +03:00
Vadim
564ddbf8d8
Update ExpressionAnalyzer.cpp
2018-08-28 17:33:57 +03:00
Vadim
a8c1199ad4
Merge branch 'master' into CLICKHOUSE-3934
2018-08-28 17:06:17 +03:00
VadimPE
398d38eead
CLICKHOUSE-3934 add join_default_strictness
2018-08-28 16:57:31 +03:00
CurtizJ
a603595120
remove redundant code
2018-08-28 12:27:17 +03:00
Alexey Milovidov
74fee0dc98
Enabling -Wshadow [#CLICKHOUSE-2]
2018-08-27 21:20:58 +03:00
Alexey Milovidov
a3cd1ea8cb
Enabling -Wshadow [#CLICKHOUSE-2]
2018-08-27 21:16:32 +03:00
Alexey Milovidov
0d02315778
Enabling -Wshadow [#CLICKHOUSE-2]
2018-08-27 21:07:17 +03:00
Alexey Milovidov
3efffba44e
Enabling -Wshadow [#CLICKHOUSE-2]
2018-08-27 21:05:28 +03:00
Alexey Milovidov
956f76e000
Enabling -Wshadow [#CLICKHOUSE-2]
2018-08-27 20:58:43 +03:00
Alexey Milovidov
5b257c588f
Enabling -Wshadow [#CLICKHOUSE-2]
2018-08-27 20:42:13 +03:00
Alexey Milovidov
6e18af7ed3
Enabling -Wshadow [#CLICKHOUSE-2]
2018-08-27 20:18:14 +03:00
Alexey Milovidov
486d87ebcd
Merge remote-tracking branch 'origin/master' into extra-warnings
2018-08-27 20:01:33 +03:00
alexey-milovidov
95b2bcbc6b
Merge pull request #2970 from 4ertus2/decimal
...
Some more Decimal
2018-08-27 19:59:26 +03:00
Alexey Milovidov
e5a2dd8624
Merge branch 'master' into extra-warnings
2018-08-27 19:19:04 +03:00
chertus
ee873c8e9f
Merge branch 'master' into decimal
2018-08-27 19:18:48 +03:00
Amos Bird
ea84430864
Get rid of useless std::move to get NRVO
...
http://eel.is/c++draft/class.copy.elision#:constructor,copy,elision
Some quote:
> Speaking of RVO, return std::move(w); prohibits it. It means "use move constructor or fail to compile", whereas return w; means "use RVO, and if you can't, use move constructor, and if you can't, use copy constructor, and if you can't, fail to compile."
There is one exception to this rule:
```cpp
Block FilterBlockInputStream::removeFilterIfNeed(Block && block)
{
if (block && remove_filter)
block.erase(static_cast<size_t>(filter_column));
return std::move(block);
}
```
because references are not eligible for NRVO, which is another rule "always move rvalue references and forward universal references" that takes precedence.
2018-08-27 22:15:48 +08:00
zhang2014
f8d7cf17a7
ISSUES-2482 fix crash when on cluster
2018-08-27 19:03:22 +08:00
Alexey Milovidov
a70d0b79e4
Enabling -Wextra-semi [#CLICKHOUSE-2]
2018-08-26 04:13:02 +03:00
Alexey Milovidov
0fd919fdc5
Enabling -Wextra-semi [#CLICKHOUSE-2]
2018-08-26 04:11:58 +03:00
Alexey Milovidov
c193d15ef2
Merge branch 'master' into generalize-zookeeper
2018-08-26 03:32:15 +03:00
Alexey Milovidov
aa936b09f9
Added check for max_block_size = 0 #2447
2018-08-25 19:32:44 +03:00
Alexey Milovidov
3475ef5304
Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2]
2018-08-25 04:58:14 +03:00
CurtizJ
cf3fbb8c51
minor changes
2018-08-24 20:37:08 +03:00
chertus
53ec40eeee
some decimal field improvements CLICKHOUSE-3765
2018-08-24 19:35:00 +03:00
CurtizJ
e0b3283ed3
Merge remote-tracking branch 'upstream/master' into CLICKHOUSE-3893
2018-08-24 18:09:53 +03:00
CurtizJ
c18ad18d96
Add rollup modificator
2018-08-24 18:00:00 +03:00
chertus
54a3c028c5
Merge branch 'master' into decimal
2018-08-24 14:19:41 +03:00
Alexey Milovidov
eee6644a22
Better exception message in case of wrong number of arguments for function "if" [#CLICKHOUSE-3932]
2018-08-24 12:57:42 +03:00
zhang2014
cdc4c65adc
ISSUES-2906 support join for table function
2018-08-24 15:40:09 +08:00
zhang2014
83ceeca199
ISSUES-2906 support join for table function
2018-08-24 14:45:24 +08:00
alexey-milovidov
5637b30556
Merge pull request #2929 from zhang2014/fix/support_asterisk_for_predcate_optimize
...
ISSUES-863 fix predicate not work for asterisk
2018-08-24 08:53:04 +03:00
zhang2014
21528697f8
ISSUES-863 turn off enable_optimize_predicate_expression
2018-08-24 13:30:49 +08:00
Alexey Milovidov
6043ea02de
Style #2913
2018-08-24 08:25:00 +03:00
zhang2014
bf517d5523
ISSUES-863 fix failure tests
2018-08-24 12:11:32 +08:00
zhang2014
32cc611f5d
ISSUES-863 fix predicate optimizer not work for asterisk
2018-08-24 10:05:43 +08:00
alexey-milovidov
c538e78453
Merge pull request #2933 from zlobober/patch-1
...
More verbose access denied error message
2018-08-24 01:44:51 +03:00
Max Akhmedov
d5ccd26348
More verbose access denied error message
2018-08-23 21:44:13 +03:00
proller
38347f120d
fixes
2018-08-23 15:20:54 +03:00
proller
426b8c6130
Merge remote-tracking branch 'upstream/master' into fix3
2018-08-23 14:27:05 +03:00
Alexey Milovidov
b9778a3764
Speed up fuzz tests [#CLICKHOUSE-2]
2018-08-23 04:31:28 +03:00
chertus
314dcc5e9e
add two options to disable Decimal overflow checks CLICKHOUSE-3906
2018-08-22 16:22:56 +03:00
proller
b6dabaacb3
Merge remote-tracking branch 'upstream/master' into fix3
2018-08-22 15:22:58 +03:00
Alexey Milovidov
a1d745888d
Dummy implementation for non-Linux platforms #2482
2018-08-22 08:56:06 +03:00
Alexey Milovidov
d355aa3932
Enlarged the size of system log queue 1000 times. It is reasonable, because multiple records are generated for each query for query_thread_log. The maximum size of system log queue will be few hundred MBs #2482
2018-08-22 07:36:53 +03:00
proller
3884e0793c
Merge remote-tracking branch 'upstream/master' into fix3
2018-08-22 03:01:15 +03:00
Alexey Milovidov
509b43328e
Removed useless method #2482
2018-08-22 02:58:12 +03:00
Alexey Milovidov
b2b26f6e54
Removed useless method #2482
2018-08-22 02:56:55 +03:00
CurtizJ
0704da5756
Merge branch 'master' into CLICKHOUSE-3893
2018-08-21 20:34:01 +03:00
CurtizJ
4534d449c1
working on rollup
2018-08-21 19:08:45 +03:00
proller
fc2925b567
Squashed commit of the following:
...
commit 2722e540abfee4a527d716474c4ca582eceeee08
Merge: b4f3af824 aebddd550
Author: proller <proller@github.com>
Date: Tue Aug 21 18:34:18 2018 +0300
Merge remote-tracking branch 'upstream/master' into fix3
commit b4f3af824b88a8b6826583bb483730827574e8ad
Author: proller <proller@github.com>
Date: Tue Aug 21 17:00:20 2018 +0300
fix
commit 3a18fa7ded2a7d6b7a0883a1b9c2d6b99360837d
Author: proller <proller@github.com>
Date: Tue Aug 21 16:57:17 2018 +0300
fix
commit 5d42220c2cf47e1a86bdc73dbfc24b68f8626891
Author: proller <proller@github.com>
Date: Tue Aug 21 16:50:21 2018 +0300
freebsd fixes
commit 7baf4fb5ba4575f79b0d12a9ffaaabd34e1006da
Author: proller <proller@github.com>
Date: Tue Aug 21 16:17:19 2018 +0300
fix
commit e1fe707fd765b841a8d0952d91a980128cbf91d0
Author: proller <proller@github.com>
Date: Tue Aug 21 15:35:21 2018 +0300
fix
commit 027887c71b3ffa98d9473d50d8c3b79cbf3304ac
Author: proller <proller@github.com>
Date: Tue Aug 21 15:25:57 2018 +0300
fix
commit 81af41bfcfff7c02fe4060196cf03c2d2aab416e
Author: proller <proller@github.com>
Date: Tue Aug 21 15:20:41 2018 +0300
fix
commit 93d572c85d9c7e331254999a614c3b22b5573b02
Author: proller <proller@github.com>
Date: Tue Aug 21 14:58:07 2018 +0300
SPLIT_SHARED
commit dd5b8990d8527d59b1e890943d80c2bf27c613ce
Author: proller <proller@github.com>
Date: Tue Aug 21 14:52:39 2018 +0300
fix
commit 4840ca12ab752a38c1ef482e8ec59c5859bb48d7
Author: proller <proller@github.com>
Date: Tue Aug 21 14:46:31 2018 +0300
fix
commit abde633beb86f2a0d025d6fcf079965dbd827b92
Author: proller <proller@github.com>
Date: Tue Aug 21 14:25:32 2018 +0300
fix
commit 0d94a5476a5ba8ba5e88638d58f2cfbf2b4b662d
Author: proller <proller@github.com>
Date: Tue Aug 21 14:45:18 2018 +0300
Travis: try fail on ninja fail
commit c2686f90b68255c2beb0a708804aef404e80a6d2
Merge: 2c3427bbd 2aa7eb463
Author: proller <proller@github.com>
Date: Tue Aug 21 14:25:15 2018 +0300
Merge remote-tracking branch 'upstream/master' into fix3
commit 2c3427bbdb861edbb188ed4621e8a05cafaedafb
Author: proller <proller@github.com>
Date: Mon Aug 20 23:57:24 2018 +0300
fix
commit 530170c6a81d31dcfa81230e48520383234df4bc
Merge: 9abec162c f6e4ec970
Author: proller <proller@github.com>
Date: Mon Aug 20 23:57:03 2018 +0300
Merge remote-tracking branch 'upstream/master' into fix3
commit 9abec162cb2e09bbc2f33cbe80fe76791f6e5a77
Author: proller <proller@github.com>
Date: Mon Aug 20 23:49:58 2018 +0300
Apple fixes
commit 36d05e8217440fbc8ae21571b06d4eb6d679d538
Author: proller <proller@github.com>
Date: Mon Aug 20 23:25:05 2018 +0300
apple fix
commit aeec3e845e4456e89fbb1b1af6f9f36820a46e33
Author: proller <proller@github.com>
Date: Mon Aug 20 23:20:06 2018 +0300
fixes
commit 427961d916a5954981e47d94733996deb2a616ce
Author: proller <proller@github.com>
Date: Mon Aug 20 23:11:11 2018 +0300
fix
commit a7dd55ff8f653624c0f3dbcbc54defd3b3ae97af
Author: proller <proller@github.com>
Date: Mon Aug 20 22:41:53 2018 +0300
fix
commit 6200e0d315c7a62bae63a8de0fc32f7937770ad2
Merge: 8a541d7e6 21cedbe46
Author: proller <proller@github.com>
Date: Mon Aug 20 22:35:49 2018 +0300
Merge remote-tracking branch 'upstream/master' into fix3
commit 8a541d7e64c89e2c16af6c909e0353361153aaa3
Author: proller <proller@github.com>
Date: Mon Aug 20 22:34:32 2018 +0300
Do not use poco types
commit fd560f43d048b7e3307c6c6b9c9d9918230014d8
Author: proller <proller@github.com>
Date: Mon Aug 20 22:20:42 2018 +0300
Try fix apple build
commit cfb2eba07ac06f19e822d3474341d800b1f98cf1
Merge: 8d2e31c90 5b81fdfc0
Author: proller <proller@github.com>
Date: Mon Aug 20 22:03:24 2018 +0300
Merge remote-tracking branch 'upstream/master' into fix3
commit 8d2e31c908be2e99d09e2a9dde2414ab82a5e93c
Author: proller <proller@github.com>
Date: Mon Aug 20 21:56:06 2018 +0300
travis: TEST_SERVER_STARTUP_WAIT=10
2018-08-21 18:56:50 +03:00
Nikolai Kochetov
a475bb1c9f
Merge branch 'master' into low-cardinality-group-by
2018-08-21 17:28:10 +03:00
Alexey Milovidov
7d76c3fd4f
Miscellaneous [#CLICKHOUSE-3765]
2018-08-21 07:31:35 +03:00
Alexey Milovidov
3b39f6a4c3
Split ZooKeeperExceptions to three different metrics #2316
2018-08-21 04:27:22 +03:00
proller
91363760ea
Merge remote-tracking branch 'upstream/master' into fix3
2018-08-20 19:34:09 +03:00
Alexey Milovidov
465ff07398
Merge branch 'master' of github.com:yandex/ClickHouse
2018-08-20 18:50:09 +03:00
Alexey Milovidov
2717185991
Modified names #2015
2018-08-20 18:49:39 +03:00
proller
159cdbbb3e
Try fix build (link order)
2018-08-20 18:34:37 +03:00
Nikolai Kochetov
b64bb8af14
Fix tests.
2018-08-20 15:57:31 +03:00
Nikolai Kochetov
391b4b5927
Merged with master.
2018-08-20 15:25:06 +03:00
Alexey Milovidov
f9a70a378c
Addition to prev. revision #2482
2018-08-20 05:42:17 +03:00
Alexey Milovidov
f1ba2f9a33
Try to fix "query in form data" feature while still tracking limits for external tables (try №2) #2482
2018-08-20 05:23:35 +03:00
Alexey Milovidov
06a7d0194d
Fixed test #2482
2018-08-19 07:56:20 +03:00
Alexey Milovidov
6741582950
Better diagnostic in test #2482
2018-08-19 07:54:14 +03:00
Alexey Milovidov
1c4f5d3359
Miscellaneous #2482
2018-08-17 21:57:07 +03:00
chenxing.xc
63fb4a5515
incorrect result iff only bucket #0 block received
2018-08-16 10:50:09 +08:00
Alexey Milovidov
56af576fe5
Removed duplicate query_id logging #2482
2018-08-16 01:39:19 +03:00
Alexey Milovidov
76af46ed5d
Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910
...
Conflicts:
dbms/src/Interpreters/Settings.h
dbms/tests/queries/0_stateless/00687_top_and_offset.sql
2018-08-16 00:44:24 +03:00
zhang2014
1549baa4e9
ISSUES-863 fix test failure #2015 #2840
2018-08-15 13:43:44 +08:00
Alexey Milovidov
dfd9be86d8
Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910
2018-08-15 00:50:00 +03:00
Alexey Milovidov
5410f73ba7
Fixed warnings #2015
2018-08-15 00:49:51 +03:00
Alexey Milovidov
31867c0612
Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910
2018-08-15 00:48:51 +03:00
Alexey Milovidov
03af27a218
Fixed warnings #2015
2018-08-15 00:48:39 +03:00
Alexey Milovidov
9916a75f2e
Merging #2482
2018-08-15 00:35:26 +03:00
alexey-milovidov
ce9c6a5ab3
Merge branch 'master' into feature/ISSUES-863
2018-08-15 00:34:23 +03:00
alexey-milovidov
8586e6bb2e
Merge pull request #2787 from zhang2014/fix/replace_asterisk
...
ISSUES-2786 fix replace asterisk with join query
2018-08-15 00:28:35 +03:00
Alexey Milovidov
93c9eab088
Merging #2482
2018-08-15 00:15:17 +03:00
alexey-milovidov
e7b671ec98
Merge branch 'master' into feature/ISSUES-863
2018-08-15 00:10:21 +03:00
Alexey Milovidov
acb99b49df
Merge branch 'master' into CLICKHOUSE-2910
2018-08-14 23:29:42 +03:00
chertus
8c54b480bc
minor fix
2018-08-14 16:26:23 +03:00
chertus
74823c8c17
add allow_experimental_decimal to settings
2018-08-14 15:51:45 +03:00
chertus
241b05c80a
merge master
2018-08-14 15:50:28 +03:00
alexey-milovidov
f42bd36fa0
Merge pull request #2856 from zhang2014/feature/add_check_access_database_for_system_tables
...
Add check access database for system tables
2018-08-14 12:53:43 +03:00
zhang2014
e51264c3a5
Add check access database for system tables
2018-08-14 11:28:32 +08:00
alexey-milovidov
3e9f25b1b4
Merge pull request #2830 from yandex/data-type-with-dictionary
...
LowCardinality data type.
2018-08-13 23:49:21 +03:00
Nikolai Kochetov
5d5344f106
Added allow_experimental_low_cardinality_type setting.
2018-08-13 20:02:54 +03:00
Nikolai Kochetov
5379c52b9e
Support Aggregator for LowCardinality single key.
2018-08-13 19:23:40 +03:00
zhang2014
59b25812e7
Add check access database for system tables
2018-08-13 17:35:40 +08:00
alexey-milovidov
f538bd2113
Merge branch 'master' into decimal
2018-08-13 11:57:42 +03:00
zhang2014
62a85536b4
ISSUES-2786 add asterisk_left_columns_only setting
2018-08-13 11:02:50 +08:00
zhang2014
d7cd77640d
ISSUES-2786 fix replace asterisk with join query
2018-08-13 11:01:55 +08:00
proller
1e3c637741
Try fix internal compiler headers path
2018-08-11 02:28:33 +03:00
proller
3af99efd65
CLICKHOUSE-3530: Versioned inetrnal compiler headers ( #2837 )
2018-08-10 22:53:49 +03:00
Kirill Shvakov
a3ace87046
Add new system table "merge_tree_settings" ( #2841 )
...
* #2249 allow macros while creating kafka engine
* Update Macros.cpp
* Update Macros.h
* Add system table: merge_tree_settings
2018-08-10 20:42:12 +03:00
Nikolai Kochetov
4a62ab9d5c
Merged with master.
2018-08-10 16:53:08 +03:00
Alexey Milovidov
36db216abf
Preparation for extra warnings [#CLICKHOUSE-2]
2018-08-10 07:02:56 +03:00
Alexey Milovidov
d8ca4345b6
Fixed style violations [#CLICKHOUSE-2]
2018-08-10 04:41:54 +03:00
Anton Popov
c019d732c5
ClickHouse 3419 Add setting prefer_localhost_replica ( #2832 )
...
* add setting prefer_localhost_replica
* add prefer_localhost_replica setting
* fix bugs
* update setting comment
* Add test for prefer_localhost_replica
* fix bug
2018-08-10 04:27:54 +03:00
Nikolai Kochetov
da822f1cf3
Merged with master.
2018-08-09 14:32:19 +03:00
Nikolai Kochetov
ab10005af5
Renamed settings for LowCardinality type.
2018-08-09 13:52:46 +03:00
Nikolai Kochetov
c339313d8b
Fix LowCardinality conversions for defaults.
2018-08-09 13:52:33 +03:00
alesapin
402815977f
Add new error in fetchPartition op
2018-08-08 21:01:25 +03:00
Nikolai Kochetov
f4d9d50168
Merged with master.
2018-08-08 15:01:18 +03:00
Nikolai Kochetov
c8457abb1b
Made IFunction::isDeterministic and IFunction::isDeterministicInScopeOfQuery are const. Disabled default implementation with dictionary for not isDeterministicInScopeOfQuery functions.
2018-08-08 14:26:18 +03:00
Alexey Milovidov
207a2b8b3c
Fixed error #2795
2018-08-08 06:09:59 +03:00
alexey-milovidov
4e7b2927dd
Update Settings.h
2018-08-08 02:35:32 +03:00
alexey-milovidov
03727012a6
Update Settings.h
2018-08-08 02:35:32 +03:00