Commit Graph

519 Commits

Author SHA1 Message Date
alexey-milovidov
92b2cc6625
Merge pull request #3107 from zhang2014/fix/ISSUES-3105
ISSUES-3105 fix some bugs in the predicate optimizer
2018-09-13 22:19:11 +03:00
zhang2014
25f79593a2 ISSUES-3105 fix some bugs in the predicate optimizer 2018-09-13 20:08:27 +08:00
alexey-milovidov
20d5ddd58c
Merge branch 'master' into alter-update 2018-09-10 17:17:10 +03:00
Nikolai Kochetov
1d62c9309c Fix sampling with prewhere. [#CLICKHOUSE-3972] 2018-09-10 13:06:12 +03:00
Alexey Milovidov
c9b612de48 Attempt to fix CLICKHOUSE-3888 bug 2018-09-10 06:59:48 +03:00
Nikolai Kochetov
8311c23d83 Fix test. 2018-09-07 23:23:28 +03:00
Nikolai Kochetov
76f47ed6ba Fix test. 2018-09-07 22:57:26 +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
Nikolai Kochetov
8593145794 Merged with master 2018-09-06 21:30:03 +03:00
Nikolai Kochetov
641771f66f Fix virtual columns for prewhere with aliases. 2018-09-06 20:45:49 +03:00
Alexander Sapin
03174e131d Merge remote-tracking branch 'upstream/master' 2018-09-06 12:39:42 +03:00
Nikolai Kochetov
21081266e8 Fix test. 2018-09-05 16:04:28 +03:00
Nikolai Kochetov
1994fb832b Fix test. 2018-09-05 15:16:37 +03:00
Nikolai Kochetov
3c6db8ebc1 Fix prewhere with aliased columns. [#CLICKHOUSE-3944] 2018-09-04 21:28:01 +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
d4d1020798 execute UPDATEs and DELETEs in stages [#CLICKHOUSE-13] 2018-09-03 22:34:49 +03:00
alesapin
11d248ba10 Resolve conflict 2018-09-03 13:11:10 +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
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
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
5df5df8971 utils/check-style/check-style -n 2018-08-31 00:13:34 +03:00
alesapin
6bfde2825e Fix conflict 2018-08-30 22:23:00 +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
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
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
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
3361247126 Fix lifetime of Context reference in functions (first quick variant) [#CLICKHOUSE-2] 2018-08-29 18:36:24 +03:00
VadimPE
f253719eac CLICKHOUSE-3934 add SettingsJoinStrictness 2018-08-29 18:15:42 +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
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
VadimPE
398d38eead CLICKHOUSE-3934 add join_default_strictness 2018-08-28 16:57:31 +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
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
zhang2014
32cc611f5d ISSUES-863 fix predicate optimizer not work for asterisk 2018-08-24 10:05:43 +08:00