Commit Graph

174 Commits

Author SHA1 Message Date
Alexey Milovidov
e97ecb6cf7 Merge branch 'master' into METR-19266
Conflicts:
	dbms/CMakeLists.txt
	dbms/include/DB/Functions/FunctionsArray.h
	dbms/include/DB/Functions/FunctionsString.h
	dbms/include/DB/Parsers/ExpressionListParsers.h
	dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
	dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
	dbms/src/Core/ErrorCodes.cpp
	dbms/src/Parsers/ASTFunction.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
	dbms/src/Storages/MergeTree/MergeTreeReader.cpp
	dbms/src/Storages/StorageLog.cpp
2016-12-10 07:51:36 +03:00
Vitaliy Lyudvichenko
6540156100 Removed redundant code from CMakeLists. 2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
f8eb9028fd Refined query_log, processes and merges metrics.
Also, dbms/CMakeLists.txt was rewritten.
2016-12-09 13:11:25 +03:00
Alexey Milovidov
2dc425b7e6 Preparation [#METR-23747]. 2016-12-08 06:04:30 +03:00
Alexey Milovidov
514715589b Preparation [#METR-23747]. 2016-12-08 05:49:04 +03:00
Alexey Milovidov
9303a07b39 Removed garbage [#METR-23747]. 2016-12-08 04:11:44 +03:00
Alexey Milovidov
f2cd8de5b4 Removed garbage [#METR-23747]. 2016-12-08 04:08:19 +03:00
proller
76dc51aae5 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-12-07 22:08:09 +03:00
Vladimir Chebotarev
8e1a6aaf3e cmake: Boost, OpenSSL into find_package(). [#METR-23701] 2016-12-06 16:20:32 +03:00
Vladimir Chebotarev
bcc5500f91 cmake: More options. [#METR-23701] 2016-12-05 15:43:14 +03:00
Vitaliy Lyudvichenko
4df22acea9 Try to fix LIBTCMALLOC linking. 2016-11-30 15:10:39 +03:00
Vitaliy Lyudvichenko
202ba912ce Vertical merging algorithm for MergeTree engines. [#METR-23305] 2016-11-29 22:41:31 +03:00
proller
b529f29bb7 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-29 19:57:01 +03:00
Alexey Milovidov
ae413e051b Fixed error [#METRIQA-526]. 2016-11-28 18:22:10 +03:00
proller
3b335b5546 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-24 22:58:40 +03:00
alexey-milovidov
8c2e228856 Revert "New "vertical" algorithm for MergeTrees' parts merges" 2016-11-24 23:08:54 +04:00
proller
e855c16f4a Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-24 21:25:56 +03:00
Vitaliy Lyudvichenko
ec9bcd8054 Vertical merging algorithm for ordinary MergeTreee. 2016-11-23 15:47:19 +03:00
proller
0b40a13ea7 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-22 14:56:57 +03:00
Alexey Milovidov
9018906e1a Better [#METR-2944]. 2016-11-20 15:43:20 +03:00
proller
fd3a9da076 httd dict wip 2016-11-19 03:07:58 +03:00
proller
cc0e0e739e ExecutableDictionarySource ok 2016-11-17 04:09:46 +03:00
proller
593e3c26bf initial 2016-11-15 22:51:06 +03:00
alexey-milovidov
52390b0180 Merge pull request #150 from ludv1x/METR-23101
clickhouse-local application and File(...) storage
2016-11-14 04:03:03 +04:00
artpaul
e1cda4b760 move impl of common parsers to cpp 2016-11-12 22:55:40 +05:00
Vitaliy Lyudvichenko
2242cfd6b0 Put DatabaseMemory class into separated file. 2016-11-09 22:05:35 +03:00
Vitaliy Lyudvichenko
0e2eb5436b Added StorageFile and template for clickhouse-local app. 2016-11-09 22:03:47 +03:00
Vladimir Chebotarev
cdaece7dfa : More specific usage of static libraries. [#METR-21516] 2016-11-09 21:49:01 +03:00
Vladimir Chebotarev
e2ceb63c54 libcommon, libre2, tools: Fixed build under OS X Sierra. [#METR-21516] 2016-11-03 15:41:13 +03:00
Vladimir Smirnov
d36f52502e Make it compilable on OS X
It's still hackish and dirty, but server and client compies.

Server starts, but throwes meaningless exception on any query.

Client seems to be working fine.

Linux compilation might (but shouldn't) be broken (not tested).
2016-11-01 17:59:21 +01:00
Alexey Milovidov
ba48688f25 MergeSelector: development [#METR-21840]. 2016-10-30 11:15:55 +03:00
Alexey Milovidov
b5156a115d Additions [#METR-21504]. 2016-10-28 02:28:35 +03:00
Alexey Milovidov
74c3b30622 dbms: Simplified logic of selecting merges [#METR-21841]. 2016-10-28 01:50:02 +03:00
Alexey Milovidov
968bcb6f66 Preparation [#METR-2944]. 2016-10-27 20:48:12 +03:00
Alexey Milovidov
8be993bd1e Preparation [#METR-2944]. 2016-10-25 09:49:24 +03:00
Alexey Milovidov
daeac24f04 Added ClientInfo: passing original source of query during distributed query execution; improvement of per-user limits in ProcessList [#METR-23279]. 2016-10-25 00:40:39 +03:00
Alexey Milovidov
5b562c63d5 Addition to prev. revision [#METR-23231]. 2016-10-24 09:08:53 +03:00
Alexey Milovidov
ea852bb9d8 Separate compilation of CurrentMetrics; Separated AsynchronousMetrics from CurrentMetrics; Comments [#METR-23237]. 2016-10-24 07:06:27 +03:00
Alexey Milovidov
be84b78b93 Added actively updating metrics [#METR-23237]. 2016-10-23 09:12:50 +03:00
Alexey Arno
924402f33e dbms: Server: merged from master [#METR-19266] 2016-10-19 18:00:56 +03:00
Vitaliy Lyudvichenko
a0760a4821 Added requested PR changes. [#METR-22802] 2016-10-14 20:54:18 +03:00
Vladimir Chebotarev
d09297a840 cmake: Minor fix. [#METR-21516] 2016-10-07 17:56:52 +03:00
Alexey Arno
cc43b1b165 dbms: Server: better [#METR-19266] 2016-09-21 15:31:50 +03:00
Alexey Arno
59043c680e dbms: Server: Ongoing work. Do not pay attention. [#METR-19266] 2016-09-12 17:16:21 +03:00
Alexey Milovidov
d9db19acea Function 'convertCharset': development [#METR-22482]. 2016-08-26 00:44:47 +03:00
Alexey Milovidov
416a74575e Merge branch 'master' of github.com:yandex/ClickHouse 2016-08-25 18:50:17 +03:00
Alexey Milovidov
a3953de0b8 Removed useless files (preparation) [#METR-22462]. 2016-08-25 18:48:25 +03:00
Yuri Dyachenko
c3697364fd enable debug symbols for CMAKE_BUILD_TYPE=Debug 2016-08-25 17:58:01 +03:00
Alexey Arno
d4da820f6c dbms: Allow INSERT when source columns and target columns have compatible types up to nullability. [#METR-19266] 2016-08-25 15:38:47 +03:00
Alexey Milovidov
06bcc34be2 Don't do DNS requests for each fetch from replica [#METR-22304]. 2016-08-19 04:54:23 +03:00
Alexey Arno
f65e7b4a0f dbms: improvements [#METR-19266] 2016-08-18 17:25:02 +03:00
Pavel Kartavyy
9c8697655e build: fix build after merge with clickhouse repo 2016-08-18 14:17:07 +03:00
alexey-milovidov
2f232b25c2 Merge pull request #72 from serebrserg/METR-22322
METR-22322: add geo distance function
2016-08-15 21:02:07 +04:00
Alexey Milovidov
1bb6ccd7f8 Better [#METR-22410]. 2016-08-13 08:29:53 +03:00
serebrserg
429b73422f METR-22322: add geo distance function 2016-08-12 19:51:08 +03:00
Alexey Arno
e2b6e10ec1 dbms: Various fixes + more comments [#METR-19266] 2016-08-10 22:12:29 +03:00
Alexey Arno
531ff3d5ac dbms: Merged with master [#METR-19266] 2016-08-05 18:44:19 +03:00
Alexey Arno
8c02bc44c5 dbms: Added support for nullable parameters (conditions and/or branches) in the function multiIf [#METR-19266] 2016-08-04 18:06:27 +03:00
Alexey Milovidov
9a07830dbb Removed useless code (experimental) [#METR-2944]. 2016-08-02 04:46:05 +03:00
Alexey Milovidov
9014f19f01 Fewer warnings from UBSan [#METR-2944]. 2016-07-31 08:56:36 +03:00
Alexey Milovidov
6f4fc79cde Better [#METR-2944]. 2016-07-31 06:53:16 +03:00
Alexey Milovidov
ea734b6bee Removed compatibility layer with OLAPServer [#METR-2944]. 2016-07-30 04:08:00 +03:00
Alexey Arno
beeeb0ab13 dbms: NULL support for MergeTree [#METR-19266] 2016-07-21 19:22:24 +03:00
Alexey Milovidov
1ef87202f6 Rectifications of JOINs: development [#METR-2944]. 2016-07-21 18:48:11 +03:00
Alexey Arno
252d7994e7 dbms: cleanup [#METR-19266] 2016-07-19 13:57:57 +03:00
Alexey Milovidov
9f9be1b7fc Rectification of JOINs [#METR-2944]. 2016-07-18 04:20:53 +03:00
Alexey Milovidov
40ae51e7b3 Rectifying JOINs [#METR-2944]. 2016-07-18 03:14:24 +03:00
Alexey Milovidov
3d4aaf1a33 JOINs rectification: development [#METR-2944]. 2016-07-17 23:10:50 +03:00
Alexey Milovidov
55ed2904f4 Allowed for certain aggregate functions to have case insensitive names for compatibility [#METR-22087]. 2016-07-14 08:22:09 +03:00
Alexey Arno
13b4a5bd4a dbms: aggregate function support [#METR-19266] 2016-07-12 16:02:52 +03:00
Alexey Arno
2201ad84ff dbms: merged with master [#METR-19266] 2016-07-08 19:52:26 +03:00
Alexey Milovidov
c2929666fd Fixed error [#METR-21877]. 2016-07-07 04:57:48 +03:00
Alexey Milovidov
5f81c096f6 Squashing transforms: development [#METR-21877]. 2016-07-07 00:48:11 +03:00
Alexey Arno
f4e9c16fc0 dbms: Server: Feature development. [#METR-19266] 2016-07-06 15:39:41 +03:00
Alexey Arno
f52403f623 dbms: Server: Feature development. [#METR-19266] 2016-07-06 12:47:55 +03:00
Alexey Arno
582b8fb555 dbms: Server: Feature development. [#METR-19266] 2016-07-05 19:23:37 +03:00
Alexey Milovidov
1a420a14e9 Squashing small blocks on INSERT (when passing blocks via TCP interface or when doing INSERT SELECT) [#METR-21877]. 2016-07-02 00:02:13 +03:00
Alexey Milovidov
df538babc8 Text formats: detecting and skipping UTF-8 BOM when possible [#METR-21817]. 2016-06-23 22:39:20 +03:00
Alexey Milovidov
858481b5d2 Lowered binary size [#METR-21527]. 2016-06-08 03:50:29 +03:00
Alexey Milovidov
3ecfca51ba Splitted dictionaries to separate translation units [#METR-21527]. 2016-06-08 00:07:44 +03:00
Vladimir Chebotarev
117bfa5618 dbms: Proper link options when DISABLE_MONGODB=FALSE. [#METR-21516] 2016-06-02 22:34:12 +03:00
Vladimir Chebotarev
42e6374087 dbms: Build fix. [#METR-21516] 2016-05-29 04:36:19 +03:00
Vladimir Chebotarev
d1f7302d96 dbms: Declared max_block_size. [#METR-21516] 2016-05-29 04:12:10 +03:00
Alexey Milovidov
a8ca56ecc0 Better [#METR-2944]. 2016-05-28 03:22:09 +03:00
Alexey Milovidov
1dea5a0395 Fixed error [#METR-20000]. 2016-05-23 01:56:30 +03:00
Alexey Milovidov
2f8b8d8214 Addition to build without MongoDB [#METR-20000]. 2016-05-23 01:44:11 +03:00
Vladimir Chebotarev
e02a803a6d cmake: Added DISABLE_MONGODB to cmake cache [#METR-XXXXX] 2016-05-22 15:53:22 +03:00
Alexey Milovidov
bd734cd1b4 Allowed to disable MongoDB dictionary source at build time [#METR-20000]. 2016-05-22 03:54:26 +03:00
Alexey Milovidov
65de71b5a2 Added table function 'shardByHash' [#METR-21287]. 2016-05-13 06:22:16 +03:00
Alexey Arno
286baa8611 Merge 2016-05-04 02:19:14 +03:00
Alexey Milovidov
07f04d70d3 Merge 2016-04-24 12:44:47 +03:00
Alexey Milovidov
11f1c451e5 Merge 2016-04-19 02:17:07 +03:00
Alexey Milovidov
a4a5d444ef Tiny modification [#METR-2944]. 2016-04-19 02:16:55 +03:00
Alexey Arno
f2357d50b5 Merge 2016-04-18 17:31:32 +03:00
Alexey Milovidov
2bb5a4749b Merge 2016-04-15 22:09:42 +03:00
Alexey Milovidov
6d851cc5a7 Better [#METR-19470]. 2016-04-11 22:47:48 +03:00
Alexey Milovidov
7c89a426d6 Addition to prev. revision [#METR-19470]. 2016-04-11 22:39:07 +03:00
Alexey Milovidov
7c91f78a53 Addition to prev. revision [#METR-19470]. 2016-04-10 14:49:53 +03:00
Alexey Milovidov
348594ffbe Added ODBC external dictionary source [#METR-19470]. 2016-04-10 07:00:00 +03:00
Alexey Milovidov
3688c2270f Preparation [#METR-19470]. 2016-04-10 05:47:29 +03:00