Commit Graph

14933 Commits

Author SHA1 Message Date
proller
bd17982224 Fix clang build 2018-12-20 12:54:28 +03:00
proller
fdd22ad187 Fix includes 2018-12-19 20:56:58 +03:00
Alexey Milovidov
2f9ead4548 Merge branch 'master' of github.com:yandex/ClickHouse 2018-12-19 19:18:56 +03:00
alexey-milovidov
f05bf6c046
Merge pull request #3873 from s-mx/send_logs_level2
Fix strange behavior of send_logs_level setting.
2018-12-19 19:18:02 +03:00
alexey-milovidov
ca75d18414
Merge pull request #3875 from abyss7/issue-3591
Treat Enums as Ints inside If() function
2018-12-19 18:30:09 +03:00
Alexey Milovidov
92499c725d Fixed test #3811 2018-12-19 18:27:57 +03:00
Ivan Lezhankin
4c3af43ed3 Add test. 2018-12-19 17:36:55 +03:00
Ivan Lezhankin
937c0fb4a4 Treat Enum* types as Int* inside If() function. 2018-12-19 17:02:26 +03:00
Sabyanin Maxim
ea27ec463e add SettingLogsLevel 2018-12-19 16:20:41 +03:00
chertus
cbf3c34cf3 minor improvement in ExpressionAnalyzer + array join 2018-12-19 16:13:51 +03:00
Alexey Milovidov
b7ce79c423 Miscellaneous [#CLICKHOUSE-2] 2018-12-19 16:11:06 +03:00
Alexey Milovidov
8889f0859a Fixed typo [#CLICKHOUSE-2] 2018-12-19 06:43:37 +03:00
Alexey Milovidov
36836faf62 Full support for Decimal #3721 2018-12-19 05:43:09 +03:00
Alexey Milovidov
689de0289f Added performance test #3721 2018-12-19 05:37:20 +03:00
Alexey Milovidov
9c23556cb0 Basic implementation for Decimal #3721 2018-12-19 05:11:31 +03:00
Alexey Milovidov
8e83a3c4ef Merge branch 'persiyanov-feature/roundDown-function' 2018-12-19 04:30:53 +03:00
Alexey Milovidov
4a6c25e65d Merging #3721; Added a test 2018-12-19 04:30:32 +03:00
Alexey Milovidov
b9a68fbe93 Merging #3721; Added a test 2018-12-19 04:29:40 +03:00
Alexey Milovidov
cf68f08099 Merge branch 'feature/roundDown-function' of https://github.com/persiyanov/ClickHouse into persiyanov-feature/roundDown-function 2018-12-19 03:29:21 +03:00
alexey-milovidov
92bb4471df
Merge pull request #3865 from abyss7/issue-3590
ISSUE-3590: Forbid using aggregate functions inside scalar subqueries
2018-12-19 03:19:45 +03:00
alexey-milovidov
c47dfb064e
Update ExecuteScalarSubqueriesVisitor.cpp 2018-12-19 03:19:31 +03:00
Alexey Milovidov
d5d1c34017 Merging #3811 2018-12-18 23:24:16 +03:00
Alexey Milovidov
6a779661c8 Merge branch 'java-hash' of https://github.com/shangshujie365/ClickHouse into shangshujie365-java-hash 2018-12-18 23:04:32 +03:00
Ivan Lezhankin
617082f444 ISSUE-3590: Forbid using aggregate functions inside scalar subqueries 2018-12-18 21:43:06 +03:00
proller
b213ee5e5d
Fix macos build (#3863) 2018-12-18 20:41:03 +03:00
proller
c63ca042ba
Fix macos build (#3861) 2018-12-18 16:37:00 +03:00
chertus
8720d3b937 remove stale code 2018-12-18 16:26:04 +03:00
Alexey Milovidov
d1237afdb7 Miscellaneous [#CLICKHOUSE-2] 2018-12-18 04:26:12 +03:00
alexey-milovidov
467751b692
Merge pull request #3856 from proller/fix10
Macos fix
2018-12-18 03:33:04 +03:00
alexey-milovidov
3efb01b3f8
Merge pull request #3857 from yandex/fix_odbc_bridge
Do not log from odbc-bridge when there is no console
2018-12-18 03:26:46 +03:00
alesapin
bb1760c468 Remove idiotic if 2018-12-17 23:11:19 +03:00
proller
8726f1eae3 Merge remote-tracking branch 'upstream/master' into fix10 2018-12-17 20:59:23 +03:00
proller
b1234b86c3 Macos fix 2018-12-17 20:59:10 +03:00
Daniel Dao
9a676329c2
Fix simple typo in ClusterCopier
Signed-off-by: Daniel Dao <dqminh89@gmail.com>
2018-12-17 16:45:44 +00:00
alexey-milovidov
14df9c76aa
Merge pull request #3837 from reflection/rollup_with_having
Ensure ROLLUP and CUBE respect HAVING (no change to TOTALS)
2018-12-17 18:06:26 +03:00
proller
3a9bd8a773 Fix macos build 2018-12-17 17:10:23 +03:00
Samuel Chou
c465bd8d2b Fix rollup_with_having test 2018-12-16 23:55:04 -08:00
Samuel Chou
fcde47b45e Ensure ROLLUP and CUBE respect HAVING (no change to TOTALS) 2018-12-14 22:27:40 -08:00
Alexey Milovidov
af31ff24b9 Better code; added a test #3835 2018-12-14 23:21:47 +03:00
alexey-milovidov
dd8c947122
Merge pull request #3836 from nightweb/3835-add-with-totals-support
#3835 Add totals row for WITH TOTALS query
2018-12-14 22:34:01 +03:00
alexey-milovidov
b6feafea41
Update ODBCDriver2BlockOutputStream.cpp 2018-12-14 22:31:38 +03:00
alexey-milovidov
7380abf502
Merge pull request #3021 from yandex/ubsan-fixes-3
UBSan fixes, part 2
2018-12-14 22:29:47 +03:00
alexey-milovidov
3a2c85a06c
Merge pull request #3717 from amosbird/arrayjoin
Support unaligned array join.
2018-12-14 21:12:24 +03:00
alexey-milovidov
120e6b54eb
Update Settings.h 2018-12-14 21:12:01 +03:00
Alexey Milovidov
cd233cef17 Fixed typo [#CLICKHOUSE-2] 2018-12-14 21:06:10 +03:00
alexey-milovidov
c1a2cb7abb
Update ColumnVector.h 2018-12-14 20:54:45 +03:00
alexey-milovidov
6d27777b19
Merge branch 'master' into ubsan-fixes-3 2018-12-14 20:52:54 +03:00
Alexey Milovidov
c39a19c126 Merge branch 'master' of github.com:yandex/ClickHouse 2018-12-14 20:50:23 +03:00
Alexey Milovidov
21c3a3d9e2 UBSan fixes #3021 2018-12-14 20:50:10 +03:00
Max
4c145a9535 #3835 Add totals row for WITH TOTALS query 2018-12-14 20:43:04 +03:00