Commit Graph

1382 Commits

Author SHA1 Message Date
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
alexey-milovidov
4c549f79cd
Update RollupBlockInputStream.cpp 2018-09-06 03:58:24 +03:00
Alexey Zatelepin
6275bfd8cd fix CollapsingMergeTree + vertical merge [#CLICKHOUSE-3963]
don't skip writing to rows sources even if all rows have collapsed.
2018-09-05 20:19:51 +03:00
CurtizJ
472adf4ab9 add rollup to formatted query 2018-09-05 19:23:28 +03:00
CurtizJ
35cbdcda5b optimize memory consumption 2018-09-05 17:39:51 +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
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
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
CurtizJ
3bc743c50d do not merge blocks into one 2018-09-03 12:49:04 +03:00
Alexey Milovidov
26587dd2bb Addition to prev. revision [#CLICKHOUSE-2] 2018-09-02 08:23:20 +03:00
Alexey Milovidov
f5d03f6ac2 Miscellaneous [#CLICKHOUSE-2] 2018-09-01 22:14:04 +03:00
Alexey Milovidov
7d77d001f5 Full support for alignment of aggregate states #2808 2018-09-01 07:25:03 +03:00
alesapin
711b228a30 Merge remote-tracking branch 'upstream/master' 2018-08-31 10:15:33 +03:00
Alexey Milovidov
8aecbc6df6 Data streams: better [#CLICKHOUSE-3944] 2018-08-31 04:46:39 +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
Alexey Zatelepin
dc2a4c21e9 execute ALTER UPDATE [#CLICKHOUSE-13] 2018-08-30 16:56:43 +03:00
CurtizJ
a04c37251b remove redundant code 2018-08-27 12:09:47 +03:00
CurtizJ
cf3fbb8c51 minor changes 2018-08-24 20:37:08 +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
Alexey Zatelepin
f592aa84d1 fix vertical merge for empty parts [#CLICKHOUSE-3913] 2018-08-23 15:04:30 +03:00
Alexey Milovidov
5435dc3dc2 Fixed error with thread statuses #2482 2018-08-22 07:32:21 +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
2138f50e48 Better exception message #2888 2018-08-20 19:10:58 +03:00
Nikolai Kochetov
391b4b5927 Merged with master. 2018-08-20 15:25:06 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +03:00
Nikolai Kochetov
26f464a4f9 Fix Const(LowCardinality) conversion. [#CLICKHOUSE-3621] 2018-08-14 20:19:48 +03:00
Nikolai Kochetov
4a62ab9d5c Merged with master. 2018-08-10 16:53:08 +03:00
Alexey Milovidov
36db216abf Preparation for extra warnings [#CLICKHOUSE-2] 2018-08-10 07:02:56 +03:00
Nikolai Kochetov
ab10005af5 Renamed settings for LowCardinality type. 2018-08-09 13:52:46 +03:00
Nikolai Kochetov
f4d9d50168 Merged with master. 2018-08-08 15:01:18 +03:00
Alexey Zatelepin
1f2d4f90b9 allow empty parts after merge for Summing, Collapsing and VersionedCollapsing engines [#CLICKHOUSE-3879] 2018-08-06 19:54:00 +03:00
Alexey Milovidov
2016374d20 Merging #2226 2018-08-05 10:05:43 +03:00
Nikolai Kochetov
9359ae7650 Fix test. 2018-07-31 20:34:17 +03:00
Nikolai Kochetov
368e7d0b08 Added joined_block_actions to SubqueryForSet for join subquery. [#CLICKHOUSE-3761]
3Added joined_block_actions to join expression action.
2018-07-30 22:41:27 +03:00
Alexey Zatelepin
f75fb6cd68 refactor InterpreterSelectQuery constructors [#CLICKHOUSE-3798] 2018-07-20 22:44:34 +03:00
Nikolai Kochetov
3a74ec7c0c Mergred with master 2018-07-20 14:08:54 +03:00
Constantin S. Pan
8539c1e119 Fix the column size difference bug in SummingMergeTree 2018-07-18 00:17:04 +03:00
chertus
3d133a6a5a save block structure when add defaults 2018-07-17 23:02:37 +03:00
chertus
07a782e637 fix wrong defaults at columns tail and some build fixes 2018-07-16 22:28:07 +03:00
chertus
e65c0b436a Merge branch 'master' into issue-3578 2018-07-16 18:28:06 +03:00
proller
5384504fa2 More information in 'Cannot read all data' errors 2018-07-13 22:06:26 +03:00
chertus
4e0d9aa8d4 revert unneeded changes 2018-07-13 15:46:29 +03:00
chertus
c8f71cb539 Merge branch 'master' into issue-3578 2018-07-13 14:30:42 +03:00
chertus
c78a67d573 fix case with unexpected aliases 2018-07-13 01:05:03 +03:00
chertus
3c39f2fc69 fix some tests 2018-07-11 21:34:12 +03:00
chertus
82d22574d4 fix empty defaults mask issue and add some comments 2018-07-11 17:11:47 +03:00
chertus
fe1b393e55 defaults for storages with formated input 2018-07-11 15:05:04 +03:00
chertus
519102b110 defaults for http inserts 2018-07-10 20:20:55 +03:00
Alexey Milovidov
8e0ae12b4e Miscellaneous [#CLICKHOUSE-2] 2018-07-10 16:43:01 +03:00
chertus
5036309d26 fix const defaults 2018-07-10 16:33:41 +03:00
Alexey Milovidov
c0373c1d45 Style; added comment #2566 2018-07-04 23:46:17 +03:00
Alexey Milovidov
47958bee7c Merge branch 'feature-agg-func-in-summing-merge-tree' of https://github.com/kvap/ClickHouse into kvap-feature-agg-func-in-summing-merge-tree 2018-07-04 23:34:28 +03:00
Alexey Milovidov
c99e717632 Fixed bad code #2571 2018-07-04 20:28:52 +03:00
chertus
88c4081a82 3578: defaults for input streams (in progress) 2018-07-04 20:02:47 +03:00
Nikolai Kochetov
6e5e57353a Review fixes. [#CLICKHOUSE-3694] #2156 2018-06-29 19:18:50 +03:00
alexey-milovidov
3904ba561f
Merge branch 'master' into CLICKHOUSE-2910 2018-06-28 20:47:25 +03:00
Nikolai Kochetov
9f591b8d02 Merged with master. 2018-06-26 17:41:29 +03:00
Nikolai Kochetov
f56d16769b Added pre and post serialization for IDataType BinaryBulkWithMultipleStreams. Supported dictionary serialization format with single global dictionary (limited wit max_dictionary_size) and additional keys which are stored per granule. Changed IDataType::enumerateStream interface. Added (de)serialization params for binary bulk with multiple stream (de)serialization. Changed IColumn::index interface. 2018-06-26 17:12:21 +03:00
Constantin S. Pan
cc4c4e0b49 Make the test more comprehensive and fix bugs in AggregateFunction implementation of SummingMergeTree 2018-06-26 11:28:42 +01:00
Nikolai Kochetov
ba4cf6faf0 Merged with master. 2018-06-25 15:08:21 +03:00
Nikolai Kochetov
91c9906c88 Fixed reading from ReplacingMergeTree from emprty row set after prewhere. #2525 2018-06-25 13:48:11 +03:00
Alexey Zatelepin
2fb3d42dfd temporary fix for a bug when several mutations have the same predicate [#CLICKHOUSE-3747] 2018-06-21 22:47:44 +03:00
Constantin S. Pan
e94570d206 Add support for AggregateFunction in SummingMergeTree 2018-06-21 16:10:32 +01:00
Nikolai Kochetov
f88584d748 Added DeserializeBinaryBulkState which stores reading state for ColumnWithDictionary. 2018-06-21 16:28:53 +03:00
Vitaliy Lyudvichenko
358e4ae9bf Fixed failures in utils, more precise test. [#CLICKHOUSE-2910] 2018-06-20 18:41:15 +03:00
Vitaliy Lyudvichenko
310bb4116e Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-06-19 23:33:11 +03:00
Vitaliy Lyudvichenko
e13ba09004 Rewritten ThreadStatus via adding shared thread state. [#CLICKHOUSE-2910]
Fixed race condition in SystemLog.
2018-06-19 23:30:35 +03:00
proller
fbe7df73a2
CLICKHOUSE-3762 Build fixes (#2488)
CONTRIB-254
2018-06-19 21:09:09 +03:00
Vitaliy Lyudvichenko
8dc1bebf00 Add logs forwarding from remote severs to client. [#CLICKHOUSE-2910] 2018-06-18 19:30:26 +03:00
Vitaliy Lyudvichenko
392f6e0c6c Print query_id in logs. Add own logging interface. [#CLICKHOUSE-2910] 2018-06-18 16:41:13 +03:00
Vitaliy Lyudvichenko
a0e9d17bfd Add query_id and host_name to server logs. [#CLICKHOUSE-2910] 2018-06-15 16:49:01 +03:00
Vitaliy Lyudvichenko
4cd230f85c Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-06-14 16:04:00 +03:00
Vitaliy Lyudvichenko
95b42afcb9 Add test for profile events logging. [#CLICKHOUSE-2910] 2018-06-14 14:56:12 +03:00
alexey-milovidov
08ec751a8c
Merge pull request #2504 from yandex/system-mutations-table
[WIP] system.mutations table skeleton
2018-06-13 23:00:30 +03:00
Alexey Zatelepin
c5c601f662 save serialized commands in ReplicatedMergeTreeMutationEntry; split InterpreterAlterQuery::parseAlter() [#CLICKHOUSE-3747] 2018-06-13 17:14:08 +03:00
alexey-milovidov
fafecb3c25
Better modularity of formats. (#2492)
* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development): removed very old tests #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447
2018-06-10 22:22:49 +03:00
Vitaliy Lyudvichenko
ed7cd86f09 Fixed several bug. Trun on --server_logs_level=warning in tests. [#CLICKHOUSE-2910]
Fixed several test to be compatible with --server_logs_level=warning.
2018-06-08 22:50:15 +03:00
Alexey Milovidov
96fbe1d716 Allowed to switch between 'basic' and 'best effort' methods of parsing DateTime from text #1710 2018-06-08 06:27:34 +03:00
Alexey Milovidov
101276e541 Allowed to switch between 'basic' and 'best effort' methods of parsing DateTime from text #1710 2018-06-08 06:15:33 +03:00
Alexey Milovidov
2152b932c2 Allowed to switch between 'basic' and 'best effort' methods of parsing DateTime from text: preparation #1710 2018-06-08 05:56:37 +03:00
Alexey Milovidov
29bd48fc7a Passing settings to ser/de of data types: development #1710 2018-06-08 05:24:27 +03:00
Alexey Milovidov
26d448baad Passing settings to ser/de of data types: development #1710 2018-06-08 04:51:55 +03:00
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
Ivan Zhukov
6dd0f89d68 Refactor: make some members and methods static 2018-06-06 00:47:57 +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
Ivan Zhukov
b34c2443f4 Parquet input: support NULL values 2018-06-05 02:44:36 +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
Ivan Zhukov
882e246e4f Actualize TODOs 2018-05-26 23:44:51 +03:00
Alexey Zatelepin
fd81cc7f66 mutation executor for MergeTree [#CLICKHOUSE-3747] 2018-05-25 23:13:00 +03:00
Ivan Zhukov
72ccc8f978 Parquet output: refactor functions-fillers 2018-05-25 01:23:36 +03:00
Ivan Zhukov
0111969eaa Check arrow status 2018-05-25 00:33:12 +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
Ivan Zhukov
b3de2f4b2b Parquet output: support numeric and string types 2018-05-18 05:53:54 +03:00
Ivan Zhukov
f1bef15705 Parquet input: add a Date type support 2018-05-17 22:07:51 +03:00
Ivan Zhukov
31e27effa6 Parquet input: change if to switch 2018-05-17 22:07:51 +03:00
Ivan Zhukov
4076ae77b4 Parquet input: add a boolean type support 2018-05-17 22:07:51 +03:00
Ivan Zhukov
f8dae2bc76 Parquet input: get rid of redundant copying 2018-05-17 22:07:49 +03:00
Nikolai Kochetov
d7ead51796 Added invalid FixedString size to the list of parse errors. 2018-05-17 18:29:59 +03:00
Ivan Zhukov
282110cba4 Parquet input: support a string type 2018-05-17 04:54:25 +03:00
Ivan Zhukov
e5307e3c18 Parquet input: support numeric types 2018-05-17 04:54:25 +03:00
Ivan Zhukov
fabd38fe6d Add a template for ParquetBlockInputStream 2018-05-17 04:54:23 +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
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