Commit Graph

3055 Commits

Author SHA1 Message Date
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
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
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
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
Nikolai Kochetov
8593145794 Merged with master 2018-09-06 21:30:03 +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
Nikolai Kochetov
641771f66f Fix virtual columns for prewhere with aliases. 2018-09-06 20:45:49 +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
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
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
proller
5877eece58 Internal compiler run fixes 2018-09-05 21:50:17 +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
CurtizJ
472adf4ab9 add rollup to formatted query 2018-09-05 19:23:28 +03:00
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