Commit Graph

152 Commits

Author SHA1 Message Date
Alexey Milovidov
30aae40300 Removed usage of iconv [#CLICKHOUSE-2879]. 2017-03-11 07:39:16 +03:00
proller
067ff7a5c7 Customizable internal compiler 2017-03-02 16:34:43 +03:00
proller
0e91c47066 Allow build with external double-conversion lz4 zstd re2 zookeeper (#531)
* Allow build with external double-conversion lz4 zstd re2 zookeeper

* fix

* fix

* freebsd fixes

* spaces

* fix

* fix

* fix

* wip

* move

* fix
2017-03-01 03:49:04 +04:00
proller
57c336f267 HTTPDictionarySource support HTTPS (#510)
* https support in dictionaries

* Style
2017-02-28 01:07:57 +04:00
proller
b5b64ceb2b Fix apple .so version (#490)
* Cmake: fix fallback to internal libs if no external found

* wip

* style

* fix

* Fix apple .so version
2017-02-14 16:34:32 +04:00
proller
f8d2f19280 Fix odbc include, clang-format fixes, misc (#484)
* Cmake: fix fallback to internal libs if no external found

* wip

* style

* fix
2017-02-13 17:59:34 +04:00
alexey-milovidov
cee5ab01fb Merge branch 'master' into merge_with_metrika 2017-02-11 00:27:15 +04:00
proller
9bbe8fe5c4 Dynamic library mode (#471)
* Cmake: UNBUNDLED option

* Dynamic library mode
2017-02-08 22:53:00 +04:00
proller
f87ae6808f cmake: USE_INTERNAL_ZLIB_LIBRARY (#463)
* Correct fix of building with external poco with disabled sending progress

    Revert "Removed wrong code [#CLICKHOUSE-2]."

    This reverts commit 33f9917f53.

* fix

* fix

* cmake: USE_INTERNAL_ZLIB_LIBRARY
2017-02-08 01:28:13 +04:00
Pavel Kartavyy
224ba16dcb use project source and binary dirs instead of global dirs 2017-02-06 18:15:19 +03:00
proller
9cea606881 Fix linking iconv under macos and freebsd
Partially Revert "Removed usage of glib [#CLICKHOUSE-2]."
This reverts commit e4ff740ef1.
2017-01-31 04:15:59 +03:00
proller
2688f4563f cmake: remove add_definitions(-DNO_TCMALLOC), instead use ENABLE_LIBTCMALLOC from config (#375)
* Manual version update to [54135]

* Temporary release script fix [#METRIQA-732]

* cmake: remove add_definitions(-DNO_TCMALLOC), instead use ENABLE_LIBTCMALLOC from config
2017-01-20 21:58:07 +04:00
proller
04d2149e8a enable -Werror only for 'libs' and 'dbms' ; add 'cmake .. -DNO_WERROR… (#372)
* enable -Werror only for 'libs' and 'dbms' ; add 'cmake .. -DNO_WERROR=1'  option

* add -Werror for utils
2017-01-19 23:30:58 +04:00
proller
cafc2fbbb1 Fix ENABLE_LIBTCMALLOC=0 build (#359)
Again fix ENABLE_LIBTCMALLOC=0 build
2017-01-18 18:09:10 +03:00
proller
7e21f1dd14 Fix build with -D NO_TCMALLOC, better sanitizers calls (#355)
* Fix generate includes for clang

* Fix build with -D NO_TCMALLOC, better sanitizers calls
2017-01-18 16:41:47 +04:00
proller
29475c94c0 Reorganize includes, less depends in .h files 2017-01-16 22:47:11 +03:00
proller
ee3882f251 Allow link with external libs: poco, tcmalloc 2017-01-13 14:25:44 +03:00
proller
d00765fb15 Find pthread lib by cmake 2017-01-11 16:40:02 +03:00
Alexey Zatelepin
1b61f2a9d3 use zlib-ng from contrib everywhere [#METR-23582] 2017-01-08 22:24:38 +03:00
Alexey Milovidov
a4d9d766b6 Reworking ExpressionAnalyzer (preparations) [#METR-20307]. 2017-01-04 09:52:02 +03:00
proller
4bc003c4c1 Porting to freebsd: initial, compile ok, most tests ok. 2016-12-24 01:03:10 +00:00
Vladimir Chebotarev
cc7db759fe create_init_script: Avoid generation of init file each configuration phase. [#METR-21516] 2016-12-13 14:09:22 +03:00
Vitaliy Lyudvichenko
876ad28dd8 Merge remote-tracking branch 'origin/master' into metrics_refinement 2016-12-12 19:17:23 +03:00
Alexey Milovidov
54af522de1 Preparation [#METR-2944]. 2016-12-12 10:24:56 +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
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
Alexey Milovidov
599308aef0 Get rid of obsolete mongodb client library [#METR-23791]. 2016-12-11 12:43:16 +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
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
2dc425b7e6 Preparation [#METR-23747]. 2016-12-08 06:04:30 +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
proller
76dc51aae5 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-12-07 22:08:09 +03:00
Vladimir Chebotarev
8e1a6aaf3e cmake: Boost, OpenSSL into find_package(). [#METR-23701] 2016-12-06 16:20:32 +03:00
Vladimir Chebotarev
bcc5500f91 cmake: More options. [#METR-23701] 2016-12-05 15:43:14 +03:00
Vitaliy Lyudvichenko
4df22acea9 Try to fix LIBTCMALLOC linking. 2016-11-30 15:10:39 +03:00
Vitaliy Lyudvichenko
202ba912ce Vertical merging algorithm for MergeTree engines. [#METR-23305] 2016-11-29 22:41:31 +03:00
proller
b529f29bb7 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-29 19:57:01 +03:00
Alexey Milovidov
ae413e051b Fixed error [#METRIQA-526]. 2016-11-28 18:22:10 +03:00
proller
3b335b5546 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-24 22:58:40 +03:00
alexey-milovidov
8c2e228856 Revert "New "vertical" algorithm for MergeTrees' parts merges" 2016-11-24 23:08:54 +04:00
proller
e855c16f4a Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-24 21:25:56 +03:00
Vitaliy Lyudvichenko
ec9bcd8054 Vertical merging algorithm for ordinary MergeTreee. 2016-11-23 15:47:19 +03:00
proller
0b40a13ea7 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-11-22 14:56:57 +03:00
Alexey Milovidov
9018906e1a Better [#METR-2944]. 2016-11-20 15:43:20 +03:00
proller
fd3a9da076 httd dict wip 2016-11-19 03:07:58 +03:00
proller
cc0e0e739e ExecutableDictionarySource ok 2016-11-17 04:09:46 +03:00