Commit Graph

1130 Commits

Author SHA1 Message Date
Alexey Milovidov
ce0ac3f8f8 Fixed error with Sets, part 2 #2246 2018-04-20 00:34:04 +03:00
Nikolai Kochetov
dd10c2073c merged with master 2018-04-19 18:10:44 +03:00
Alexey Milovidov
cce4c8886c Removed obsolete code #2226 2018-04-19 00:23:55 +03:00
alexey-milovidov
089e71d9a5
Merge pull request #2235 from yandex/small-enhancements
Small enhancements
2018-04-17 22:45:01 +03:00
Vitaliy Lyudvichenko
f642d0828e Avoid freezing of KILL QUERY. [#CLICKHOUSE-3706] 2018-04-17 17:29:52 +03:00
Nikolai Kochetov
66905a1366 fix build 2018-04-16 22:59:12 +03:00
Nikolai Kochetov
081f0feb56 fix test [#CLICKHOUSE-3694] #2156 2018-04-16 22:49:14 +03:00
Nikolai Kochetov
9e05052c2a merged with master 2018-04-16 18:35:11 +03:00
Nikolai Kochetov
7b8a306e34 minor fixes 2018-04-16 18:11:13 +03:00
Nikolai Kochetov
41229b201b Merge branch 'master' into fix-header-for-union-stream-in-distributed-2 2018-04-13 23:11:04 +03:00
Nikolai Kochetov
325f16f8a5 fix perf 2018-04-13 23:09:13 +03:00
Alexey Milovidov
a2482f120d Fixed test [#CLICKHOUSE-2] 2018-04-08 07:38:27 +03:00
proller
07b81c875e CLICKHOUSE-3444: show error for old query on replace_running_query (#2127)
* Add tests

* Fix test

* Fix test build

* CLICKHOUSE-3444: show error for replace_running_query

* fix naming

* fix

* fix test

* Update IProfilingBlockInputStream.cpp
2018-04-07 06:49:49 +03:00
Alexey Milovidov
babfc6aaf7 Fixed error [#CLICKHOUSE-2] 2018-04-07 06:46:20 +03:00
Alexey Milovidov
3fd2773151 Improved code after introduction of method "getHeader" in every stream [#CLICKHOUSE-2] 2018-04-07 04:46:50 +03:00
Alexey Milovidov
af226d62f5 Fixed totally wrong code in SummingMergeTree in the case of complex maps [#CLICKHOUSE-2] 2018-04-06 21:09:20 +03:00
Alexey Milovidov
f66d2fb780 Allow to use FINAL even in case of single part #2086 2018-04-06 00:36:55 +03:00
Alexey Milovidov
36c9409899 Fixed error [#CLICKHOUSE-2] 2018-04-05 07:42:20 +03:00
Vitaliy Lyudvichenko
ce8de108ed Better timeouts handling. [#CLICKHOUSE-2] 2018-04-04 22:44:38 +03:00
Alexey Milovidov
b3e6bb453a Renamed method #217 [#CLICKHOUSE-1942] 2018-04-02 20:57:38 +03:00
Alexey Zatelepin
f2db72a5e5 move squashing to read side #2084 [#CLICKHOUSE-3540]
This way there is a clear correspondence between blocks inserted into the parent table
and blocks inserted into the materialized view.
2018-03-28 14:41:20 +03:00
alexey-milovidov
e3cbd3306c
Merge pull request #2081 from yandex/stricter-mutable-column-semantic-2
&& - qualified IColumn::mutate
2018-03-28 05:27:35 +03:00
Alex Zatelepin
1be7c09702 add readPrefix()/readSuffix() calls for completeness #2084 [#CLICKHOUSE-3540] 2018-03-27 22:25:50 +00:00
Alexey Zatelepin
88a9b7de91 fix calls to writeSuffix() in PushingToViewsBlockOutputStream #2084 [#CLICKHOUSE-3540]
don't use copyData because it calls writeSuffix() prematurely.
2018-03-27 23:04:40 +03:00
Alexey Zatelepin
d58483b084 squash blocks when inserting into materialized views #2084 [#CLICKHOUSE-3540] 2018-03-27 20:08:41 +03:00
proller
caf83a650e libs: compiling with msvc2017 (#1996)
* Allow use bundled *ssl library

* fix

* Add submodule

* Fixes

* fix

* fixes

* fixes

* fix

* fix

* update poco

* fix warnings

* fix

* fix

* Build fixes

* Build fixes

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add bat

* no zookeeper in dbms

* update boost

* fixes

* fixes

* fix

* fix

* fix

* fix

* try fix

* try fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* Better

* fix

* dh verbose

* fix

* dh verbose

* fix

* clean

* Update LocalDate.h

* Update LocalDateTime.h
2018-03-23 19:05:14 +03:00
Nikolai Kochetov
bd3f2ea361 Merge branch 'stricter-mutable-column-semantic-3' into stricter-mutable-column-semantic-2 2018-03-20 22:47:40 +03:00
Nikolai Kochetov
476d4b339c Immutable construction for columns 2018-03-20 22:45:10 +03:00
Nikolai Kochetov
1f4db58d53 fix test 2018-03-20 20:01:13 +03:00
Nikolai Kochetov
a399c17f01 && - qualified IColumn::mutate 2018-03-20 17:01:00 +03:00
Alexey Zatelepin
5906c9a988 rename for clarity 2018-03-13 18:00:28 +03:00
Alexey Zatelepin
fdffbe53ac encapsulate ColumnsDeclaration [#CLICKHOUSE-3241] 2018-03-13 17:41:25 +03:00
Alexey Zatelepin
78d92f6794 add some useful methods, rename for clarity [#CLICKHOUSE-3241] 2018-03-12 22:10:13 +03:00
Alexey Zatelepin
71642b0880 use ColumnsDescription everywhere [#CLICKHOUSE-3241] 2018-03-12 22:07:48 +03:00
alexey-milovidov
56deedfe9f
Merge pull request #2027 from yandex/CLICKHOUSE-3346
Sync insert and сluster copier enhancements
2018-03-12 20:58:53 +03:00
Vitaliy Lyudvichenko
32b617e1d6 Fixed extra squashing leaded to too big timeouts. [#CLICKHOUSE-3346] 2018-03-11 21:36:09 +03:00
Alexey Milovidov
5ff433b670 Merged Limits to Settings [#CLICKHOUSE-2021] 2018-03-11 03:15:26 +03:00
Alexey Milovidov
f3b6d35167 Removed setting "strict_insert_defaults" [#CLICKHOUSE-2] 2018-03-10 03:11:39 +03:00
Alexey Milovidov
3f8ef38b41 Fixed wording #245 2018-03-10 02:23:15 +03:00
Alexey Milovidov
8ff0c520d0 Removed the possibility to use queries with empty query_id; better semantics #245 2018-03-10 02:04:26 +03:00
Vitaliy Lyudvichenko
efdda9cc9b Introduced ThreadStatus. [#CLICKHOUSE-2910] 2018-03-07 14:35:10 +03:00
alexey-milovidov
a06af52824
Merge pull request #1995 from yandex/CLICKHOUSE-3616
Fixed segfault in case of WHERE <non-UInt8 type expression>
2018-03-06 22:10:14 +03:00
Alexey Zatelepin
f3812dddea generic comparison code in GraphiteRollupSortedBlockInputStream [#CLICKHOUSE-3599] 2018-03-06 20:17:58 +03:00
Alexey Zatelepin
5d51c66bbb generic version comparison code for ReplacingMergeTree [#CLICKHOUSE-3599] 2018-03-06 20:17:58 +03:00
Vitaliy Lyudvichenko
1d247d0e31 Fixed segfault in case of WHERE <non-UInt8 type expression>. [#CLICKHOUSE-3616]
Prohibited non-UInt8 constants in WHERE expressions.
Fixed KILL QUERY syntax highlighting.
2018-03-06 18:42:00 +03:00
proller
82a361d0e9 Show error to client if query was killed (#1989)
* Show error to client if query was killed

* Kill exception v2

* Use kill

* fix

* wip

* fix

* fxi

* try fix

* Revert "try fix"

This reverts commit eb76e4c040.

* QUERY_WASCANCELLED

* Fxi all cancel()

* fix
2018-03-06 00:09:39 +03:00
Alexey Milovidov
ba481a6acd Fixed error with TOTALS [#CLICKHOUSE-3619] 2018-03-03 04:28:13 +03:00
Alexey Milovidov
8cb640ac54 Better UNION ALL: development #1947 2018-03-01 09:08:09 +03:00
Alexey Milovidov
15dc5da190 Fixed error #1947 2018-03-01 09:07:04 +03:00
Alexey Milovidov
ac37b89b16 Better UNION ALL: development #1947 2018-02-26 12:05:06 +03:00
Alexey Milovidov
243563d247 Fixed build [#CLICKHOUSE-2] 2018-02-23 21:55:54 +03:00
Alexey Milovidov
1a3fa45b6f Fixed race condition in Lazy stream [#CLICKHOUSE-2] 2018-02-23 13:43:24 +03:00
Alexey Milovidov
cae7f96f34 Simplification [#CLICKHOUSE-2] 2018-02-23 13:02:29 +03:00
Alexey Milovidov
36a9502e80 Simplification #1896 2018-02-23 11:05:21 +03:00
Alexey Milovidov
640daaf052 Fixed test #1947 2018-02-23 04:00:47 +03:00
Alexey Milovidov
245fd61b12 Unify NullableAdapterBlockInputStream and CastTypeBlockInputStream #1947 2018-02-23 02:02:35 +03:00
Alexey Milovidov
f792ab0824 Remove RemoveColumnsBlockInputStream #1947 2018-02-23 00:35:17 +03:00
alexey-milovidov
7a5ccc86cc
Merge pull request #1937 from yandex/CLICKHOUSE-3606
Update of clickhouse-copier
2018-02-22 23:42:33 +03:00
Vitaliy Lyudvichenko
07d01d2dfb Fixed build after merge. [#CLICKHOUSE-3606] 2018-02-22 14:40:23 +03:00
KochetovNicolai
bcad88c9ae
Update ReplacingSortedBlockInputStream.h
added comment
2018-02-22 11:37:16 +03:00
alexey-milovidov
b6f3f06ef3
Merge branch 'master' into CLICKHOUSE-3606 2018-02-22 02:13:38 +03:00
alexey-milovidov
533b5cbe00
Merge pull request #1938 from yandex/fix-replacing-merge-tree
Fix replacing merge tree vertical merge
2018-02-22 02:06:24 +03:00
alexey-milovidov
331fca64a9
Update ReplacingSortedBlockInputStream.h 2018-02-22 02:04:37 +03:00
Alexey Milovidov
222fb2c945 Miscellaneous [#CLICKHOUSE-2] 2018-02-21 23:23:27 +03:00
Nikolai Kochetov
9d348846d6 fix row position with max version for vertical merge of ReplacingMergeTree #1914 2018-02-21 16:57:58 +03:00
Alexey Milovidov
fef53b1963 Tiny modification [#CLICKHOUSE-2] 2018-02-21 11:34:38 +03:00
Alexey Milovidov
b1fc5eed45 Fixed error [#CLICKHOUSE-2] 2018-02-21 10:34:40 +03:00
Alexey Milovidov
1a026e6131 Fixed error [#CLICKHOUSE-2] 2018-02-21 09:47:32 +03:00
Alexey Milovidov
09ac108f4c Fixed error [#CLICKHOUSE-2] 2018-02-21 07:38:26 +03:00
Alexey Milovidov
33e42a9001 Better [#CLICKHOUSE-2] 2018-02-21 06:48:46 +03:00
Alexey Milovidov
13f1d5c67d Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-20 04:25:56 +03:00
Alexey Milovidov
fa6420b34d Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-20 04:14:38 +03:00
Alexey Milovidov
582798b77f Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 23:42:05 +03:00
Alexey Milovidov
ee4b5d2527 Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 23:23:25 +03:00
Alexey Milovidov
b747c83b15 Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 22:18:51 +03:00
Vitaliy Lyudvichenko
369f88f65d Rewritten and improved sync distributed insert. [#CLICKHOUSE-3346] 2018-02-19 20:26:47 +03:00
Alexey Milovidov
c3b0f0bceb Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 07:30:11 +03:00
Alexey Milovidov
399ede6404 Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 07:29:56 +03:00
Alexey Milovidov
92cfa63e29 Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 07:12:50 +03:00
Alexey Milovidov
17320cc40b Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 07:12:30 +03:00
Alexey Milovidov
f6766c89c4 Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 07:12:08 +03:00
Alexey Milovidov
900755555f Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 07:11:55 +03:00
Alexey Milovidov
8d9fc36ac8 Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 07:03:59 +03:00
Alexey Milovidov
307fc93d1d Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 07:03:31 +03:00
Alexey Milovidov
8b7003ade6 Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 06:57:24 +03:00
Alexey Milovidov
74c56c2def Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 06:56:08 +03:00
Alexey Milovidov
fa50fe80a0 Added method "getHeader" in IBlockOutputStream: development [#CLICKHOUSE-2] 2018-02-19 03:45:32 +03:00
Alexey Milovidov
d4710c78bf Fixed error [#CLICKHOUSE-1920] #51 2018-02-18 09:12:19 +03:00
Alexey Milovidov
7415513151 Return single row for aggregation without keys on empty set: development [#CLICKHOUSE-1920] #51 2018-02-18 08:35:48 +03:00
Alexey Milovidov
a4c10f7499 Header in every stream: development [#CLICKHOUSE-2] 2018-02-18 07:17:11 +03:00
Alexey Milovidov
afe09d3138 Removed unused code [#CLICKHOUSE-2] 2018-02-18 06:46:18 +03:00
Alexey Milovidov
754a4296df Header in every stream: fixed non-deterministic test [#CLICKHOUSE-2] 2018-02-18 06:23:48 +03:00
Alexey Milovidov
d6d7b3e7e4 Header in every stream: development [#CLICKHOUSE-2] 2018-02-18 05:46:39 +03:00
Alexey Milovidov
dba529d674 Header in every stream: development [#CLICKHOUSE-2] 2018-02-17 07:13:49 +03:00
Alexey Milovidov
a673790748 Header in every stream: development [#CLICKHOUSE-2] 2018-02-16 23:53:47 +03:00
Alexey Milovidov
d76feb779c Header in every stream: development [#CLICKHOUSE-2] 2018-02-16 22:04:27 +03:00
Alexey Milovidov
264e6cbc84 Header in every stream: development [#CLICKHOUSE-2] 2018-02-16 00:31:09 +03:00
Alexey Milovidov
69a9723ce2 Header in every stream: development [#CLICKHOUSE-2] 2018-02-15 22:48:41 +03:00
Alexey Milovidov
30b657a0da Header in every stream: development [#CLICKHOUSE-2] 2018-02-15 21:54:12 +03:00
Alexey Milovidov
0cdfadeb5a Removed useless method [#CLICKHOUSE-2] 2018-02-15 19:54:14 +03:00
Alexey Milovidov
e658741ccf Removed useless methods [#CLICKHOUSE-2] 2018-02-15 19:29:34 +03:00
Alexey Milovidov
921e09b5f8 Merge branch 'master' into header-in-input-streams 2018-02-15 19:20:36 +03:00
proller
10803568ad
Macos shared build fix (#1906) 2018-02-15 00:01:40 +03:00
Nikolai Kochetov
4040e156b5 added checks and comments for FixedSizeDequeWithGaps; review fixes [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
beb866150d added checks and comments for FixedSizeDequeWithGaps; review fixes [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
32bdf7c38c renamed MultiversionMergeTree to VersionedCollapsingMergeTree [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
e997db55ef fix for vertical merge in MultiversionMergeTree [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
66b94d481a added MultiversionMergeTree [#CLICKHOUSE-3479] 2018-02-13 00:13:50 +03:00
Nikolai Kochetov
e02ca10b9a merged with master 2018-02-08 20:46:22 +03:00
Nikolai Kochetov
583ff32fe8 changed IFunction 2018-02-08 20:18:15 +03:00
Tsarkova Anastasia
5ecd50ff44 Adding comments. Reversing infinities. 2018-02-08 17:28:31 +03:00
Alexey Milovidov
02ae36fe0c Little better #1855 2018-02-06 21:43:28 +03:00
zhang2014
5e001ba8e0 ISSUES-67 Use initial column values with default expression 2018-02-03 15:42:40 +08:00
Vitaliy Lyudvichenko
e2fb6d8c80 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-3346 2018-01-25 22:00:08 +03:00
alexey-milovidov
24ac18201c Update getFQDNOrHostName.cpp
Update isLocalAddress.cpp

Update IBlockOutputStream.h

Update users.xml
2018-01-24 17:14:21 +03:00
Alexey Milovidov
e8a0dde15b Added more checks [#CLICKHOUSE-2]. 2018-01-23 21:49:15 +03:00
Vitaliy Lyudvichenko
1000328571 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-3346 2018-01-22 20:31:08 +03:00
Alexey Milovidov
9a02d4f5ff Merge branch 'master' of github.com:yandex/ClickHouse into header-in-input-streams 2018-01-20 04:20:40 +03:00
Amos Bird
f87d80c378 Add #pragma once for SquashingTransform.h 2018-01-19 21:40:23 +03:00
Vitaliy Lyudvichenko
bee7127572 Refactoring of Graphite merger. [#CLICKHOUSE-2860] 2018-01-19 21:40:05 +03:00
Vitaliy Lyudvichenko
0b8d2a2024 Fixed nondeterministic merge in GraphiteMergeTree. [#CLICKHOUSE-2860] 2018-01-18 23:30:03 +03:00
Vitaliy Lyudvichenko
69a3c81866 Fix incorrect delayed max_result_bytes check. [#CLICKHOUSE-2]
Resolves #1724
2018-01-17 21:15:25 +03:00
proller
d97b2edc7c Make separate libs Common/ZooKeeper and Common/ConfigProcessor (#1749)
* Make separate libs Common/ZooKeeper and Common/ConfigProcessor
renamed:    dbms/src/Common/StringUtils.h -> dbms/src/Common/StringUtils/StringUtils.h

* Fix space

* Fix data in system.build_options

* merge

* merge
2018-01-15 22:07:47 +03:00
Alexey Milovidov
ce5de79263 Fixed tests #1665 2018-01-14 03:12:23 +03:00
Alexey Milovidov
9283c38854 Fixed error [#CLICKHOUSE-2]. 2018-01-13 04:33:55 +03:00
Vitaliy Lyudvichenko
388d47bbbc Merge branch 'CLICKHOUSE-3346-v310' into CLICKHOUSE-3346 2018-01-11 23:51:30 +03:00
Vitaliy Lyudvichenko
e1fafb1f2f Minimal working example. [#CLICKHOUSE-3346] 2018-01-11 21:55:45 +03:00
Vitaliy Lyudvichenko
ac17c59108 Updated describe query, cluster copier draft. [#CLICKHOUSE-3346] 2018-01-11 21:55:08 +03:00
proller
b026eb7797 Use submodule contrib/capnproto, remove include_directories (#1746)
* Add submodule contrib/capnproto

* Use contrib/capnproto, remove include_directories

* Fix include

* Clean

* Fix werror

* Update doc

* Fix

* Final fix

* Fxi
2018-01-11 21:39:52 +03:00
Alexey Milovidov
0bfea2f52c Miscellaneous [#CLICKHOUSe-2] 2018-01-10 03:04:08 +03:00
Alexey Milovidov
5081f276d1 Added method "getHeader" in IBlockInputStream [#CLICKHOUSE-2] 2018-01-09 04:51:08 +03:00
Alexey Milovidov
fe880d73e7 Added method "getHeader" in IBlockInputStream [#CLICKHOUSE-2] 2018-01-09 03:19:58 +03:00
Alexey Milovidov
1780e6c1d9 Added method "getHeader" in IBlockInputStream [#CLICKHOUSE-2] 2018-01-08 04:14:43 +03:00
Alexey Milovidov
12c521fa25 Added method "getHeader" in IBlockInputStream [#CLICKHOUSE-2] 2018-01-07 03:35:44 +03:00
Alexey Milovidov
9996e181e1 Added method "getHeader" in IBlockInputStream [#CLICKHOUSE-2] 2018-01-06 21:10:44 +03:00
Alexey Milovidov
7a2fcd3055 Fixed build on AArch64 [#CLICKHOUSE-1700] 2017-12-28 19:51:53 +03:00
Alexey Milovidov
fcdd5de47d Revert "Removed questionable code (2) [#CLICKHOUSE-2]."
This reverts commit fcabe8b888.
2017-12-28 07:39:19 +03:00
Alexey Milovidov
798299ba89 Merge branch 'aavdonkin-master' 2017-12-28 07:33:55 +03:00
Alexey Milovidov
104b09604a Merging [#CLICKHOUSE-3114] 2017-12-28 00:45:05 +03:00
Alexey Milovidov
09262ae0d7 Merge branch 'master' of github.com:yandex/ClickHouse 2017-12-27 01:56:30 +03:00
proller
da1233fe3f Fix missing includes 2017-12-26 22:02:00 +03:00
Alexey Milovidov
c89041ce63 Removed questionable code (2) [#CLICKHOUSE-2]. 2017-12-26 01:51:04 +03:00
Alexey Milovidov
ec71908b00 Revert "Removed questionable code (2) [#CLICKHOUSE-2]."
This reverts commit fcabe8b888.
2017-12-26 00:57:29 +03:00
Alexey Milovidov
fcabe8b888 Removed questionable code (2) [#CLICKHOUSE-2]. 2017-12-26 00:32:33 +03:00
Alexey Milovidov
a85b2e5a95 Removed questionable code [#CLICKHOUSE-2]. 2017-12-26 00:10:46 +03:00
Alexey Milovidov
bcfde7c6c0 Get rid of DataTypeNested, part 2 [#CLICKHOUSE-2]. 2017-12-25 21:58:39 +03:00
Alexey Milovidov
8ff93487e3 Miscellaneous [#CLICKHOUSE-2]. 2017-12-25 07:01:46 +03:00
Alexey Milovidov
671b731c90 Removed useless calls [#CLICKHOUSE-2]. 2017-12-25 03:37:13 +03:00
Alexey Milovidov
9aa0ebff01 Merge branch 'master' of github.com:yandex/ClickHouse 2017-12-24 10:59:39 +03:00
Alexey Milovidov
7ee1c81d45 Fixed DISTINCT if all columns are constant [#CLICKHOUSE-3505]. 2017-12-24 10:59:26 +03:00