Commit Graph

329 Commits

Author SHA1 Message Date
Azat Khuzhin
32227b9c38 AMQP requires libuv
Otherwise fails:

    FAILED: src/CMakeFiles/dbms.dir/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp.o
    ...
    In file included from ../src/Storages/RabbitMQ/RabbitMQHandler.h:9,
                     from ../src/Storages/RabbitMQ/StorageRabbitMQ.h:11,
                     from ../src/Storages/RabbitMQ/RabbitMQBlockInputStream.h:5,
                     from ../src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp:3:
    ../contrib/AMQP-CPP/include/amqpcpp/libuv.h:22:10: fatal error: uv.h: No such file or directory
2020-07-07 21:44:24 +03:00
Azat Khuzhin
0a3c1ef450 Set CMP0077 for re2
cmake reports:

    CMake Warning (dev) at contrib/re2/CMakeLists.txt:15 (option):
      Policy CMP0077 is not set: option() honors normal variables.  Run "cmake
      --help-policy CMP0077" for policy details.  Use the cmake_policy command to
      set the policy and suppress this warning.

      For compatibility with older versions of CMake, option is clearing the
      normal variable 'BUILD_SHARED_LIBS'.
    This warning is for project developers.  Use -Wno-dev to suppress it.
2020-07-06 23:34:40 +03:00
Azat Khuzhin
3b75856fca Force CMP0022 for googletest (to avoid using LINK_INTERFACE_LIBRARIES(_<CONFIG>)?)
Othewise cmake reports:

    -- Configuring done
    CMake Warning (dev) in contrib/googletest/googletest/CMakeLists.txt:
      Policy CMP0022 is not set: INTERFACE_LINK_LIBRARIES defines the link
      interface.  Run "cmake --help-policy CMP0022" for policy details.  Use the
      cmake_policy command to set the policy and suppress this warning.

      Target "gtest" has an INTERFACE_LINK_LIBRARIES property which differs from
      its LINK_INTERFACE_LIBRARIES_DEBUG properties.

      INTERFACE_LINK_LIBRARIES:

        global-group;Threads::Threads

      LINK_INTERFACE_LIBRARIES_DEBUG:

        Threads::Threads

    This warning is for project developers.  Use -Wno-dev to suppress it.

    -- Generating done
    -- Build files have been written to: /src/ch/clickhouse/.cmake-tmp
2020-07-06 23:34:40 +03:00
Azat Khuzhin
a0f257b237 Set GOOGLETEST_VERSION for googletest
Otherwise cmake reports:

    CMake Warning at contrib/googletest/googletest/CMakeLists.txt:54 (project):
      VERSION keyword not followed by a value or was followed by a value that
      expanded to nothing.

(since GOOGLETEST_VERSION is set in contrib/googletest/CMakeLists.txt)
2020-07-06 23:34:40 +03:00
alexey-milovidov
1719ab1ec5
Merge pull request #12041 from azat/curl-proper-cmake
Rewrite curl dependency in a more ch compatible way
2020-07-06 06:31:51 +03:00
Azat Khuzhin
0700a705bc Rewrite curl dependency in a more ch compatible way
- add support of unbundled curl
- add CURL::libcurl libraries
- avoid explicit linkage of daemon with curl (added with sentry)
- set CACHE variables for non-direct users:
  - mariadb-connector-c
  - aws-s3-cmake
  - sentry-native

Cc: @alexey-milovidov
Cc: @alesapin (requires docker image update)
Cc: @abyss7

Refs: #11300
Refs: #8011
Refs: #8905

v2: replace cmake/find/curl.cmake with proper contrib/curl-cmake (as
pointed by @abyss7, cmake/find/*.cmake is deprecated)
2020-07-03 00:57:08 +03:00
alesapin
64583ceb22 Merge branch 'master' into add-storage-rabbitmq-read-only 2020-07-02 16:08:29 +03:00
kssenii
3d2cc9d4b2 Remove libevent library 2020-06-29 12:11:17 +00:00
kssenii
18820814f5 Merge 2020-06-10 23:25:33 +00:00
Denis Glazachev
9e3a28a6b8 Merge branch 'master' into ldap-per-user-authentication
* master: (414 commits)
  Update file.md
  Update merge.md
  Update dictionary.md
  Update external-data.md
  Update distributed.md
  Update null.md
  Update set.md
  Update join.md
  Update url.md
  Update view.md
  Update materializedview.md
  Update memory.md
  Update buffer.md
  Update generate.md
  removed a sentence about global lock during rename (#11577)
  greatCircleAngle en translation (#11584)
  Update configuration-files.md
  try fix flacky test
  Update why.html
  Update rich.html
  ...

# Conflicts:
#	src/Common/ErrorCodes.cpp
#	utils/ci/jobs/quick-build/run.sh
2020-06-11 03:06:17 +04:00
Ivan Blinkov
90ee4d52f4 merge master 2020-06-10 13:18:41 +03:00
Alexander Tokmakov
6bb68329f8 Merge branch 'master' into merging_external_source_cassandra 2020-06-09 19:51:14 +03:00
Ivan Blinkov
6f7064928f Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-09 19:07:57 +03:00
Ivan
47ad338cb2
Refactor CMake build files (#11390)
* Get rid of lib_name.cmake
* Refactor Boost and HyperScan libraries
* Refactor lz4
* Fix build with xxHash
2020-06-09 13:54:49 +03:00
Ivan Blinkov
6f0e754f1e try to fix the glibc compatibility 2020-06-04 11:57:01 +03:00
Alexander Tokmakov
e67837bc4a cleenup 2020-06-04 00:11:17 +03:00
Ivan Blinkov
9c1ac2f1c1 experiment 2020-06-02 09:46:36 +03:00
Ivan Blinkov
95ee742ee7 merge master 2020-05-29 22:56:10 +03:00
Denis Glazachev
d9ca9cd9b2 Compilation fix
Typo fix
2020-05-29 14:00:12 +04:00
Ivan Blinkov
709b4f42c8 Prototype sending crash reports on segfaults 2020-05-27 22:11:04 +03:00
Alexander Tokmakov
940132adc4 Merge branch 'master' into merging_external_source_cassandra 2020-05-27 00:13:57 +03:00
kssenii
ad1c0de8db Merge 2020-05-26 17:45:39 +00:00
Vitaly Baranov
58a2172154 Improve build scripts related to protobuf and gRPC. 2020-05-25 18:46:57 +03:00
Alexey Milovidov
35d79e1252 fmt-style logging, part 1 2020-05-23 19:33:07 +03:00
Alexander Tokmakov
ac54d470da Merge branch 'master' into merging_external_source_cassandra 2020-05-22 17:27:40 +03:00
Alexander Tokmakov
e6ca09e134 fix build 2020-05-22 17:19:33 +03:00
Alexey Milovidov
14b61cfa9e Fix JEMalloc conf after #11084 2020-05-22 16:08:08 +03:00
Azat Khuzhin
111fa49df5 Add comment for enabling jemalloc percpu_arena 2020-05-21 11:43:29 +03:00
Azat Khuzhin
5da41d5cd6 Configure jemalloc options via cmake 2020-05-21 11:43:29 +03:00
Alexander Tokmakov
4b30b3168c try fix build 2020-05-20 23:26:39 +03:00
kssenii
a055e33087 Add libevent & AMQP-CPP libraries 2020-05-20 09:08:27 +03:00
Alexander Tokmakov
175b7aedf3 Merge branch 'master' into merging_external_source_cassandra 2020-05-19 05:21:27 +03:00
Denis Glazachev
36cb24377b Merge branch 'master' into contrib-openldap
* master: (204 commits)
  DOCS-289: randConstant (#10838)
  Update performance_comparison.md
  fix docs build
  Adjust ld+json images, remove feather icons (#10843)
  [docs] faster local/debug build (#10840)
  CLICKHOUSE-4862: some markdown fixes @ ru mergetree.md (#10835)
  CLICKHOUSE-4862: fix link (#10836)
  Some fixes at ru merge-tree-settings.md (#10837)
  Fix MSan failure in cache dictionary
  Fix double whitespace
  Additional assert in ColumnVector
  Fix paths in compiler error messages #10434
  Fix "Arcadia" build
  Fix style check in Block::sortColumns() (sigh)
  Sort iterators to avoid extra std::string creation in Block::sortColumns()
  Optimize Block::sortColumns()
  Better DNS exception message
  Fix logical error in convertFieldToType
  Make order of columns strict in Block::sortColumns()
  Add a test for INSERT into Buffer() with different order of columns (via MV)
  ...
2020-05-13 00:29:09 +04:00
Denis Glazachev
acd8cfc5d2 Added contrib/openldap submodule
Added OpenLDAP find/detection cmake scripts
Added integration for OpenLDAP Linux and Darwin x86_64 platforms (following OpenSSL integration approach)
2020-05-12 23:19:15 +04:00
Ivan
85d783c247
Poco contrib refactoring (#10396)
* Remove config_common.h
* Refactor libcpuid contrib
* Remove support for libcpuinfo
* Define USE_CPUID in Arcadia
* Refactor Poco libraries
2020-05-08 17:11:19 +03:00
alexey-milovidov
aeb5487261
Merge branch 'master' into xcode-build-fix 2020-05-03 05:03:49 +03:00
Alexey Milovidov
81adcc9058 Remove obsolete records from system.build_options 2020-05-02 17:00:03 +03:00
Denis Glazachev
66adf60e1b Proper handling of CMAKE_BUILD_TYPE vs CMAKE_BUILD_TYPE_UC 2020-04-30 18:41:22 +04:00
Denis Glazachev
f5600bb8ab Add comments for USE_FOLDERS and CMAKE_FOLDER 2020-04-27 22:34:36 +04:00
Denis Glazachev
22a00bd5a3 Enable organazing targets into folders for GUI-based IDEs
Put all targets of contrib/ into contib/ folder in GUI IDE
2020-04-27 21:50:26 +04:00
Ivan Lezhankin
871d3f2aa0 Move contrib/widecharwidth → base/widechar_width 2020-04-13 18:55:48 +03:00
Ivan Lezhankin
362aca365f Merge branch 'master' into jemalloc 2020-03-21 22:50:48 +03:00
Ivan
571d0d541c
Improve CCTZ contrib (#9687)
* common/Types.h → common/types.h
  Also split Core/Defines.h and merge with common/likely.h
* Improve cctz contrib
* Fix ALWAYS_INLINE and unbundled build
* Update Dockerfile from master
* Fix test for unbundled library
2020-03-19 13:38:34 +03:00
Ivan Lezhankin
528e42bc4c Improve jemalloc contrib 2020-03-18 15:29:51 +03:00
Artem Zuikov
d7d9078183 fix build with dynamic libs 2020-03-13 20:19:28 +03:00
Ivan
b7ef5a699c
Move FastMemcpy to contribs (#9219)
* Get rid of non-existent vectorclass
* Move FastMemcpy to contribs
* Restore comments
* Disable FastMemcpy on non-Linux
* Fix cmake file
* Don't build FastMemcpy for ARM64
* Replace FastMemcpy submodule with its contents
* Fix cmake file
* Move widechar_width to contrib/
* Move sumbur to contrib/
* Move consistent-hashing to contrib/
* Fix UBSan tests
2020-03-13 01:26:16 +03:00
proller
6b2d6e9392
Build fixes (#9381)
* Revert "Revert "Build fixes""

This reverts commit 355ff00c2e.

* zlib link fix
2020-02-28 03:07:42 +03:00
Alexey Milovidov
ce073e0752 Fixed strange code 2020-02-22 23:05:33 +03:00
alexey-milovidov
355ff00c2e
Revert "Build fixes" 2020-02-16 11:48:01 +03:00
alexey-milovidov
ace75296df
Merge pull request #8435 from levysh/add-grpc-contrib
Add grpc contrib
2020-02-16 09:27:34 +03:00
proller
487d1ff491 Fix system zlib headers usage 2020-02-07 00:31:53 +03:00
proller
bce3ec2a29 Revert "Revert "Build fixes""
This reverts commit 9e0b40bf09.
2020-02-03 19:46:17 +03:00
alexey-milovidov
9e0b40bf09
Revert "Build fixes" 2020-02-02 23:21:49 +03:00
levysh
9928b0bbb2
Merge branch 'master' into add-grpc-contrib 2020-02-02 14:47:16 +03:00
proller
cd0e9217da Merge remote-tracking branch 'upstream/master' into fix27 2020-01-30 18:11:22 +03:00
Ivan
ec5c513faa
Implement separate CMake build file for curl library (#8905) 2020-01-30 12:51:04 +03:00
proller
936c357e05 Merge remote-tracking branch 'upstream/master' into fix27 2020-01-27 17:54:43 +03:00
Alexey Milovidov
680da3d7ed Merge remote-tracking branch 'origin/master' into oandrew-avro 2020-01-23 22:08:08 +03:00
Ivan
b80e3dcd46
Refactoring of replxx (#8748) 2020-01-23 11:18:19 +03:00
proller
4ba97e97e1 zlib fixes 2020-01-21 01:15:56 +03:00
alexey-milovidov
901009d9b0
Merge branch 'master' into oandrew-avro 2020-01-19 03:37:29 +03:00
Alexey Milovidov
4dd7bb7c50 Fixed configuration of replxx 2020-01-19 03:18:25 +03:00
Alexey Milovidov
76e04b9843 Merge branch 'avro' of https://github.com/oandrew/ClickHouse into oandrew-avro 2020-01-18 21:23:55 +03:00
Andrew Onyshchuk
e96b3059c0 Refactor Avro CMake 2020-01-10 00:03:32 -06:00
levysh
0b0fff8dc4
Merge branch 'master' into add-grpc-contrib 2020-01-09 20:11:23 +03:00
Ivan Lezhankin
5950f6c081 Merge remote-tracking branch 'upstream/master' into replxx 2020-01-09 19:21:04 +03:00
Andrew Onyshchuk
7320447f92 Add Avro formats
Add Avro file input/output formats
Add AvroConfluent input format (for Kafka)
2020-01-08 03:18:00 -06:00
Alexey Milovidov
2d47572603 Using "ryu" library to format floats 2020-01-06 06:22:11 +03:00
alexey-milovidov
14563da602
Merge pull request #8447 from amosbird/c++20
C++20
2019-12-31 21:06:41 +03:00
Alexey Milovidov
ea0df54c0f Remove -fPIC from some libraries 2019-12-29 23:06:44 +03:00
Amos Bird
bbc736f2d9
c++20! 2019-12-29 03:08:25 +08:00
Aleksei Levushkin
145f0702e5 added grpc as submodule 2019-12-27 16:33:08 +03:00
Ivan Lezhankin
61c73d04f0 Improve CMakeLists.txt 2019-12-27 16:17:36 +03:00
Ivan Lezhankin
66517796ee Import replxx into contrib 2019-12-27 16:17:36 +03:00
Maxim Ulanovskiy
dbaf470541 disabled building of unused arrow ipc cmd utils 2019-12-25 11:37:21 +03:00
Alexey Milovidov
fe604cf3e7 Remove support for tcmalloc 2019-12-20 02:59:55 +03:00
alexey-milovidov
e83eeef731
Merge pull request #8258 from ClickHouse/update-llvm-bisect
Update LLVM in contrib
2019-12-19 22:22:32 +03:00
Alexey Milovidov
814690e26f Fixed selection of targets 2019-12-19 19:49:32 +03:00
Alexey Milovidov
042f39fe1f Fixed build 2019-12-19 02:30:10 +03:00
Alexey Milovidov
5cc6f9029e Removed garbage 2019-12-18 22:50:49 +03:00
Alexey Milovidov
a625df8d46 Removed unused directives from CMakeLists 2019-12-18 19:16:11 +03:00
Alexey Milovidov
0576a58525 Fixed build 2019-12-18 19:11:56 +03:00
Alexey Milovidov
07df03a5e0 Removed garbage 2019-12-18 18:04:43 +03:00
Alexey Milovidov
d279009403 Lower debug info size 2019-12-18 17:46:15 +03:00
Alexey Milovidov
47d9209ebb Merge branch 'master' into libressl-to-openssl 2019-12-15 08:19:56 +03:00
Alexey Milovidov
09a0223f81 Preparation to build ICU from sources 2019-12-15 06:00:53 +03:00
Alexey Milovidov
974d6f3bb0 Replaced libressl with openssl 2019-12-14 05:28:12 +03:00
alexey-milovidov
51ed10ed78
Merge pull request #8011 from Jokser/aws-s3-sdk-integration
AWS SDK S3 integration
2019-12-12 20:43:16 +03:00
Pavel Kovalenko
509068c513 AWS SDK integration - curl makefile cleanup. 2019-12-10 16:23:49 +03:00
Pavel Kovalenko
28d4e7db65 AWS SDK integration - build curl manually. 2019-12-10 15:30:39 +03:00
Alexander Kuzmenkov
fc70b03891 Build zlib-ng static lib 2019-12-10 13:15:18 +03:00
Pavel Kovalenko
a9e2327ec0 AWS S3 SDK integration. 2019-12-03 19:23:24 +03:00
Azat Khuzhin
fe98e90d0d Avoid conflicts of static zlib and mariadb-connector-c zlib
After crc32() had been replaced with crc32_z() the following error will
happen with two different zlib:
  2019-10-25 09:48:42 /usr/bin/ld.gold: error: contrib/zlib-ng/libz.a(crc32.c.o): multiple definition of 'get_crc_table'
  2019-10-25 09:48:42 /usr/bin/ld.gold: contrib/mariadb-connector-c/libmariadb/libmariadbclient.a(crc32.c.o): previous definition here

Fix this by using zlibstatic compiled for and by CH in
mariadb-connector-c, and wrap into function reduce variable scopes.
2019-10-25 23:32:33 +03:00
Yuriy
c6b18c9fe8 disabled auth_gssapi_client plugin 2019-09-28 03:27:53 +03:00
Yuriy
403b156114 fixed build without glibc-compatibility 2019-09-25 01:30:26 +03:00
Yuriy
dfb762d93c Revert "Revert "Updated MariaDB""
This reverts commit f8b7cc8693.
2019-09-25 01:28:59 +03:00
Yuriy Baranov
f8b7cc8693
Revert "Updated MariaDB" 2019-09-24 05:11:52 +03:00
alexey-milovidov
2f195ddb03
Merge pull request #7028 from abyss7/issue-6459
Implement cross-compilation support Linux → Darwin
2019-09-24 02:20:17 +03:00
Ivan Lezhankin
ce2fb6d3d1 Fix build 2019-09-23 17:46:01 +03:00
alexey-milovidov
f3ba89ccef
Empty commit to trigger CI 2019-09-23 01:48:21 +03:00