Commit Graph

6584 Commits

Author SHA1 Message Date
Vladimir Chebotarev
cc7db759fe create_init_script: Avoid generation of init file each configuration phase. [#METR-21516] 2016-12-13 14:09:22 +03:00
Vitaliy Lyudvichenko
876ad28dd8 Merge remote-tracking branch 'origin/master' into metrics_refinement 2016-12-12 19:17:23 +03:00
Igor Hatarist
b22e4981df Add clickhouse-client option: --version 2016-12-12 12:25:33 +03:00
Alexey Milovidov
f9c31c42c5 Fixed error after updating boost [#METR-2944]. 2016-12-12 10:56:49 +03:00
Alexey Milovidov
a0dfb3e179 Addition to prev. revision [#METR-2944]. 2016-12-12 10:29:21 +03:00
Alexey Milovidov
6dcabed912 Addition to prev. revision [#METR-2944]. 2016-12-12 10:27:47 +03:00
Alexey Milovidov
c1ecc41804 Fixed error after merge [#METR-19266]. 2016-12-12 10:25:31 +03:00
Alexey Milovidov
54af522de1 Preparation [#METR-2944]. 2016-12-12 10:24:56 +03:00
Alexey Milovidov
3d643fc786 Fixed build on clang [#METR-2944]. 2016-12-12 09:02:35 +03:00
Alexey Milovidov
8a69df19c4 Fixed error after merge [#METR-19266]. 2016-12-12 09:00:37 +03:00
Alexey Milovidov
de82683197 Fixed build on clang [#METR-2944].[C 2016-12-12 08:56:34 +03:00
Alexey Milovidov
7e37460c38 Merge branch 'master' of github.com:yandex/ClickHouse 2016-12-12 08:53:56 +03:00
Alexey Milovidov
e2ed20999c Fixed build on clang [#METR-2944]. 2016-12-12 08:53:37 +03:00
alexey-milovidov
52c34b4276 Merge pull request #240 from vavrusa/master
HTTPHandler: added support for X-ClickHouse-*
2016-12-12 09:47:40 +04:00
Alexey Milovidov
dae8814a71 Addition to prev. revision [#METR-2944]. 2016-12-12 08:20:56 +03:00
Alexey Milovidov
0bdd22efe0 Addition to prev. revision [#METR-2944]. 2016-12-12 08:15:34 +03:00
Alexey Milovidov
70b01f0a53 Do not include ClickHouseRevision.h in header files [#METR-2944]. 2016-12-12 08:14:46 +03:00
Alexey Milovidov
31c4636538 Using internal boost library [#METR-2944]. 2016-12-12 07:59:19 +03:00
Alexey Milovidov
d5a002f441 Using internal boost library [#METR-2944]. 2016-12-12 07:57:55 +03:00
Alexey Milovidov
d605bfdc9d Using internal boost library [#METR-2944]. 2016-12-12 07:57:09 +03:00
Marek Vavrusa
f7a7e8e858 HTTPHandler: added support for X-ClickHouse-*
Support X-ClickHouse-* to allow running behind authenticating LBs, that
pass through user information or enforce fixed user.
The format of the new options follows X-Auth-*

Supported headers are:

* X-ClickHouse-User (identical to "user" URL parameter)
* X-ClickHouse-Key (identical to "password" URL parameter)
* X-ClickHouse-Quota (identical to "quota_key" URL parameter)
2016-12-11 20:46:37 -08:00
Alexey Milovidov
58a8cff3ae Using internal boost library [#METR-2944]. 2016-12-12 07:17:16 +03:00
Alexey Milovidov
fc43827a6c Preparation [#METR-2944]. 2016-12-12 06:33:34 +03:00
Alexey Milovidov
927b84323b Addition to prev. revision [#METR-2944]. 2016-12-12 04:51:27 +03:00
Alexey Milovidov
8b06b09f34 Moved code to cpp [#METR-2944]. 2016-12-12 04:33:18 +03:00
Alexey Milovidov
b3e85e6469 Addition to prev. revision [#METR-22442]. 2016-12-11 14:59:55 +03:00
Alexey Milovidov
436d2c43c9 Addition to prev. revision [#METR-22442]. 2016-12-11 14:47:09 +03:00
Alexey Milovidov
ce6556639e Fixed tests after merge [#METR-19266] [#METR-22442]. 2016-12-11 14:33:51 +03:00
Alexey Milovidov
31dbff77c4 Little better [#METR-23792]. 2016-12-11 14:15:24 +03:00
Alexey Milovidov
d77b4f12fb Added UUID functions [#METR-23792]. 2016-12-11 13:57:34 +03:00
Alexey Milovidov
599308aef0 Get rid of obsolete mongodb client library [#METR-23791]. 2016-12-11 12:43:16 +03:00
Alexey Milovidov
4aeb017093 Renamed test [#METR-19266]. 2016-12-10 09:40:46 +03:00
Alexey Milovidov
02cb56653a Merging [#METR-19266]. 2016-12-10 09:22:03 +03:00
Alexey Milovidov
dc9e88a9d7 Merging [#METR-19266]. 2016-12-10 09:16:06 +03:00
Alexey Milovidov
2aa02d0547 Merging [#METR-19266]. 2016-12-10 09:12:21 +03:00
Alexey Milovidov
c937d75a78 Merging [#METR-19266]. 2016-12-10 09:10:29 +03:00
Alexey Milovidov
f4815364f6 Merging [#METR-19266]. 2016-12-10 08:03:12 +03:00
Alexey Milovidov
e53e32130d Merging [#METR-19266]. 2016-12-10 07:58:40 +03:00
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
Alexey Milovidov
95b08c9b03 Miscellaneous [#METR-2944]. 2016-12-10 02:35:18 +03:00
Vitaliy Lyudvichenko
ea11f61433 Added requested changes. [#METR-19372] 2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
855dc56598 Added treshold setting for Vertical merge algorithm. [#METR-23305] 2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
774eb01fd3 Added MergesTime metric. [#METR-23305] 2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
fc4c02c510 StorageSystemMerges refactoring. 2016-12-09 13:13:16 +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
a1c599fc57 Autotests for external dictionaries: removed garbage [#METR-23766]. 2016-12-08 08:58:45 +03:00
Alexey Milovidov
be5a07463e Server: fixed error [#METR-23766]. 2016-12-08 08:29:53 +03:00
Alexey Milovidov
959e31402b Autotests for external dictionaries: back to life. 2016-12-08 08:12:49 +03:00
Alexey Milovidov
a8eedafcd0 Fixed error in cached dictionary when using C++11 ABI [#METR-23764]. 2016-12-08 07:56:52 +03:00