Commit Graph

10038 Commits

Author SHA1 Message Date
VadimPE
bb7a353e9b CLICKHOUSE-3476 2018-09-11 12:29:02 +03:00
alexey-milovidov
13c66e27c4
Merge pull request #3092 from 4ertus2/decimal
Decimal round functions [CLICKHOUSE-3765]
2018-09-10 22:37:05 +03:00
alexey-milovidov
548aee702f
Merge pull request #3095 from 4ertus2/refactoring
Refactoring: fewer type casts [CLICKHOUSE-2]
2018-09-10 22:36:42 +03:00
Alexey Milovidov
f16aa1964a Better formatting of numbers in log message [#CLICKHOUSE-2] 2018-09-10 21:23:11 +03:00
chertus
bbb302826a Merge branch 'master' into refactoring 2018-09-10 20:52:27 +03:00
chertus
c693a73385 hotfix (helpers refactoring) 2018-09-10 20:51:25 +03:00
alexey-milovidov
4793e620be
Merge pull request #3093 from yandex/fix-columns-ordering
Fix columns ordering in MergeTreeRangeReader
2018-09-10 20:26:45 +03:00
chertus
3cf39258a4 fewer type casts [CLICKHOUSE-2] 2018-09-10 20:09:07 +03:00
Nikolai Kochetov
2ea009bddc Fix columns ordering. 2018-09-10 18:28:03 +03:00
chertus
1ecb9fb271 fix build 2018-09-10 17:26:47 +03:00
alexey-milovidov
20d5ddd58c
Merge branch 'master' into alter-update 2018-09-10 17:17:10 +03:00
alexey-milovidov
3054e62e00
Merge pull request #3089 from VadimPE/CLICKHOUSE-3839
CLICKHOUSE-3839 add virtual column "_partition_id"
2018-09-10 17:16:21 +03:00
alexey-milovidov
31bb16e082
Update FunctionsRound.h 2018-09-10 17:13:03 +03:00
alexey-milovidov
b7de315747
Update FunctionsRound.h 2018-09-10 17:11:30 +03:00
chertus
9828813523 Decimal round functions [CLICKHOUSE-3765] 2018-09-10 16:52:18 +03:00
Alexey Milovidov
85e8c7920f Merge branch 'master' of github.com:yandex/ClickHouse 2018-09-10 15:40:15 +03:00
Alexey Milovidov
772d609d86 Whitespace [#CLICKHOUSE-2] 2018-09-10 15:40:07 +03:00
Nikolai Kochetov
1d62c9309c Fix sampling with prewhere. [#CLICKHOUSE-3972] 2018-09-10 13:06:12 +03:00
VadimPE
10ab9587a2 CLICKHOUSE-3839 add virtual column _partition_id 2018-09-10 12:53:13 +03:00
Alexey Milovidov
c9b612de48 Attempt to fix CLICKHOUSE-3888 bug 2018-09-10 06:59:48 +03:00
Alexey Milovidov
c646f5649c Every function in its own file, part 3 2018-09-10 05:36:33 +03:00
Alexey Milovidov
ab365686a0 Every function in its own file, part 3 2018-09-10 04:39:06 +03:00
Alexey Milovidov
cfb05edd8f Every function in its own file, part 3 2018-09-10 04:19:14 +03:00
Alexey Milovidov
33d49ad2da Every function in its own file, part 3 2018-09-10 03:58:04 +03:00
Alexey Milovidov
fec8ceba3d Every function in its own file, part 3 2018-09-10 03:51:08 +03:00
Alexey Milovidov
0d584eae47 Every function in its own file, part 3 2018-09-10 02:47:56 +03:00
Alexey Milovidov
d3c047695e Every function in its own file, part 3 2018-09-10 02:36:06 +03:00
Alexey Milovidov
42c49da354 Revert "Fixed error [#CLICKHOUSE-3888]"
This reverts commit 1d8302a4d7.
2018-09-10 00:17:29 +03:00
Alexey Milovidov
c6e31b47ad Every function in its own file, part 3 2018-09-10 00:15:40 +03:00
Alexey Milovidov
2126170d97 Every function in its own file, part 3 2018-09-09 23:57:54 +03:00
Alexey Milovidov
1defdb168d Merge branch 'master' into CLICKHOUSE-3888 2018-09-09 08:48:03 +03:00
Alexey Milovidov
3f07a1af51 Fixed error [#CLICKHOUSE-2] 2018-09-09 08:47:27 +03:00
Alexey Milovidov
1d8302a4d7 Fixed error [#CLICKHOUSE-3888] 2018-09-09 08:30:14 +03:00
Alexey Milovidov
b2ec7ce6b2 Merge branch 'master' of github.com:yandex/ClickHouse 2018-09-09 06:28:55 +03:00
Alexey Milovidov
54ea7b0b20 Fixed error [#CLICKHOUSE-2] 2018-09-09 06:28:45 +03:00
alexey-milovidov
3bb89eca16
Merge pull request #3083 from yandex/every_function_in_own_file_2
Every function in its own file, part 2
2018-09-09 05:31:33 +03:00
Alexey Milovidov
c7b1a40296 Fixed test [#CLICKHOUSE-2] 2018-09-09 05:23:24 +03:00
Alexey Milovidov
8497af1d7f Fixed memory leak in insertion methods of ColumnAggregateFunction if the object have another as a source; exception safety [#CLICKHOUSE-2] 2018-09-09 04:16:34 +03:00
Alexey Milovidov
c48649fd12 Every function in its own file, part 2 [#CLICKHOUSE-2] 2018-09-09 01:57:56 +03:00
Alexey Milovidov
b695a6bec5 Every function in its own file, part 2 [#CLICKHOUSE-2] 2018-09-09 01:31:20 +03:00
Alexey Milovidov
ba152a5059 Every function in its own file, part 2 [#CLICKHOUSE-2] 2018-09-09 01:16:30 +03:00
Alexey Milovidov
09926ebb93 Every function in its own file, part 2 [#CLICKHOUSE-2] 2018-09-09 01:04:39 +03:00
Alexey Milovidov
4ec18956c7 Preparation [#CLICKHOUSE-2] 2018-09-08 22:23:48 +03:00
Alexey Milovidov
b6d3ab4362 Merge branch 'master' of github.com:yandex/ClickHouse 2018-09-08 06:07:20 +03:00
Alexey Milovidov
e78c16000c utils/check-style/check-style #3069 2018-09-08 06:07:12 +03:00
alexey-milovidov
264e48b8d6
Merge pull request #3080 from yandex/every_function_in_own_file_1
Every function in its own file, part 1
2018-09-08 04:50:27 +03:00
Alexey Milovidov
38b812ddba Merging #3062 2018-09-08 04:42:34 +03:00
alexey-milovidov
8dcf59389c
Merge pull request #3062 from CurtizJ/CLICKHOUSE-3723.3
Aggregate function states addition [CLICKHOUSE-3723]
2018-09-08 04:40:37 +03:00
alexey-milovidov
8f1064b203
Update FunctionsArithmetic.h 2018-09-08 04:40:23 +03:00
Alexey Milovidov
639f7e026c Every function in its own file, part 1 [#CLICKHOUSE-2] 2018-09-08 04:26:46 +03:00
Alexey Milovidov
445645418c Every function in its own file, part 1 [#CLICKHOUSE-2] 2018-09-08 04:24:09 +03:00
Alexey Milovidov
4c5556aba1 Better exception message [#CLICKHOUSE-2] 2018-09-08 02:37:31 +03:00
alexey-milovidov
dc2d36882b
Update FunctionsArithmetic.h 2018-09-08 01:29:37 +03:00
Alexey Milovidov
40dc6820ba Miscellaneous [#CLICKHOUSE-2] 2018-09-08 01:22:48 +03:00
alexey-milovidov
5d3a64ec46
Merge pull request #3077 from yandex/CLICKHOUSE-3800
CLICKHOUSE-3800: Improve cache of compiled expressions
2018-09-08 00:44:17 +03:00
alexey-milovidov
ef22af2e49
Merge pull request #2881 from zhang2014/feature/support_optimize_predicate_for_view
ISSUES-863 support optimize predicate for view
2018-09-08 00:43:13 +03:00
alexey-milovidov
603b31bdb6
Merge branch 'master' into CLICKHOUSE-3723.3 2018-09-08 00:39:34 +03:00
alexey-milovidov
a2df7d522c
Merge pull request #3069 from CurtizJ/CLICKHOUSE-3893
Fix code duplication in RollupBlockInputStream and TotalsHavingBlockInputStream
2018-09-08 00:35:56 +03:00
alexey-milovidov
0b6e85e51d
Merge pull request #3073 from yandex/fix_prewhere_with_sampling
Fix prewhere with sampling
2018-09-08 00:34:06 +03:00
alesapin
2ba41c9b75
Update Settings.h 2018-09-08 00:02:42 +03:00
Nikolai Kochetov
8311c23d83 Fix test. 2018-09-07 23:23:28 +03:00
alesapin
e815260363 CLICKHOUSE-3800: Improve cache and turn on compilation by default 2018-09-07 23:17:40 +03:00
Nikolai Kochetov
76f47ed6ba Fix test. 2018-09-07 22:57:26 +03:00
Alexey Zatelepin
949b4b640e fix build after merge [#CLICKHOUSE-13] 2018-09-07 22:14:05 +03:00
Nikolai Kochetov
8b658f091d Fix test. 2018-09-07 21:00:53 +03:00
chertus
ad77505137 implement CAST Strings to UUID [issue-3061] 2018-09-07 19:38:40 +03:00
Alexey Zatelepin
133c9c7c37 Merge branch 'master' into alter-update
Conflicts:
	docs/en/query_language/alter.md
2018-09-07 19:11:02 +03:00
Nikolai Kochetov
6e41be3476 Avoid removing columns used in sample expression in prewhere actions. [#CLICKHOUSE-3969] 2018-09-07 19:01:21 +03:00
Alexey Zatelepin
d77037fec7 fix use after move 2018-09-07 18:54:34 +03:00
Alexey Zatelepin
1064d1d26b update MATERIALIZED columns when their dependencies are updated [#CLICKHOUSE-13] 2018-09-07 18:54:18 +03:00
chertus
0b35cdae69 refactoring: add some sugar in type checks [CLICKHOUSE-0002] 2018-09-07 17:37:26 +03:00
CurtizJ
a0ee183826 whitespaces 2018-09-07 17:21:11 +03:00
CurtizJ
3e854df5a5 remove code duplicates 2018-09-07 17:18:15 +03:00
CurtizJ
7c2fef0c1a fix getting value from const column 2018-09-07 17:06:10 +03:00
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
Alexey Zatelepin
acc1a84827 better name [#CLICKHOUSE-13] 2018-09-05 15:54:03 +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