Commit Graph

9121 Commits

Author SHA1 Message Date
Alexey Milovidov
4aeb017093 Renamed test [#METR-19266]. 2016-12-10 09:40:46 +03:00
alexey-milovidov
f60400f184 Merge pull request #70 from yandex/METR-19266
Metr 19266
2016-12-10 10:38:17 +04: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
9b00f41e52 Merge branch 'master' of github.com:yandex/ClickHouse 2016-12-10 02:35:34 +03:00
Alexey Milovidov
95b08c9b03 Miscellaneous [#METR-2944]. 2016-12-10 02:35:18 +03:00
alexey-milovidov
54b830ae82 Merge pull request #237 from btmc/master
signal handling in docker
2016-12-10 00:00:08 +04:00
Arthur Tokarchuk
6b5f15ec62 Changed entrypoint from sh to exec for clickhouse-server process to get SIGTERM and stop correctly. 2016-12-09 19:54:26 +03:00
Alexey Milovidov
ca7d0a4742 Get rid of useless part of library [#METR-20000]. 2016-12-08 22:20:51 +03:00
Vladimir Chebotarev
c1dd1467d6 libcommon: Build was fixed. [#METRIQA-600] 2016-12-08 16:22:59 +04:00
Vladimir Chebotarev
b72ecc383d libcommon: Support for invoking from /tmp. [#METRIQA-600] 2016-12-08 15:12:54 +04:00
Alexey Milovidov
050fc63694 More fine setting of CXX11_ABI [#METR-23646]. 2016-12-08 09:34:16 +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
684f2a9f34 Removed code with "evil" license [#METR-20000]. 2016-12-08 04:00:04 +03:00
Alexey Milovidov
9331ecd3bf Removed code with "evil" license [#METR-20000]. 2016-12-08 03:58:34 +03: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
alexey-milovidov
17913cd94d Merge pull request #231 from hatarist/reference_improvements
Reference improvements
2016-12-07 20:28:43 +04:00
Igor Hatarist
31430aaca1 Improved OS X build guides a little bit. 2016-12-07 11:21:53 +03:00
Igor Hatarist
fde640647a Added a link to the OS X build guide 2016-12-07 11:02:16 +03:00
Igor Hatarist
2158a958b7 Added descriptions for the misc. functions to the English reference 2016-12-07 10:48:21 +03:00
Igor Hatarist
2febdece59 Added descriptions for some misc. functions to the RU reference.
Fixed heading layout for the greatest/least.
2016-12-07 10:24:07 +03:00
Igor Hatarist
212c980124 Added max_parallel_replicas option description 2016-12-07 10:22:13 +03:00
Igor Hatarist
65fd9bdbd9 Fix typos in Russian reference 2016-12-07 10:21:50 +03:00
Vladimir Chebotarev
64380109e9 dbms: Adjusting compiler paths. [#METR-21516] 2016-12-07 02:22:33 +03:00
Vladimir Chebotarev
93c805c7f5 libcommon: Extract revision from source directory. [#METR-21516] 2016-12-07 01:53:32 +03:00
Vladimir Chebotarev
017a32c3ad cmake: Prefer /usr/local when finding boost. [#METR-21516] 2016-12-07 01:26:11 +03:00
Vladimir Chebotarev
a86e56cd1f cmake: Special treating of rt in some cases. [#METR-21516] 2016-12-07 00:01:19 +03:00
Vladimir Chebotarev
1d5607ca4a cmake: Build was fixed. [#METR-21516] 2016-12-06 22:40:20 +03:00
alexey-milovidov
b64e6b7b69 Merge pull request #229 from luc1ph3r/codestyle-fix
Update rules about comments language
2016-12-06 22:50:53 +04:00
ivanzhukov
496e06c350 Update rules about comments language 2016-12-06 21:47:36 +03:00
Vladimir Chebotarev
eb552f2943 cmake: Improved copy_headers.sh script, minor fixes. [#METR-21516] 2016-12-06 21:04:10 +03:00
Vladimir Chebotarev
ca5c1dc31b cmake: Improved build. [#METR-21516] 2016-12-06 19:51:34 +03:00
Vladimir Chebotarev
cdd08c21ec cmake: add_check to cmake/. [#METR-21516] 2016-12-06 16:46:21 +03:00