thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-17 13:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,946 Commits 9,138 Branches 1,774 Tags 2.1 GiB
65a00150b2
Commit Graph

773 Commits

Author SHA1 Message Date
CurtizJ
60289cd764 fix optimizeSortingWithPK 2019-07-27 03:15:22 +03:00
CurtizJ
cb85721cba handle ExpressionAnalyzer exceptions, while trying to optimize order by, in case of complicated queries 2019-07-27 03:02:04 +03:00
CurtizJ
b1d981ec3a better pipeline while reading in pk_order 2019-07-27 01:18:27 +03:00
qianlixiang
64d65c0123 Fixed mismatched header of prewhere with sample column 2019-07-26 18:48:42 +08:00
CurtizJ
b1cc019bd4 fix pipeline 2019-07-25 14:00:14 +03:00
CurtizJ
f5b93eb991 fix order by optimization 2019-07-25 13:45:01 +03:00
CurtizJ
3d706ec20e support 'order by' optimiation with simple monotonic functions 2019-07-24 17:23:57 +03:00
CurtizJ
2797c16930 fix prewhere at fetching columns 2019-07-19 13:14:27 +03:00
CurtizJ
b9dc472071 Merge remote-tracking branch 'upstream/master' into order-by-efficient 2019-07-19 01:09:59 +03:00
CurtizJ
a3d25790bd basic implementation of reading in pk order and 'order by' optimization 2019-07-18 17:41:11 +03:00
CurtizJ
410b62f7fa Merge branch 'clickhouse-4013' of https://github.com/anrodigina/ClickHouse into order-by-efficient 2019-07-05 13:48:04 +03:00
Nikolai Kochetov
f9b29bfdd2 Merged with master. 2019-06-25 20:00:54 +03:00
Nikolai Kochetov
b2a3835195 Unify streams for SourceFromInputStream. 2019-06-25 19:41:06 +03:00
Nikolai Kochetov
821d520a52 Fix limit by offset. 2019-06-25 19:41:06 +03:00
Nikolai Kochetov
96174e90b0 Fix build. 2019-06-25 19:41:00 +03:00
alexey-milovidov
606b074a4b
Merge pull request #5659 from yandex/ignore-mutation-limits 
Ignore query execution limits and limits for max parts size for merge while executing mutations.
 2019-06-21 02:14:41 +03:00
CurtizJ
6d9cbc6f28 ignore query limits from system profile while executing mutations 2019-06-14 22:27:53 +03:00
Alexey Milovidov
c846d0f6af Namespace comments are unneeded according to the code style. 
find dbms -name '*.h' -or -name '*.cpp' | xargs grep -l -P '}\s*//+\s*namespace\s*' | xargs sed -i -r -e 's/}\s*\/\/+\s*namespace\s*.*$/}/'
 2019-06-13 13:43:37 +03:00
Anastasiya Rodigina
4ff02cff4d Fix some problems with tests, add more tests, more syntetic tests are coming today 2019-06-03 06:00:54 +00:00
Anastasiya Rodigina
6c779e63b0 Edit reverse order 2019-05-25 14:09:23 +03:00
chertus
9eca696e82 actualize isNumber for Decimal 2019-05-24 15:11:03 +03:00
Anastasiya Rodigina
c8d4952702 Fix test with order by and final, need to think about it 2019-05-18 21:13:18 +03:00
Anastasiya Rodigina
b3d811a199 Fix some tests 2019-05-18 19:46:29 +03:00
Anastasiya Rodigina
63a56f4bd9 Fix tests with group by 2019-05-18 15:54:04 +03:00
Nikolai Kochetov
808d0f3b08 Merged with master. 2019-05-14 13:31:19 +03:00
Anastasiya Rodigina
af4fff970b Revert "Changes in read in pk_order, UnionBlockInputStream and InterpreterSelectQuery" 
This reverts commit 61d49e1e5f.
 2019-05-10 23:22:45 +03:00
Anastasiya Rodigina
61d49e1e5f Changes in read in pk_order, UnionBlockInputStream and InterpreterSelectQuery 2019-05-10 22:09:15 +03:00
Anastasiya Rodigina
23a8efe367 Fix tests and change pipeline 2019-05-09 18:44:51 +03:00
alexey-milovidov
e1158f53ad
Update InterpreterSelectQuery.cpp 2019-05-05 23:29:17 +03:00
alexey-milovidov
125fce3303
Update InterpreterSelectQuery.cpp 2019-05-05 23:27:03 +03:00
alexey-milovidov
c04c614bc0
Merge branch 'master' into clickhouse-4013 2019-05-05 23:22:45 +03:00
Alexey Milovidov
a6ca9f266f Removed huge chunk of bad code 2019-05-03 05:00:57 +03:00
Nikolai Kochetov
b8adb0937f Do not create processors for totals stream. 2019-04-30 20:37:30 +03:00
Nikolai Kochetov
43adf33ec2 Do not create processors for totals stream. 2019-04-30 20:30:19 +03:00
Nikolai Kochetov
f170e55ebd Do not create processors for totals stream. 2019-04-30 20:20:34 +03:00
Nikolai Kochetov
1410d1a1ae Do not create processors for totals stream. 2019-04-30 20:06:41 +03:00
Nikolai Kochetov
728e8dfc26 Do not create processors for totals stream. 2019-04-30 20:04:31 +03:00
Nikolai Kochetov
72c0530845 Do not create processors for totals stream. 2019-04-30 20:01:12 +03:00
CurtizJ
7766f5c0c3 added offset for limit by 2019-04-29 16:12:39 +03:00
Nikolai Kochetov
0b8107c497 Fix totals with rollup. 2019-04-29 13:00:17 +03:00
Anastasiya Rodigina
e750755f8f Add comments and edit style 2019-04-27 14:59:08 +03:00
Anastasiya Rodigina
747d2e0d3a Change pipeline + add optimize stuff into Settings.h 2019-04-27 12:39:03 +03:00
dmitriiut
a2c3fd2057 bug fixes 2019-04-23 04:48:51 +03:00
dmitriiut
50c322bc6d WITH FILL version 2019-04-22 02:04:23 +03:00
dmitriiut
3c2922c406
Merge branch 'master' into dmitriiut-WITH_TIES_and_WITH_FILL 2019-04-21 19:37:38 +03:00
dmitriiut
e94575e1da fix progress 2019-04-21 19:16:25 +03:00
dmitriiut
8a7853b0a8 parser WITH FILL 
some interpreter changes
 2019-04-21 06:36:59 +03:00
dmitriiut
2e0374fbd4 fix WITH TIES 2019-04-21 05:33:03 +03:00
dmitrii
a130850e15 limit with ties 2019-04-19 16:38:25 +03:00
Nikolai Kochetov
745beb6080 Fix rollup and cube transforms. 2019-04-18 15:43:13 +03:00
Ivan
118bea2be6
Enable predicate push-down optimization by default. (#4846) 
* Enable predicate push-down optimization by default.
* Forbid push-downs for some JOIN cases.
* Fix existing tests
* Forbid optimization if a select query has ARRAY JOIN on any side.
 2019-04-18 13:39:25 +03:00
Anastasiya Rodigina
ef0be2a721 Fix build and style issues 2019-04-18 01:58:24 +03:00
Anastasiya Rodigina
0c1735f1b1 ReverseBlockInputStream, optimization of group by, tests 2019-04-18 00:20:51 +03:00
Nikolai Kochetov
d5f878dba3 Fix totals. 2019-04-17 18:35:22 +03:00
Nikolai Kochetov
87472146b3 Fix totals. 2019-04-17 17:56:46 +03:00
Nikolai Kochetov
323f742c1b Fix totals. 2019-04-17 17:54:44 +03:00
Nikolai Kochetov
647afb65e8 Fix totals. 2019-04-17 17:38:16 +03:00
chertus
950f8a7042 fix distinct with join 2019-04-12 20:04:38 +03:00
Nikolai Kochetov
6949f2d80a Added force_add_agg_info to SourceFromInputStream/ 2019-04-12 16:16:07 +03:00
Nikolai Kochetov
1e5731496c Added force_add_agg_info to SourceFromInputStream. 2019-04-12 16:09:46 +03:00
Nikolai Kochetov
d1840417a8 Don't resize pipeline before memory efficient transform. 2019-04-11 17:28:42 +03:00
Nikolai Kochetov
a72f402468 Fix double readPrefix call. 2019-04-11 16:04:43 +03:00
Nikolai Kochetov
403df591dc Fix totals fro single remote source. 2019-04-10 19:34:20 +03:00
Nikolai Kochetov
d7aa7412ae Fix totals fro single remote source. 2019-04-10 19:28:37 +03:00
Nikolai Kochetov
c4c98c3a99 Fix full join. 2019-04-10 17:01:52 +03:00
Nikolai Kochetov
94305c41e3 Fix join for totals. 2019-04-10 14:04:56 +03:00
Nikolai Kochetov
31ed0f0e38 Fix join for totals. 2019-04-10 13:52:20 +03:00
chertus
9329410012 fix use after move 2019-04-09 17:59:06 +03:00
Nikolai Kochetov
59eae7b23d Fix join for totals. 2019-04-09 17:51:38 +03:00
chertus
82dc1fb1db rewrite ASTSelectQuery (consistent children) 2019-04-09 17:22:35 +03:00
Nikolai Kochetov
322b1ccd6b Fix join for totals. 2019-04-09 17:08:52 +03:00
Nikolai Kochetov
54066fc312 Fix rows_before_limit_at_least. 2019-04-09 13:17:25 +03:00
Nikolai Kochetov
33b176f2da Fix style. 2019-04-05 14:34:11 +03:00
Nikolai Kochetov
1470fe0a72 Fix clang build. 2019-04-05 14:27:08 +03:00
Nikolai Kochetov
7626b1b267 Multiple fixes. 2019-04-05 13:52:07 +03:00
chertus
6b49900e1a Asterisks for multiple joins CLICKHOUSE-4372 2019-04-03 19:06:05 +03:00
Nikolai Kochetov
5e39ec610c Merged with master 2019-04-03 14:21:38 +03:00
Nikolai Kochetov
94ff7f694a QueryPipeline [in progress]. 2019-04-03 13:14:36 +03:00
Ivan
957d23267b
Minimal implementation of row-level security CLICKHOUSE-4315 (#4792) 
For detailed description see the related PR
 2019-03-29 23:31:06 +03:00
chertus
7561ff2ab7 fix dups in GLOBAL JOIN with asterisks 2019-03-18 17:56:33 +03:00
chertus
bd559f8db8 SelectQueryOptions v3 (no inheritance) 2019-03-18 15:05:51 +03:00
chertus
b6e2697101 Merge branch 'master' into ast 2019-03-18 13:36:13 +03:00
Alexey Zatelepin
304c67da99 Merge branch 'master' into fix-add-materialized-column-after 
Conflicts:
	dbms/src/Interpreters/InterpreterCreateQuery.cpp
	dbms/src/Interpreters/InterpreterDescribeQuery.cpp
	dbms/src/Interpreters/interpretSubquery.cpp
	dbms/src/Storages/ColumnsDescription.cpp
 2019-03-17 00:46:53 +03:00
alexey-milovidov
ae2d974dda
Merge pull request #4708 from kvap/distributed-limit-by 
Make the query planner respect LIMIT BY in remote queries
 2019-03-16 20:54:06 +03:00
Alexey Zatelepin
b5a0a3fa23 store all kinds of columns in the same list in ColumnsDescription [#CLICKHOUSE-3101] 2019-03-15 19:37:52 +03:00
Ivan Lezhankin
4f6a494af8 Revert references where they were before refactoring. 2019-03-15 19:14:13 +03:00
chertus
ffc3974934 SelectQueryOptions v2 2019-03-15 18:57:18 +03:00
Constantin S. Pan
df6860d5e0 Make the query planner respect LIMIT BY in remote queries 2019-03-15 15:26:21 +00:00
chertus
53abdccb95 refactoring: extract SelectQueryOptions 2019-03-15 16:49:58 +03:00
Ivan Lezhankin
39f7225bd4 Fix build after merge 2019-03-12 17:07:02 +03:00
Ivan Lezhankin
4c1a0ca255 Merge remote-tracking branch 'upstream/master' into iast-as 2019-03-12 15:51:18 +03:00
alexey-milovidov
a4e9c59aa3
Merge pull request #4648 from 4ertus2/joins 
Refactoring: move JOIN conversions to InterpreterSelectQuery
 2019-03-11 22:17:58 +03:00
Ivan Lezhankin
a3a8b2bbf7 Include IAST_fwd.h for using ASTPtr 2019-03-11 17:01:45 +03:00
Ivan Lezhankin
d1ead22073 Rename As<…> → as<…> 2019-03-11 16:22:51 +03:00
Ivan Lezhankin
1e9f7847dc Merge remote-tracking branch 'upstream/master' into iast-as 2019-03-11 16:11:22 +03:00
chertus
c089d5b88a CrossToInnerJoinVisitor before JoinToSubqueryTransformVisitor 2019-03-11 16:08:51 +03:00
Ivan Lezhankin
a7e838e328 Replace all other casts to method IAST::As<Derived> 
Also remove some redundant methods like IsIdentifier() et. al.
 2019-03-11 15:49:39 +03:00
chertus
04f5584d72 move JOIn convertions to InterpreterSelectQuery 2019-03-11 15:20:55 +03:00
chertus
09a3b24cbc join kind helpers 2019-03-11 14:14:09 +03:00
Ivan Lezhankin
0e325c7a4a Replace const typeid_casts with As<Derived>() method invocations 2019-03-08 12:48:20 +03:00
Alexey Zatelepin
3344955154 separate Read and Write lock holders, better method names 2019-03-07 21:10:21 +03:00
zhang2014
fb44b6692a rename setting name 2019-03-04 10:09:44 +08:00
zhang2014
b696ef34d2 Add max_execution_speed & min_execution_bytes_speed & max_execution_bytes_speed 2019-03-02 15:08:02 +08:00
alexey-milovidov
ee903886e6
Merge pull request #4387 from abyss7/CLICKHOUSE-4268 
Improve push-down logic for joined statements
 2019-03-02 04:19:50 +03:00
Alexey Zatelepin
0d7ab9e3ea allow acquiring read lock to a table out of order if it was already locked by the same query [#CLICKHOUSE-3789] 
this is important in preventing ALTER deadlocks
 2019-02-27 21:34:38 +03:00
Ivan Lezhankin
c8eefb3927 Always modify subqueries if modifying inplace 
to support push-down while analyzing.
 2019-02-26 13:18:12 +03:00
Ivan Lezhankin
0a443399a0 Implement the debug query "ANALYZE" 
that prints out the query after syntax analysis.
Should be helpful for tests.
 2019-02-26 13:17:25 +03:00
Alexey Milovidov
58a6accee5 Updated test #4246 2019-02-10 19:55:12 +03:00
Alexey Milovidov
d22b52b933 Allow constant expressions in LIMIT BY and TOP; fixed error #4246 2019-02-10 18:27:27 +03:00
Alexey Milovidov
c603d270f4 Cleanups #4246 2019-02-10 18:17:45 +03:00
alexey-milovidov
75c087bcf5
Merge branch 'master' into arbitrary-const-expressions-in-limit 2019-02-10 17:20:31 +03:00
Vitaliy Karnienko
d9da430982 add arbitrary const expressions in limit processing 2019-02-03 21:31:17 +03:00
alexey-milovidov
fdfb60318c
Merge pull request #4193 from 4ertus2/ast 
Refactoring: extract SubqueryForSet to own files
 2019-02-02 15:28:31 +03:00
chertus
866c2b2e78 move required right keys calculation to Join.cpp 2019-01-30 18:51:39 +03:00
chertus
d6450bc488 Refactoring: extract SubqueryForSet to own files 2019-01-30 15:01:00 +03:00
Ivan Lezhankin
05ab15cc84 Merge IBlockInputStream and IProfilingBlockInputStream into one 2019-01-23 17:48:50 +03:00
maiha
6c83beafdd dbms: Fixed misspells in comments 2019-01-23 04:56:53 +09:00
chertus
8bb35ac987 minor changes 2019-01-16 21:38:19 +03:00
Alexey Milovidov
e8871bc211 Added a check #3837 2019-01-16 03:26:15 +03:00
chertus
729ca697d9 minor SyntaxAnalyzer refactoring 2019-01-09 19:16:59 +03:00
Alexey Milovidov
1d4701b0bc Added some warnings from clang's -Weverything 2019-01-04 15:10:00 +03:00
Samuel Chou
fcde47b45e Ensure ROLLUP and CUBE respect HAVING (no change to TOTALS) 2018-12-14 22:27:40 -08:00
Nikolai Kochetov
2fc0643bc9 Do not use table column aliases in prewhere alias action source columns 2018-12-05 19:36:26 +03:00
alexey-milovidov
48b30edcf5
Merge branch 'master' into alter-order-by 2018-12-02 21:06:38 +03:00
alexey-milovidov
bf7b68cf95
Merge pull request #3689 from abyss7/CLICKHOUSE-3936 
CLICKHOUSE-3936
 2018-12-01 01:50:04 +03:00
Alexey Milovidov
97280bb361 Whitespace [#CLICKHOUSE-2] 2018-11-28 21:28:30 +03:00
Ivan
448846fc0d
Merge branch 'master' into CLICKHOUSE-3936 2018-11-28 18:59:57 +03:00
Ivan Lezhankin
8b5a05947c Remove redundant information from RWLock. 
And fix broken exception in some race conditions
 2018-11-28 18:50:52 +03:00
Alexey Milovidov
52fea90a86 Removed useless code [#CLICKHOUSE-2] 2018-11-28 17:33:40 +03:00
Alexey Zatelepin
d3d9242462 Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/src/Parsers/ASTAlterQuery.h
	dbms/src/Parsers/ParserAlterQuery.cpp
	dbms/src/Storages/AlterCommands.cpp
	dbms/src/Storages/AlterCommands.h
 2018-11-26 16:01:48 +03:00
Alexey Milovidov
dbbacf4f87 Added more style checks [#CLICKHOUSE-3] 2018-11-23 21:52:00 +03:00
Alexey Zatelepin
29b34365e6 Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/src/Interpreters/ExpressionAnalyzer.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
 2018-11-13 16:27:19 +03:00
Alexey Zatelepin
7167bfd7b3 fix prewhere with FINAL for VersionedCollapsingMergeTree [#CLICKHOUSE-3859] 2018-11-13 16:15:12 +03:00
Nikolai Kochetov
1e9aeba603 Split ExpressionAnalyzer and SyntaxAnalyzer. 2018-11-09 18:01:18 +03:00
Nikolai Kochetov
726ae0cb9a Split ExpressionAnalyzer and SyntaxAnalyzer. 2018-11-08 19:47:12 +03:00
Nikolai Kochetov
7a5cfc7a6d Skip columns from prewhere_info->remove_columns_actions in prewhere result for alias source columns. [#CLICKHOUSE-4111] 2018-11-07 13:53:36 +03:00
Nikolai Kochetov
8df77930ec Added InterpreterSelectQuery::unifyStreams 2018-11-06 14:44:45 +03:00
Nikolai Kochetov
d7992b11d8 Fix block structure mismatch in MergingSorted stream. 2018-11-06 13:11:37 +03:00
chertus
4ff0391ca6 DatabaseAndTableWithAlias - the only place for db & table expraction from AST 2018-10-30 19:31:21 +03:00
chertus
d2518fdb3f more refactoring: funcs to extract database_and_table from AST 2018-10-29 22:04:28 +03:00
Nikolai Kochetov
d2f0925685 Uniform headers for union stream. #2156 2018-10-23 21:01:38 +03:00
Alexey Milovidov
50234013b5 Whitespaces [#CLICKHOUSE-4016] 2018-10-14 11:23:21 +03:00
Alexey Milovidov
e752271d99 Added check for invalid PREWHERE #3336 2018-10-11 23:52:25 +03:00
CurtizJ
16bea3d008 remove logs 2018-10-10 20:09:09 +03:00
CurtizJ
815380b8b2 fix unnecessarily preparations for join at initial server 2018-10-10 20:07:21 +03:00
alexey-milovidov
b9d1eb4154
Merge pull request #3298 from yandex/fix-prewhere-with-altered-columns 
Fix prewhere with altered columns
 2018-10-04 23:57:11 +03:00
Nikolai Kochetov
b1fa3fab9d Fix prewhere whith final. #2827 2018-10-04 21:18:54 +03:00
zhang2014
6778220ffd ISSUES-3232 remake interpreter_subquery when rewrite subqueries 2018-09-30 17:27:59 +08:00
Nikolai Kochetov
97add69825 Rename WithDictionary to LowCardinality. 2018-09-28 13:44:59 +03:00
Alexey Milovidov
8e7c6598e8 Added remerge step to process ORDER BY with LIMIT when memory usage is high #3179 2018-09-24 23:07:30 +03:00
alexey-milovidov
4a54a1c310
Merge pull request #3138 from yandex/low-cardinality-group-by 
Low cardinality group by
 2018-09-21 13:38:20 +03:00
CurtizJ
b89feb1572 replace bool by enum 2018-09-20 20:51:42 +03:00
CurtizJ
8644853558 optimize 2018-09-20 18:46:37 +03:00
CurtizJ
43951e4879 add test 2018-09-17 22:16:51 +03:00
CurtizJ
8c9fe80d2d add modificator cube 2018-09-17 21:01:04 +03:00
Nikolai Kochetov
16ed282dfc Fix build. 2018-09-14 12:42:38 +03:00
Nikolai Kochetov
3dc5cd3a3a Merged with master. 2018-09-14 12:14:37 +03:00
Nikolai Kochetov
4674beb900 Shared cache for low cradinality single aggregation column. [#CLICKHOUSE-3903] 2018-09-14 11:04:18 +03:00
Nikolai Kochetov
787e814e4c Low cardinality group by signle column. [#CLICKHOUSE-3903] 2018-09-14 11:03:02 +03:00
zhang2014
5834b42083 ISSUES-2560 fix crash when create temporary with in clause 2018-09-11 19:31:59 +08:00
Alexey Milovidov
c9b612de48 Attempt to fix CLICKHOUSE-3888 bug 2018-09-10 06:59:48 +03:00
Nikolai Kochetov
8b658f091d Fix test. 2018-09-07 21:00:53 +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
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
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
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
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
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
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
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
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
CurtizJ
a603595120 remove redundant code 2018-08-28 12:27:17 +03:00
Alexey Milovidov
5b257c588f Enabling -Wshadow [#CLICKHOUSE-2] 2018-08-27 20:42:13 +03:00
Alexey Milovidov
aa936b09f9 Added check for max_block_size = 0 #2447 2018-08-25 19:32:44 +03:00
CurtizJ
cf3fbb8c51 minor changes 2018-08-24 20:37:08 +03:00
CurtizJ
c18ad18d96 Add rollup modificator 2018-08-24 18:00:00 +03:00
CurtizJ
0704da5756 Merge branch 'master' into CLICKHOUSE-3893 2018-08-21 20:34:01 +03:00
CurtizJ
4534d449c1 working on rollup 2018-08-21 19:08:45 +03:00
Alexey Milovidov
465ff07398 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-20 18:50:09 +03:00
Alexey Milovidov
2717185991 Modified names #2015 2018-08-20 18:49:39 +03:00
Nikolai Kochetov
b64bb8af14 Fix tests. 2018-08-20 15:57:31 +03:00
Nikolai Kochetov
391b4b5927 Merged with master. 2018-08-20 15:25:06 +03:00
alexey-milovidov
e7b671ec98
Merge branch 'master' into feature/ISSUES-863 2018-08-15 00:10:21 +03:00
Nikolai Kochetov
f4d9d50168 Merged with master. 2018-08-08 15:01:18 +03:00
Alexey Milovidov
207a2b8b3c Fixed error #2795 2018-08-08 06:09:59 +03:00
Alexey Milovidov
28771401a9 Merging #2226 2018-08-05 10:06:58 +03:00
Alexey Milovidov
2016374d20 Merging #2226 2018-08-05 10:05:43 +03:00
alexey-milovidov
05c7a1971d
Update InterpreterSelectQuery.cpp 2018-08-05 08:29:12 +03:00