Commit Graph

9895 Commits

Author SHA1 Message Date
CurtizJ
8fc1ddd646 fix arguments check 2018-09-07 15:36:56 +03:00
CurtizJ
a784b828ce Merge branch 'master' of https://github.com/yandex/ClickHouse into CLICKHOUSE-3723.3 2018-09-07 13:02:07 +03:00
Alexey Milovidov
199d8734f9 Fixed race condition in DROP/CREATE MergeTree tables [#CLICKHOUSE-3939] 2018-09-07 04:39:48 +03:00
Nikolai Kochetov
a6b51d1fc7 Fix virtual columns for prewhere with aliases. 2018-09-06 22:18:38 +03:00
CurtizJ
83677e4e44 better code 2018-09-06 22:13:47 +03:00
Nikolai Kochetov
af47426401 Merge branch 'master' into fix-prewhere-with-aliases-3 2018-09-06 21:49:25 +03:00
Alexey Milovidov
98b835ea52 Fixed build [#CLICKHOUSE-2] 2018-09-06 21:44:12 +03:00
Nikolai Kochetov
8593145794 Merged with master 2018-09-06 21:30:03 +03:00
CurtizJ
e4a1ba728d better error code 2018-09-06 21:28:43 +03:00
alexey-milovidov
580683310b
Merge pull request #2990 from alesapin/master
CLICKHOUSE-3800: Add Cache for compiled expression.
2018-09-06 21:12:08 +03:00
alexey-milovidov
5057b15fab
Merge pull request #3047 from 4ertus2/decimal
Decimal improvements
2018-09-06 21:11:06 +03:00
proller
db13ef96d6 Fix ssl init (#3056)
* Try to fix ../libs/libglibc-compatibility/glibc-compatibility.c:151: multiple definition of `explicit_bzero'
contrib/ssl/crypto/libcrypto.a(explicit_bzero.c.o):../contrib/ssl/crypto/compat/explicit_bzero.c:16: first defined here

* Fix ssl init

* fix

* noncopyable

* clean
2018-09-06 21:05:33 +03:00
CurtizJ
7e2519a127 fix wrong code 2018-09-06 21:02:41 +03:00
CurtizJ
fb923dcbf5 aggregate function states addition 2018-09-06 20:59:23 +03:00
Nikolai Kochetov
641771f66f Fix virtual columns for prewhere with aliases. 2018-09-06 20:45:49 +03:00
proller
6d8b1bea4b Try fix crash in StorageBuffer 2018-09-06 18:06:54 +03:00
chertus
5bbfdc2208 supertypes for Decimals [CLICKHOUSE-3765] 2018-09-06 13:48:54 +03:00
alesapin
f331b48c58 Fix build 2018-09-06 12:52:22 +03:00
Nikolai Kochetov
ee89ddb445 Fix removing source aliased columns. [#CLICKHOUSE-3965] 2018-09-06 12:41:42 +03:00
Alexander Sapin
03174e131d Merge remote-tracking branch 'upstream/master' 2018-09-06 12:39:42 +03:00
Alexander Sapin
3cbcd23a17 CLICKHOUSE-3800:Add if's for old llvm version 2018-09-06 12:10:40 +03:00
chertus
3bd586cad9 Merge branch 'master' into decimal 2018-09-06 11:57:46 +03:00
chertus
a969292b50 revert textCanContainOnlyValidUTF8() for Decimal; add DataTypeExtractor [CLICKHOUSE-3906] 2018-09-06 11:56:46 +03:00
Alexey Milovidov
5a096ee099 Attempt to fix an issue mentioned by Matt Keranen in #2958 2018-09-06 05:47:59 +03:00
Alexey Milovidov
b82d532db0 Removed incorrect code [#CLICKHOUSE-3939] 2018-09-06 05:30:58 +03:00
Alexey Milovidov
f584344184 Miscellaneous [#CLICKHOUSE-3939] 2018-09-06 05:24:35 +03:00
Alexey Milovidov
d8809eb2a1 Whitespaces [#CLICKHOUSE-3939] 2018-09-06 04:57:55 +03:00
Alexey Milovidov
9df01c1012 Style #2948 2018-09-06 04:06:30 +03:00
alexey-milovidov
0ca8e20e66
Merge pull request #2948 from CurtizJ/CLICKHOUSE-3893
CLICKHOUSE-3893 - Add modificator rollup.
2018-09-06 03:59:02 +03:00
alexey-milovidov
4c549f79cd
Update RollupBlockInputStream.cpp 2018-09-06 03:58:24 +03:00
alexey-milovidov
f77cd9950c
Merge pull request #3034 from CurtizJ/CLICKHOUSE-3723.2
CLICKHOUSE-3723 Multiply aggregate states. Fix and optimize #2527.
2018-09-06 03:49:07 +03:00
alexey-milovidov
e585ba54f9
Merge pull request #3048 from yandex/The-Alchemist-support_uuid_in_external_dicts
The alchemist support UUID in external dicts
2018-09-06 03:29:56 +03:00
alexey-milovidov
4f9dd85c5e
Merge pull request #3050 from proller/fix20
Internal compiler run fixes
2018-09-06 03:29:10 +03:00
Alexey Milovidov
a2b515483e Understanding the code #2482 2018-09-06 03:28:15 +03:00
Alexey Milovidov
0962b2841d Added missing line (suggested by @nvartolomei) #3029 2018-09-06 00:05:49 +03:00
Alexey Milovidov
3c7c2e3853 Revert "Revert "Tidy up thread locals usage across translation units""
This reverts commit 509386b14d.
2018-09-06 00:01:43 +03:00
alesapin
aaf5720198 Fix type in odbc source and remove pointer from mongo source 2018-09-05 23:33:45 +03:00
alesapin
cd07fd6246 Remove unused header 2018-09-05 23:22:20 +03:00
alesapin
2d9a62cfe8 Fix MongoDB api call 2018-09-05 23:19:31 +03:00
proller
5877eece58 Internal compiler run fixes 2018-09-05 21:50:17 +03:00
alexey-milovidov
4032e4d22c
Merge pull request #3049 from yandex/fix-collapsing-vertical-merge
Fix collapsing vertical merge regression
2018-09-05 21:47:23 +03:00
Alexey Zatelepin
6275bfd8cd fix CollapsingMergeTree + vertical merge [#CLICKHOUSE-3963]
don't skip writing to rows sources even if all rows have collapsed.
2018-09-05 20:19:51 +03:00
Alexey Milovidov
509386b14d Revert "Tidy up thread locals usage across translation units"
This reverts commit e28753061f.
2018-09-05 19:41:34 +03:00
Anton Popov
7f71bc4189
Update InterpreterSelectQuery.cpp 2018-09-05 19:29:13 +03:00
Anton Popov
e6d49c4c93
Update InterpreterSelectQuery.cpp 2018-09-05 19:28:30 +03:00
chertus
a0309b57ab fix build with embedded compiler 2018-09-05 19:24:46 +03:00
CurtizJ
472adf4ab9 add rollup to formatted query 2018-09-05 19:23:28 +03:00
alesapin
8b7d6ccd8c Small improvements 2018-09-05 19:20:12 +03:00
Alexey Milovidov
12ff8814f8 Removed useless code [#CLICKHOUSE-2] 2018-09-05 19:11:10 +03:00
chertus
6096c6998d minor fix: remove unused func 2018-09-05 18:18:48 +03:00
chertus
0581545cba disable Decimal Comparison and Conditional compilation [CLICKHOUSE-3765] 2018-09-05 17:56:55 +03:00
CurtizJ
35cbdcda5b optimize memory consumption 2018-09-05 17:39:51 +03:00
Anton Popov
143c15925b
Update FunctionsArithmetic.h 2018-09-05 16:29:19 +03:00
chertus
e0b1e9a1ca array functions for Decimal [CLICKHOUSE-3765CLICKHOUSE-3765] 2018-09-05 16:28:51 +03:00
alesapin
d12ec5c602 Merge branch 'support_uuid_in_external_dicts' of https://github.com/The-Alchemist/ClickHouse into The-Alchemist-support_uuid_in_external_dicts 2018-09-05 16:20:45 +03:00
CurtizJ
7ae4c1072b fix modifying source columns, add tests 2018-09-05 16:18:47 +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
Alexey Milovidov
2332bf1a50 Code consistency [#CLICKHOUSE-3943] 2018-09-04 22:34:34 +03:00
Alexey Milovidov
d10f9200b9 Consistency of FileOpen event [#CLICKHOUSE-3943] 2018-09-04 22:24:45 +03:00
Nikolai Kochetov
eedd2c50de Fix test. [#CLICKHOUSE-3944] 2018-09-04 21:59:34 +03:00
chertus
e11f3ea5bc enable nullable for Decimal [CLICKHOUSE-3765] 2018-09-04 21:51:44 +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
CurtizJ
8d8aeb51e5 fix and optimize multiplying aggregate states 2018-09-04 17:08:35 +03:00
proller
e687693df8 Merge remote-tracking branch 'upstream/master' into fix8 2018-09-04 15:12:34 +03:00
Vadim
2dd0c4c594
Merge pull request #3032 from yandex/amosbird_window_funnel
[FIX TESTS] Support events qualified for multiple conditions in Window Funnel
2018-09-04 14:32:58 +03:00
Nicolae Vartolomei
e28753061f Tidy up thread locals usage across translation units
Fixes #3015.
2018-09-03 22:36:16 +01:00
proller
b9e4c69dd2 fix 2018-09-03 23:09:51 +03:00
proller
bcfcd257be Better odbc-bridge executable select 2018-09-03 21:27:56 +03:00
alexey-milovidov
604c64f40d
Merge pull request #3024 from 4ertus2/nan
hotfix for NaN comparison [CLICKHOUSE-3760]
2018-09-03 21:11:20 +03:00
Alexey Milovidov
8fae37f5c7 Removed wrong code from StorageSystemColumns #2447 2018-09-03 21:04:29 +03:00
chertus
60a39c28d1 better NaN comparison fix [CLICKHOUSE-3760] 2018-09-03 18:57:39 +03:00
alesapin
3719558bf7 CLICKHOUSE-3894: Some improvements in flapping tests. Bug fix of ATTACH TABLE xxx ON CLUSTER (previously doesn't work). 2018-09-03 17:06:00 +03:00
chertus
522674d37f fix for NaN comparison [CLICKHOUSE-3760] 2018-09-03 16:34:16 +03:00
alesapin
69df618397 Merge remote-tracking branch 'upstream/master' 2018-09-03 14:57:11 +03:00
chertus
c03291ce60 extract callOnTypeIndex.h from FunctionHelpers.h [CLICKHOUSE-3765] 2018-09-03 13:46:58 +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
chertus
79c91bb23b minor fix: better code locality [CLICKHOUSE-3765] 2018-09-03 12:15:44 +03:00
Alexey Milovidov
eb8f06821d Fixed build [#CLICKHOUSE-2] 2018-09-03 09:31:19 +03:00
Alexey Milovidov
226a7f491e Whitespaces [#CLICKHOUSE-3944] 2018-09-03 08:06:19 +03:00
Alexey Milovidov
d2a127ffa9 Less dependencies [#CLICKHOUSE-2] 2018-09-03 07:57:01 +03:00
Alexey Milovidov
6831b6c0f9 Fixed build; fixed possibly suboptimal code #3008 2018-09-03 07:29:36 +03:00
alexey-milovidov
72c799ad76
Merge pull request #3008 from 4ertus2/decimal
even more Decimal
2018-09-03 07:19:33 +03:00