thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 13:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,414 Commits 9,179 Branches 1,782 Tags 2.3 GiB
867b73b6b0
Commit Graph

8414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexey Milovidov
867b73b6b0 Fixed error with cancelling merges on ALTERs [#METR-22524]. 2016-08-26 22:50:04 +03:00
Alexey Milovidov
0c39e52094 Fixed error [#METR-22462]. 2016-08-26 21:06:24 +03:00
Alexey Milovidov
8dd6acac59 Added comment [#METR-22482]. 2016-08-26 20:57:19 +03:00
Alexey Milovidov
b85dc1bc0f convertCharset: development [#METR-22482]. 2016-08-26 05:24:17 +03:00
Alexey Milovidov
6e91f49d4c Addition to prev. revision [#METR-22482]. 2016-08-26 00:47:45 +03:00
Alexey Milovidov
d9db19acea Function 'convertCharset': development [#METR-22482]. 2016-08-26 00:44:47 +03:00
alexey-milovidov
2e199c7c35 Merge pull request #94 from yurial/yurial-add-vimrc 
add .vimrc
 2016-08-26 00:15:24 +04:00
Yuri Dyachenko
38564e138a add .vimrc 2016-08-25 23:13:40 +03:00
alexey-milovidov
cbabbb0bc4 Merge pull request #93 from yurial/yurial-fix-dictHas-METR-22522 
use 'std::vector<bool> loaded_ids' for FlatDictionary::has()
 2016-08-26 00:13:27 +04:00
Yuri Dyachenko
06032a6737 use 'std::vector<bool> loaded_ids' for FlatDictionary::has() 2016-08-25 23:09:58 +03:00
Vladimir Chebotarev
f544ad0bed Merge pull request #92 from VOkunev/master 
libcommon: Common get_revision function. [#METR-21516]
 2016-08-25 22:10:51 +04:00
Vasily Okunev
1cac1e7d69 Common get_revision function. 2016-08-25 20:55:25 +03:00
alexey-milovidov
81b06ad535 Merge pull request #91 from yandex/revert-90-master 
Revert "Common get_revision function."
 2016-08-25 21:26:37 +04:00
alexey-milovidov
25c39979b0 Revert "Common get_revision function." 2016-08-25 21:26:27 +04:00
alexey-milovidov
22b8a5279a Merge pull request #90 from VOkunev/master 
Common get_revision function.
 2016-08-25 21:24:41 +04:00
Alexey Milovidov
689f599e2a Fixed error, removed partially duplicate code [#METR-22462]. 2016-08-25 20:23:29 +03:00
Vasily Okunev
557a313275 Common get_revision function. 2016-08-25 20:13:50 +03:00
Alexey Milovidov
416a74575e Merge branch 'master' of github.com:yandex/ClickHouse 2016-08-25 18:50:17 +03:00
Alexey Milovidov
a3953de0b8 Removed useless files (preparation) [#METR-22462]. 2016-08-25 18:48:25 +03:00
alexey-milovidov
f7ceca4f20 Merge pull request #89 from yurial/yurial-cmake-fix 
more cmake fixes
 2016-08-25 19:15:09 +04:00
Yuri Dyachenko
9f952b04d5 disable coverage build flags by default 2016-08-25 18:13:50 +03:00
Yuri Dyachenko
e880bff5b7 set -fno-omit-frame-pointer by default 2016-08-25 18:13:42 +03:00
alexey-milovidov
7878fccda6 Merge pull request #88 from yurial/yurial-typo-fix 
typo fix
 2016-08-25 19:11:41 +04:00
Yuri Dyachenko
ae62be5a73 typo fix 2016-08-25 18:09:07 +03:00
alexey-milovidov
9864acbf32 Merge pull request #87 from yurial/yurial-more-debug 
enable debug symbols for CMAKE_BUILD_TYPE=Debug
 2016-08-25 19:01:44 +04:00
Yuri Dyachenko
c3697364fd enable debug symbols for CMAKE_BUILD_TYPE=Debug 2016-08-25 17:58:01 +03:00
alexey-milovidov
237cf8c331 Merge pull request #85 from yurial/yurial-cmake-cxx11abi 
Allow to disable cxx11abi
 2016-08-25 00:28:56 +04:00
Yuri Dyachenko
5a673dc857 Allow to disable cxx11abi 2016-08-24 23:18:32 +03:00
alexey-milovidov
944c6270b9 Merge pull request #83 from smi2/master 
Add CORS hearder,param:add_http_cors_header and check request header
 2016-08-24 23:50:55 +04:00
alexey-milovidov
0253315947 Merge pull request #84 from VOkunev/master 
Release tags changed to a new format.
 2016-08-24 22:12:49 +04:00
Vasily Okunev
44d096f809 Release tags changed to a new format. 2016-08-24 12:19:39 +03:00
igor
3bbbdb29f5 Add CORS hearder,param:add_http_cors_header and check request header 2016-08-23 21:35:23 +03:00
alexey-milovidov
9148209bc2 Merge pull request #80 from yandex/metrica-sync2 
Metrica sync2
 2016-08-23 18:18:19 +04:00
Pavel Kartavyy
ca430c3ec9 cmake: remove TSan due to false positives and necessity to rebuild libstdc++ 2016-08-23 17:08:47 +03:00
Pavel Kartavyy
6647ba628f ConcurrentBoundedQueue: move if nothrow assign possible. copy otherwise 2016-08-23 17:01:45 +03:00
Pavel Kartavyy
457109ac71 ColumnVector: renamed get() to getElement() 2016-08-23 15:58:49 +03:00
Pavel Kartavyy
38102a356c StrongTypedef: fixed bug with same type. Supported only moved types like unique_ptr 2016-08-23 13:41:08 +03:00
Alexey Milovidov
e0f3cbb432 Added optional 'default_database' parameter for Cluster (allow Distributed tables to connect to different databases on different shards/replicas) [#METR-22462]. 2016-08-22 23:34:21 +03:00
Pavel Kartavyy
ba9cf229cd dbms: remove unused headers 2016-08-22 18:07:02 +03:00
Pavel Kartavyy
8b6a8a133b dbms: fix build 2016-08-22 17:55:49 +03:00
Pavel Kartavyy
2032acd557 Merge commit 'e960efd5e63e4de51151724db92e6c2548aa88d9' 
Conflicts:
	metrica/src/ClickHouse/libs/libdaemon/include/daemon/GraphiteWriter.h
	metrica/src/ClickHouse/libs/libdaemon/src/GraphiteWriter.cpp
 2016-08-22 17:22:27 +03:00
Alexey Milovidov
22b57b060c Fixed error [#METR-22304]. 2016-08-20 23:10:47 +03:00
Alexey Milovidov
d76514fbe1 Added test [#METR-22329]. 2016-08-20 20:19:06 +03:00
Alexey Milovidov
902c70bfa9 Fixed error with duplicate columns in subqueries [#METR-22381]. 2016-08-20 20:10:00 +03:00
Alexey Milovidov
2c16a4ad2a Removed unused method [#METR-2944]. 2016-08-20 17:34:34 +03:00
Alexey Milovidov
453c5e1528 Fixed build [#METR-2807]. 2016-08-19 20:03:23 +03:00
Pavel Kartavyy
cd303f805a cmake: add cmake configuration types for build with sanitizers 2016-08-19 17:31:01 +03:00
Pavel Kartavyy
0ea472c426 cmake: add build types with sanitizers [#TESTIRT-9885] 2016-08-19 17:29:18 +03:00
Pavel Kartavyy
6e7bb0cd65 Merge branch 'master' into METR-19530 
Conflicts:
	metrica/src/CMakeLists.txt
	metrica/src/ClickHouse/libs/libdaemon/include/daemon/GraphiteWriter.h
	metrica/src/ClickHouse/libs/libdaemon/src/GraphiteWriter.cpp
	metrica/src/libs/CMakeLists.txt
	metrica/src/libs/liblogbroker-client/src/LogBroker.cpp
	metrica/src/libs/liblogbroker-log-import/include/logbroker-log-import/LogBrokerLogImportTask-inl.h
	metrica/src/libs/libstatdaemons/include/statdaemons/write_destinations/ClickHouseCluster.h
	metrica/src/programs/cleanerd/src/config.xml
	metrica/src/programs/deduplicatord/src/Task.cpp
	metrica/src/programs/visit-log-processor/src/VisitLogHandler.h
	metrica/src/tools/ssqls/templates/header.tpl
 2016-08-19 17:15:58 +03:00
Alexey Milovidov
e960efd5e6 Changed semantic of intDiv, intDivOrZero functions for floating point arguments [#METR-19446]. 2016-08-19 06:17:53 +03:00