thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-02 12:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,171 Commits 9,194 Branches 1,782 Tags 2.2 GiB
fb900881da
Commit Graph

4198 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
e2ed20999c Fixed build on clang [#METR-2944]. 2016-12-12 08:53:37 +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
d605bfdc9d Using internal boost library [#METR-2944]. 2016-12-12 07:57:09 +03:00
Alexey Milovidov
fc43827a6c Preparation [#METR-2944]. 2016-12-12 06:33:34 +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
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
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
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
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
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
proller
76dc51aae5 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-12-07 22:08:09 +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
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
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
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
b529f29bb7 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-29 19:57:01 +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
556bd12de1 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-25 20:46:59 +03:00