Commit Graph

6562 Commits

Author SHA1 Message Date
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
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
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