Commit Graph

1372 Commits

Author SHA1 Message Date
Konstantin Podshumok
8479da3033
cmake: unbundled protobuf: don't expect old c++ API by default
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:43 +03:00
Konstantin Podshumok
5d13c1f03f
cmake: unbundled: libxml2 requires liblzma when building static
Squashed:
- fixup hdfs3-libxml2

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:43 +03:00
Konstantin Podshumok
cc6a59d59b
cmake: disable internal ORC when using external Parquet
Squashed:
- fix internal poco linking with `zlib`

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:42 +03:00
Konstantin Podshumok
9af119ea35
cmake: USE_INTERNAL_REPLXX_LIBRARY is ON by default now
As we don't now any system that ships it as a package

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:41 +03:00
Konstantin Podshumok
18fd3e7357
cmake: ARM: make sure cpuid is not enabled by default
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:39 +03:00
Konstantin Podshumok
0ad4b5dea6
cmake: disable jemalloc on alternative arches and with sanitizers
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:39 +03:00
Konstantin Podshumok
3ec7a4bc53
cmake: make sure ENABLE_GRPC is off by default when PROTOBUF is OFF by default
Squashed:
- cmake: make sure protobuf compiler and snappy are there for unbundled build
- cmake: Turn ON internal GRPC library by default until relevant features will be implemented
- cmake: allow unbundled grpc

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:39 +03:00
Konstantin Podshumok
1913522233
cmake: always use internal poco library as it went too far from upstream
Squashed:
- cmake: move USE_INTERNAL_POCO_LIBRARY option to separate file
- point contrib/poco to "add <atomic> to TCPServerDispatcher"

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:38 +03:00
Konstantin Podshumok
87a2ae1820
cmake: contrib/curl-cmake: use FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:38 +03:00
Konstantin Podshumok
d456aa86ef
Revert "Revert "cmake: Add option to fail configuration instead of auto-reconfiguration""
This reverts commit 89419ceb9b
(curl part moved to separate commit)

Squashed:
- termcap removed
- fix for cassandra on apple merged
- cmake: fix "Can't find system zlib library" in unbundled build
- cmake: fix condition when testing for rdkafka platform
- cmake: PROTOBUF_OLD_ABI_COMPAT shouldn't be enabled for internal protobuf

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:37 +03:00
bharatnc
2ef2d0976b spacing, new line at end in .sql and .reference files 2020-08-24 23:30:58 +03:00
bharatnc
d85dba2209 fix more spacing 2020-08-24 23:30:58 +03:00
bharatnc
7a07f13d1a fix vertical spacing 2020-08-24 23:30:58 +03:00
Alexey Milovidov
b504b9a917 Fix conflict + minor modification. 2020-08-24 23:29:56 +03:00
alexey-milovidov
7ea5364299
Merge pull request #13648 from filimonov/tzdata_version2
tzdata improvements
2020-08-24 23:07:37 +03:00
alexey-milovidov
fb0e68f808
Merge pull request #12771 from arenadata/ADQM-109
krb5 + cyrus-sasl + kerberized kafka
2020-08-20 20:13:01 +03:00
Mikhail Filimonov
4eff1a75de one more attempt
objcopy creates symbols from source filenames (can't be ajusted), so just make temp files with needed names
2020-08-14 01:10:21 +02:00
Mikhail Filimonov
fe55ef6b2c Trying to fix TZ with plus sign inside 2020-08-13 23:28:56 +02:00
alexey-milovidov
89419ceb9b
Revert "cmake: Add option to fail configuration instead of auto-reconfiguration" 2020-08-13 23:10:06 +03:00
Mikhail Filimonov
a0ae1b2b42 tzdata improvements
Expose version of embedded tzdata via TZDATA_VERSION in system.build_options.
Autogenerate list of shipped timezones. Script to check tzdb updates.
2020-08-12 14:21:40 +02:00
Vladimir Chebotarev
11c85065ef
Update CMakeLists.txt 2020-08-12 02:05:20 +03:00
Vladimir Chebotarev
fb527e8677
Update CMakeLists.txt 2020-08-12 02:03:53 +03:00
Vladimir Chebotarev
2bcc850533
Update CMakeLists.txt 2020-08-12 02:00:21 +03:00
alexey-milovidov
6afbcfe914
Merge pull request #13528 from ClickHouse/clickhouse-install
Simple clickhouse install script
2020-08-11 18:08:22 +03:00
Alexey Milovidov
c7a6a18a75 Preparation to enable clickhouse install on Mac and FreeBSD 2020-08-10 02:58:09 +03:00
Konstantin Podshumok
262080132b cmake: disabling silent reconfigurations in contrib/*/CMakeLists.txt
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-09 21:37:46 +03:00
Alexey Milovidov
8d616444e4 Support for AArch64 2020-08-09 02:54:38 +03:00
Alexey Milovidov
0f79eb3cc5 Embed configs into binary 2020-08-08 06:42:42 +03:00
Alexey Milovidov
070b43fa35 Update submodule 2020-08-06 04:06:48 +03:00
Alexey Milovidov
4abf9cb6b9 Remove useless submodules from GRPC 2020-08-05 19:44:24 +03:00
Alexey Milovidov
88e772bec3 Update submodules 2020-08-05 17:53:20 +03:00
Alexey Milovidov
4348d6746c Remove submodules 2020-08-05 17:32:23 +03:00
Alexey Milovidov
bf7ae9ef4e Remove recursive submodules from Sentry 2020-08-05 13:48:34 +03:00
Alexey Milovidov
7f18ff16aa Simplify CMake for libunwind (suggestion from @azat) 2020-08-02 17:05:33 +03:00
Alexey Milovidov
14174ba38f Fix warning in libunwind 2020-08-02 06:11:40 +03:00
Alexey Milovidov
f633c59737 Fix warning in libunwind 2020-08-02 06:09:10 +03:00
alexey-milovidov
120092e486
Merge pull request #13208 from ClickHouse/libunwind-register
Allow "register" variables in libunwind
2020-08-02 01:45:06 +03:00
alexey-milovidov
566044f9c8
Merge pull request #12991 from ClickHouse/kafka-fix-msan
Fix MSan error in "rdkafka" library #12990
2020-08-02 00:22:44 +03:00
alexey-milovidov
664b2c10c8
Update CMakeLists.txt 2020-08-01 18:56:50 +03:00
Alexey Milovidov
344d898df3 Allow "register" variables in libunwind 2020-08-01 18:10:47 +03:00
Ilya Golshtein
ff92812ac5 openssl to link with krb5 2020-07-31 13:49:08 +03:00
Ilya Golshtein
09bf3dc0d8 remove odd krb5 files from build 2020-07-31 13:49:08 +03:00
Ilya Golshtein
1a6307c848 headers hell fight 2020-07-31 13:49:08 +03:00
Ilya Golshtein
d7d7283494 generate forgotten headers 2020-07-31 13:49:08 +03:00
Ilya Golshtein
de7544d944 cyrus-sasl depends on krb5 2020-07-31 13:49:08 +03:00
Ilya Golshtein
65eb845ce5 find_program for awk 2020-07-31 13:49:08 +03:00
Ilya Golshtein
8cd51af951 Built against submodules 2020-07-31 13:49:08 +03:00
Ilya Golshtein
017a433403 some cleanup, disabling sasl really works 2020-07-31 13:49:08 +03:00
Ilya Golshtein
439eb38bde config.h and autoconf.h moved to cmake dirs 2020-07-31 13:49:07 +03:00
Ilya Golshtein
d93f0c7548 initial - kerberized kafka works 2020-07-31 13:49:07 +03:00
Azat Khuzhin
3d3c25b52d Switch cppkafka to upstream and bump to upstream/master
All changes in ClickHouse-Extra has been merged into upstream no need in
using the fork.

There are not a lot of changes for now, and cppkafka does not looks like
in the active development stage, but just in case better to sync with
upstream.

FWIW cppkafka usage is pretty minimal and it's usage is questionable,
since librdkafka is under active development while cppkafka is not, and
later still does not support some features that is used in clickhouse:
- interceptors (for logging proxying)
2020-07-31 00:41:44 +03:00
Alexey Milovidov
bbf9fd3c17 Merge branch 'master' into kafka-fix-msan 2020-07-30 22:13:41 +03:00
alesapin
d52f67d24e Fix abtesting build 2020-07-29 14:00:04 +03:00
Alexey Milovidov
ab913c78f4 Fix MSan error in "rdkafka" library #12990 2020-07-28 14:13:32 +03:00
philip.han
b71fe9dab9 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into bayesAB 2020-07-23 22:21:15 +09:00
Vitaly Baranov
0b17595a91
Merge pull request #12423 from vitlibar/update-simdjson
Update simdjson
2020-07-20 10:15:38 +03:00
Vitaly Baranov
4cc101f1d4 Fix build scripts. 2020-07-17 10:30:13 +03:00
Vitaly Baranov
5c2c8edf51 Update SIMDJSON to the latest master 2020-07-17 10:30:08 +03:00
Denis Glazachev
59cb758cf7 Merge branch 'master' into ldap-per-user-authentication 2020-07-16 02:29:24 +04:00
Nikita Mikhaylov
ed05465479 Merge branch 'master' of github.com:ClickHouse/ClickHouse into achimbab-bayesAB 2020-07-15 16:34:56 +00:00
Nikita Mikhaylov
fd125eac1c system 2020-07-15 12:15:43 +00:00
Nikita Mikhaylov
d21c743aaa fix build 2020-07-14 15:09:08 +00:00
alexey-milovidov
1893d89ce3
Merge pull request #12448 from ClickHouse/fix-trash-rabbitmq
Fix trash from RabbitMQ
2020-07-14 01:11:37 +03:00
Alexey Milovidov
cb46bca157 Merge branch 'master' into fix-trash-rabbitmq 2020-07-13 19:51:17 +03:00
alexey-milovidov
3787f55ea4
Merge pull request #12446 from ClickHouse/update-fmt
Update fmtlib to master
2020-07-13 19:09:16 +03:00
Denis Glazachev
f787702922 Merge branch 'master' into ldap-per-user-authentication
* master: (27 commits)
  Whitespaces
  Fix typo
  Fix UBSan report in base64
  Correct default secure port for clickhouse-benchmark #11044
  Remove test with bug #10697
  Update in-functions.md (#12430)
  Allow nullable key in MergeTree
  Update arithmetic-functions.md
  [docs] add rabbitmq docs (#12326)
  Lower block sizes and look what will happen #9248
  Fix lifetime_bytes/lifetime_rows for Buffer direct block write
  Retrigger CI
  Fix up  test_mysql_protocol failed
  Implement lifetime_rows/lifetime_bytes for Buffer engine
  Add comment regarding proxy tunnel usage in PocoHTTPClient.cpp
  Add lifetime_rows/lifetime_bytes interface (exported via system.tables)
  Tiny IStorage refactoring
  Trigger integration-test-runner image rebuild.
  Delete log.txt
  Fix test_mysql_client/test_python_client error
  ...
2020-07-13 15:46:27 +04:00
Alexey Milovidov
e75caae079 Fix UBSan report in HDFS 2020-07-13 08:46:51 +03:00
Alexey Milovidov
8f2055b0a0 Fix trash from RabbitMQ 2020-07-13 04:11:48 +03:00
Alexey Milovidov
bfaa3d6b55 Update fmtlib to master 2020-07-13 03:46:57 +03:00
Alexey Milovidov
3858164438 Fix UBSan report in base64 2020-07-12 22:38:37 +03:00
Denis Glazachev
edb6ef8c09 Merge commit 'ceac649c01b0158090cd271776f3219f5e7ff57c' into ldap-per-user-authentication
* commit 'ceac649c01b0158090cd271776f3219f5e7ff57c': (75 commits)
  [docs] split misc statements (#12403)
  Update 00405_pretty_formats.reference
  Update PrettyCompactBlockOutputFormat.cpp
  Update PrettyBlockOutputFormat.cpp
  Update DataTypeNullable.cpp
  Update 01383_remote_ambiguous_column_shard.sql
  add output_format_pretty_grid_charset setting in docs
  add setting output_format_pretty_grid_charset
  Added a test for #11135
  Update index.md
  RIGHT and FULL JOIN for MergeJoin (#12118)
  Update MergeTreeIndexFullText.cpp
  restart the tests
  [docs] add syntax highlight (#12398)
  query fuzzer
  Fix std::bad_typeid when JSON functions called with argument of wrong type.
  Allow typeid_cast() to cast nullptr to nullptr.
  fix another context-related segfault
  [security docs] actually, only admins can create advisories
  query fuzzer
  ...
2020-07-11 21:32:36 +04:00
philip.han
1e631e2c33 Fix stats-cmake/CMakeLists.txt 2020-07-10 12:52:49 +09:00
philip.han
6c814c9f9f Add bayesAB function for bayesian_ab_testing 2020-07-09 22:11:40 +09:00
Denis Glazachev
5a4762bb8a
Merge branch 'master' into ldap-per-user-authentication 2020-07-09 14:50:02 +04:00
Azat Khuzhin
0aa97af108 Update config.h for arrow
Yes ARROW_FULL_SO_VERSION/ARROW_SO_VERSION is empty right now, like
other version variables (ARROW_VERSION_*)

Refs: #12181
2020-07-09 10:19:44 +03:00
Azat Khuzhin
a645759a42 Set CMAKE_POLICY_DEFAULT_CMP0022/CMAKE_POLICY_DEFAULT_CMP0077 globally
This will fix CMAKE_POLICY_DEFAULT_CMP0077 for snappy:

    CMake Warning (dev) at contrib/snappy/CMakeLists.txt:11 (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-09 10:16:39 +03:00
alexey-milovidov
36205e3ddf
Merge pull request #12181 from azat/bump-arrow-to-0.17
Bump arrow to 0.17 (and flatbuffers to v1.12, required by arrow)
2020-07-09 04:24:47 +03:00
Azat Khuzhin
fd5e08884a Bump arrow to 0.17 (and flatbuffers to v1.12, required by arrow)
MOTIVATION:
- remove double-conversion external dependency
- remove flatc (but flatbuffers is still required, arrow just shipped
  with generated files and that's it)

CHANGED:
- remove pre-generated headers, it is shipped with the arrow
- remove flatc (see above)

NOTES (see tests changes):
- and snappy error is reported as unsupported compression.
2020-07-07 23:54:32 +03:00
Denis Glazachev
9effacfbc1 Merge branch 'master' into ldap-per-user-authentication
* master: (1102 commits)
  Update README.md
  Update README.md
  Update README.md
  Update index.md
  [docs] add intrdocution for statements page (#12189)
  Revert "Run perf tests with memory sampling (for allocations >1M)"
  Sanitize LINK_LIBRARIES property for the directories (#12160)
  [docs] refactor Domains overview (#12186)
  DOCS-647: toStartOfSecond (#12190)
  [docs] add intrdocution for commercial page (#12187)
  DOCSUP-1348 Russian translation for new functions (#133) (#12194)
  changelog fixes
  Update index.md (#12191)
  Update zh kafka.md title (#12192)
  Added test for #3767
  style fix for #12152
  Tests for fixed issues #10846 and #7347
  changelog fixes
  [docs] introduction for special table engines (#12170)
  [docs] introduction for third-party interfaces (#12175)
  ...

# Conflicts:
#	src/Access/ya.make
#	src/Common/ErrorCodes.cpp
2020-07-08 00:42:09 +04:00
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
b173385431 Bump googletest to master (to fix gcc10 builds)
gcc10 reports:

    FAILED: src/CMakeFiles/unit_tests_dbms.dir/Columns/tests/gtest_column_unique.cpp.o
    <snip>
    ../contrib/googletest/googletest/include/gtest/gtest-printers.h:287:7: error: use of deleted function ‘std::basic_ostream<char, _Traits>& std::operator<<(std::basic_ostream<char, _Traits>&, char8_t) [with _Traits = std::char_traits<char>]’
      287 |   *os << value;
          |   ~~~~^~~~~~~~
    In file included from ../base/common/../common/StringRef.h:6,
                     from ../src/Columns/IColumn.h:7,
                     from ../src/Columns/IColumnUnique.h:2,
                     from ../src/Columns/ColumnUnique.h:2,
                     from ../src/Columns/tests/gtest_column_unique.cpp:1:
    /usr/include/c++/10.1.0/ostream:544:5: note: declared here
      544 |     operator<<(basic_ostream<char, _Traits>&, char8_t) = delete;
          |
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
Nikita Mikhaylov
53522c728b
Merge pull request #11662 from Avogar/orc_output_format
Add ORCBlockOutputFormat
2020-07-06 18:51:35 +04:00
Nikita Mikhaylov
dac7a39256 fix ubsan final 2020-07-06 12:29:22 +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
Alexey Milovidov
351eda5d8a Replace exit to abort in libdivide 2020-07-05 03:02:50 +03:00
Alexey Milovidov
c5cf7199d8 Update libdivide to the latest master 2020-07-05 02:58:10 +03:00
alexey-milovidov
6ae9bfe3b3
Merge pull request #12131 from matwey/fix/cmake_unixodbc
Minor cmake fixes for UNBUNDLED build
2020-07-04 22:29:28 +03:00
Azat Khuzhin
9258368de2 Fail if curl library was enabled and was not found in case of unbundled build 2020-07-04 16:48:25 +03:00
Matwey V. Kornilov
20c8e22942 poco-cmake: Fix Poco::Data::ODBC target when UNBUNDLED
By default IMPORTED target has a scope in the directory in which it is created
and below. This leads to the following issues when building UNBUNDLED:

Target "clickhouse" links to target "Poco::Data::ODBC" but the target was not
found.  Perhaps a find_package() call is missing for an IMPORTED target, or an
ALIAS target is missing?
2020-07-04 13:58:53 +03:00
Matwey V. Kornilov
338e772393 contrib/unixodbc-cmake: Fix build when UNBUNDLED
target_compile_definitions may only set INTERFACE properties on IMPORTED targets
2020-07-04 10:21:56 +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
Alexander Kuzmenkov
baec4093dd
Merge pull request #11993 from ClickHouse/aku/more-jemalloc-tweaks
jemalloc: set muzzy_decay_ms = 10s
2020-06-30 22:51:21 +03:00
Alexander Kazakov
8b2a5d81df
Update contrib/poco to ClickHouse-Extras/poco #22 (#12037)
* Updated ClickHouse-Extras/poco #22
2020-06-30 14:27:40 +03:00
kssenii
3d2cc9d4b2 Remove libevent library 2020-06-29 12:11:17 +00:00
Alexander Kuzmenkov
8c0177b216
Update contrib/jemalloc-cmake/CMakeLists.txt 2020-06-29 15:01:29 +03:00
alexey-milovidov
77c4861430
Merge pull request #11975 from oandrew/fix-word-breaks
Extend word break config to all non-alphanumeric chars
2020-06-27 19:13:44 +03:00