Commit Graph

1130 Commits

Author SHA1 Message Date
Alexey Milovidov
d81d4dfb29 Merge branch 'master' into format-settings 2018-06-08 01:39:55 +03:00
Vitaliy Lyudvichenko
ac54e52fb3 Add server logs passing to client. [#CLICKHOUSE-2910] 2018-06-07 20:58:50 +03:00
alexey-milovidov
be4be0758a
Remove escaping in presentational formats (#2476)
* Removed escaping in presentational formats; changed a way how NULL is output #1729

* Addition to prev. revision #1729

* Addition to prev. revision #1729

* Updated tests #1729

* Updated function visibleWidth to be consistent with Pretty formats #1729
2018-06-07 04:30:29 +03:00
Alexey Milovidov
0b7bf8491f Merge branch 'master' into format-settings 2018-06-07 02:13:45 +03:00
proller
347579ce46 Cmake: mark system includes as SYSTEM (#1449)
* contrib: cctz as submodule. update cctz.

* pbuilder: add ubuntu bionic, devel

* Cmake: mark system includes as SYSTEM

* Build fixes

* fix

* Fix package without compiler

* Better

* fix

* fix

* fix

* Build fix

* fix

* fix

* fix

* Cmake: Add SYSTEM to includes for external libs
2018-06-06 23:21:58 +03:00
Alexey Milovidov
092d156800 Settings for DateTime format (incomplete) [#CLICKHOUSE-2] 2018-06-06 00:39:01 +03:00
Alexey Milovidov
b9b89a5590 Less dependencies [#CLICKHOUSE-2] 2018-06-05 22:46:49 +03:00
Alexey Milovidov
df11490b2a Insignificant changes guided by PVS-Studio [#CLICKHOUSE-3] 2018-06-04 18:45:08 +03:00
Alexey Milovidov
d811647668 Suppressions for PVS-Studio [#CLICKHOUSE-3] 2018-06-04 18:28:25 +03:00
Vitaliy Lyudvichenko
89f2107c75 C++ify taskstats getter, periodic auto update of profile events. [#CLICKHOUSE-2910] 2018-06-04 17:50:35 +03:00
Alexey Zatelepin
2e77c508ad add comments [#CLICKHOUSE-3747] 2018-06-04 14:43:09 +03:00
Alexey Milovidov
8cb65277e2 Non significant changes according to clang's -Weverything, part 5 [#CLICKHOUSE-2] 2018-06-04 01:11:50 +03:00
Alexey Milovidov
f5adbceed2 Non significant changes according to clang's -Weverything, part 3 [#CLICKHOUSE-2] 2018-06-03 23:39:06 +03:00
Alexey Milovidov
1c2b024c39 Non significant changes according to clang's -Weverything, part 2 [#CLICKHOUSE-2] 2018-06-03 20:43:56 +03:00
Alexey Milovidov
734cebdf09 Non significant changes according to clang's -Weverything, part 1 [#CLICKHOUSE-2] 2018-06-03 19:51:31 +03:00
Alexey Zatelepin
af06ca5d3c Merge branch 'master' into replicated-mergetree-mutations 2018-06-01 16:21:14 +03:00
Vitaliy Lyudvichenko
549a6944d9 Better AsynchronousBlockInputStream in sync mode. [#CLICKHOUSE-2910] 2018-06-01 14:58:17 +03:00
Alexey Milovidov
f45c479a8b Removed wrong query optimization [#CLICKHOUSE-3726] 2018-05-31 21:28:04 +03:00
Vitaliy Lyudvichenko
0355f81f20 [WIP] Introduced query_thread_log. [#CLICKHOUSE-2910] 2018-05-31 18:54:08 +03:00
Alexey Zatelepin
c9bb986330 Merge branch 'master' into replicated-mergetree-mutations
Conflicts:
	dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h
	dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
	dbms/src/Storages/StorageReplicatedMergeTree.cpp
2018-05-31 18:52:42 +03:00
Alexey Zatelepin
dbf6949e0b support skipping mutations (just in case) [#CLICKHOUSE-3747] 2018-05-31 18:21:00 +03:00
Vitaliy Lyudvichenko
e265e5c2ab Refactoring. [#CLICKHOUSE-2910] 2018-05-29 21:14:31 +03:00
Vitaliy Lyudvichenko
d81744fd06 Add more perfomance counters. [#CLICKHOUSE-2910] 2018-05-28 23:03:03 +03:00
Vitaliy Lyudvichenko
aa40931824 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-05-28 20:22:27 +03:00
Alexey Zatelepin
f6c72f8e56 Merge branch 'master' into replicated-mergetree-mutations
Conflicts:
	dbms/src/Common/ActionBlocker.h
	dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp
	dbms/src/Storages/MergeTree/ActiveDataPartSet.h
	dbms/src/Storages/MergeTree/MergeTreeData.h
	dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
	dbms/src/Storages/StorageMergeTree.cpp
	dbms/src/Storages/StorageReplicatedMergeTree.cpp
	dbms/src/Storages/StorageReplicatedMergeTree.h
2018-05-28 18:37:30 +03:00
Vitaliy Lyudvichenko
7615f5a09a More detail dignostic when parse JSONEachRow. [#CLICKHOUSE-2] 2018-05-28 14:40:07 +03:00
Alexey Zatelepin
fd81cc7f66 mutation executor for MergeTree [#CLICKHOUSE-3747] 2018-05-25 23:13:00 +03:00
Vitaliy Lyudvichenko
87ad1df259 More atomic insert to MATERIALIZED VIEW. [#CLICKHOUSE-3743] 2018-05-23 19:18:04 +03:00
Nikolai Kochetov
937cb2db29 Merged with master. 2018-05-21 14:38:50 +03:00
Nikolai Kochetov
d7ead51796 Added invalid FixedString size to the list of parse errors. 2018-05-17 18:29:59 +03:00
Vitaliy Lyudvichenko
de6c48f4df Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-05-14 19:09:00 +03:00
Vitaliy Lyudvichenko
e8b94b89e9 Removed dbg output, fixed test. [#CLICKHOUSE-2] 2018-05-14 17:14:58 +03:00
Vitaliy Lyudvichenko
d25338582d Speedup partition check, add more preformance output. [#CLICKHOUSE-2]
Faster partition check.

Added more debug info.
2018-05-14 17:14:58 +03:00
Nikolai Kochetov
6ba8cb922c Fix usage of columns from header in SummingSortedBlockInputStream. #2273 2018-05-14 13:48:50 +03:00
Vitaliy Lyudvichenko
5704de8774 Fixed settings passing in clickhouse-local and tmp dirs. [#CLICKHOUSE-3713] 2018-05-10 02:15:06 +03:00
proller
eb772b8001 gcc8 fixes (memset, uncaught_exception) 2018-05-08 22:44:54 +03:00
proller
398097d24a Build fixes (#2323)
* Build fixes

* Fixes

* remove libzookeeper-mt-dev

* fix

* fix

* wrong

* try fix

* fix

* Update CMakeLists.txt
2018-05-07 18:59:52 +03:00
Nikolai Kochetov
af5475b77c Added ConvertColumnWithDictionaryToFullBlockInputStream. 2018-05-04 14:50:42 +03:00
Nikolai Kochetov
67769ef333 Added ConvertColumnWithDictionaryToFullBlockInputStream. 2018-05-04 14:47:39 +03:00
Nikolai Kochetov
f4627af23f Added ConvertColumnWithDictionaryToFullBlockInputStream. 2018-05-04 14:44:52 +03:00
Nikolai Kochetov
13ba167dce Added ConvertColumnWithDictionaryToFullBlockInputStream. 2018-05-04 14:40:36 +03:00
Nikolai Kochetov
530b99cee5 Added ConvertColumnWithDictionaryToFullBlockInputStream. 2018-05-04 14:39:15 +03:00
alexey-milovidov
093c054b1f
Merge pull request #2263 from luc1ph3r/arbitrary-csv-delimiter
Support an arbitrary CSV delimiter
2018-04-27 13:13:09 -07:00
Nikolai Kochetov
7a62bb9267 added comments and fixed tests build 2018-04-23 22:41:10 +03:00
Ivan Zhukov
e402ff3f81 Unify string checks with a new type 2018-04-22 02:42:01 +03:00
Ivan Zhukov
a138ab2820 Add CSV delimter support in CSVRowOutputStream 2018-04-22 02:08:50 +03:00
Ivan Zhukov
91cb03bdaf Add delimiter support in CSVRowInputStream 2018-04-22 02:08:31 +03:00
Nikolai Kochetov
a6375d6155 merged with master 2018-04-20 17:15:03 +03:00
Nikolai Kochetov
f5fe383620 fix build 2018-04-20 17:06:01 +03:00
Alexey Milovidov
207a8cc03c Fixed error with Sets, part 2 #2246 2018-04-20 00:36:58 +03:00
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