Commit Graph

6636 Commits

Author SHA1 Message Date
artpaul
fb900881da resolve conflicts 2016-12-12 11:15:01 +05:00
artpaul
529f75c8b4 - use std::experimental::string_view
- rename unquoteUrl to decodeURLComponent
- fix code-style
2016-12-12 11:09:00 +05: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
artpaul
bea52b8631 lost files 2016-12-11 18:55:13 +05:00
artpaul
9ec6688397 move char2DigitTable to hex.cpp 2016-12-11 18:54:38 +05: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
artpaul
99cec8b165 implement unquoteUrl 2016-12-11 02:04:58 +05: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
artpaul
396ccccfce fix extraction of TLD from fqdn 2016-12-10 03:49:21 +05:00
artpaul
4cf4fa68e1 parametrize StringView 2016-12-10 03:13:33 +05:00
artpaul
228b43bc95 calculate size of 'https' at compile time 2016-12-10 00:33:52 +05:00
artpaul
dfb466d156 host extraction functionality was moved to UrlUtils 2016-12-10 00:31:16 +05:00
artpaul
544143f5c9 url's scheme extraction was fixed according to rfc3986. 2016-12-09 22:38:15 +05: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
Alexey Milovidov
2dc425b7e6 Preparation [#METR-23747]. 2016-12-08 06:04:30 +03:00
Alexey Milovidov
6998b5ecd9 ODBC: refreshment [#METR-18538]. 2016-12-08 05:55:58 +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
alexey-milovidov
5923df80e4 Merge pull request #204 from proller/METR-23466
Metr-23466 : dictonary sources: http and executable
2016-12-08 05:04:50 +04:00
Alexey Milovidov
6546b73dcc Added setting 'input_format_values_interpret_expressions' [#METR-23720]. 2016-12-08 03:25:52 +03:00
Alexey Milovidov
59da0fd12a Added metrics and events for Context lock [#METR-23763]. 2016-12-08 01:49:42 +03:00
Vitaliy Lyudvichenko
450cee3641 Fixed flags/force_restore_data. 2016-12-07 22:16:41 +03:00
proller
76dc51aae5 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-12-07 22:08:09 +03:00
Vladimir Chebotarev
64380109e9 dbms: Adjusting compiler paths. [#METR-21516] 2016-12-07 02:22:33 +03:00
Vladimir Chebotarev
8e1a6aaf3e cmake: Boost, OpenSSL into find_package(). [#METR-23701] 2016-12-06 16:20:32 +03:00
Alexey Milovidov
072f2fc7b8 Merges: start to lower maximum size of merge only when number of free entries in pool/queue is lower than specified threshold [#METR-21504]. 2016-12-06 06:09:07 +03:00
Alexey Milovidov
0717bfa4d2 Simplified LevelMergeSelector [#METR-21504]. 2016-12-06 00:34:46 +03:00
Vladimir Chebotarev
bcc5500f91 cmake: More options. [#METR-23701] 2016-12-05 15:43:14 +03:00
Alexey Milovidov
02eb36fd03 MergeSelector: attempt to make something better [#METR-21504]. 2016-12-05 09:31:48 +03:00
artpaul
f344c85cb7 #214 add tests 2016-12-03 04:29:16 +05:00
artpaul
2616453263 #214 fix offsets assigments 2016-12-03 02:18:29 +05:00
Alexey Milovidov
2def6778e7 Merge branch 'master' of github.com:yandex/ClickHouse 2016-12-02 23:27:42 +03:00
Alexey Milovidov
4110b6865f Merge branch 'METR-23305' of git://github.com/ludv1x/ClickHouse into ludv1x-METR-23305
Conflicts:
	contrib/CMakeLists.txt
2016-12-02 23:22:11 +03:00
alexey-milovidov
5e5acd850f Merge pull request #224 from artpaul/build
move impls to cpp
2016-12-03 00:06:20 +04:00
proller
4054d1a465 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-12-02 19:32:25 +03:00
artpaul
a2b4b85ed5 show type of argument in case of type missmatching 2016-12-02 13:59:23 +05:00
artpaul
7eb7cc38f7 move impls of FunctionsString to cpp 2016-12-02 12:32:39 +05:00
artpaul
41fda59c95 move impls of FunctionsArray to cpp 2016-12-02 12:15:35 +05:00
Alexey Milovidov
21f8501ccc Benchmark: update [#METR-2944]. 2016-12-02 06:39:11 +03:00
alexey-milovidov
9cea29e9a8 Merge pull request #213 from vavrusa/master
IO: Added ProfileEvents to Open/Read/Write failures
2016-12-01 22:28:36 +04:00
Marek Vavrusa
64f86b7d20 IO: Added ProfileEvents to Open/Read/Write failures 2016-11-30 12:21:57 -08:00
alexey-milovidov
21ce8a44f7 Merge pull request #216 from yandex/if_with_const_condition
ExpressionAnalyzer: make aliases and ast consistent after constant if optimization
2016-11-30 17:58:02 +04:00
Pavel Kartavyy
5dfbd57bad ExpressionAnalyzer: make aliases and ast consistent after constant if optimization 2016-11-30 16:19:39 +03:00
Vitaliy Lyudvichenko
4df22acea9 Try to fix LIBTCMALLOC linking. 2016-11-30 15:10:39 +03:00
proller
33cc46d225 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-30 00:42:05 +03:00
Vitaliy Lyudvichenko
202ba912ce Vertical merging algorithm for MergeTree engines. [#METR-23305] 2016-11-29 22:41:31 +03:00
alexey-milovidov
08cb8e506b Merge pull request #211 from yandex/if_with_const_condition
ExpressionAnalyzer: added more tests for aliases. fix bug [METR-23545]
2016-11-29 23:28:50 +04:00
Pavel Kartavyy
106bb24fd8 ExpressionAnalyzer: added more tests for aliases. fix bug [#METR-23545] 2016-11-29 22:19:15 +03:00
proller
30cd3176d9 Merge branch 'autotest-external-dictionaries' into move-autotest-external-dictionaries 2016-11-29 20:06:09 +03:00
proller
936efe55f1 move * -> dbms/tests/external_dictionaries 2016-11-29 20:03:54 +03:00
proller
b529f29bb7 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-29 19:57:01 +03:00
Vitaliy Lyudvichenko
1472629799 Updated pk_condition test after recent changes. 2016-11-28 20:59:39 +03:00
Alexey Milovidov
ae413e051b Fixed error [#METRIQA-526]. 2016-11-28 18:22:10 +03:00
Alexey Milovidov
0a2d1ebbb3 Attempt to improve merge selecting algorithm [#METR-23632]. 2016-11-28 06:46:08 +03:00
Alexey Milovidov
cac8f9216f MergeSelector: attempt to do something that has sense [#METR-23632]. 2016-11-28 06:17:31 +03:00
Alexey Milovidov
8bc84e29ac Increased default background_pool_size [#METR-23632]. 2016-11-28 02:50:46 +03:00
proller
5e6cac10e5 no copypaste 2016-11-27 16:01:35 +03:00
proller
4c90ffd61d Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-27 15:03:35 +03:00
Alexey Milovidov
6209092b15 Added heuristic for merge algorithm [#METR-23615]. 2016-11-26 07:08:49 +03:00
proller
2aeb488d96 add writePrefix 2016-11-25 23:37:06 +03:00
proller
556bd12de1 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-25 20:46:59 +03:00