mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-24 16:42:05 +00:00
Merge branch 'master' into multiword_data_type
This commit is contained in:
Alexander Tokmakov
commit
045f804879
12
.arcignore
Normal file
12
.arcignore
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# .arcignore is the same as .gitignore but for Arc VCS.
|
||||||
|
# Arc VCS is a proprietary VCS in Yandex that is very similar to Git
|
||||||
|
# from the user perspective but with the following differences:
|
||||||
|
# 1. Data is stored in distributed object storage.
|
||||||
|
# 2. Local copy works via FUSE without downloading all the objects.
|
||||||
|
# For this reason, it is better suited for huge monorepositories that can be found in large companies (e.g. Yandex, Google).
|
||||||
|
# As ClickHouse developers, we don't use Arc as a VCS (we use Git).
|
||||||
|
# But the ClickHouse source code is also mirrored into internal monorepository and our collegues are using Arc.
|
||||||
|
# You can read more about Arc here: https://habr.com/en/company/yandex/blog/482926/
|
||||||
|
|
||||||
|
# Repository is synchronized without 3rd-party submodules.
|
||||||
|
contrib
|
||||||
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -9,7 +9,7 @@ Changelog category (leave one):
|
|||||||
- Build/Testing/Packaging Improvement
|
- Build/Testing/Packaging Improvement
|
||||||
- Documentation (changelog entry is not required)
|
- Documentation (changelog entry is not required)
|
||||||
- Other
|
- Other
|
||||||
- Non-significant (changelog entry is not required)
|
- Not for changelog (changelog entry is not required)
|
||||||
|
|
||||||
|
|
||||||
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
|
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
|
||||||
|
|||||||
138
.gitignore
vendored
138
.gitignore
vendored
@ -12,6 +12,7 @@
|
|||||||
/build
|
/build
|
||||||
/build_*
|
/build_*
|
||||||
/build-*
|
/build-*
|
||||||
|
|
||||||
/docs/build
|
/docs/build
|
||||||
/docs/publish
|
/docs/publish
|
||||||
/docs/edit
|
/docs/edit
|
||||||
@ -57,143 +58,9 @@ cmake-build-*
|
|||||||
__pycache__
|
__pycache__
|
||||||
*.pytest_cache
|
*.pytest_cache
|
||||||
|
|
||||||
# ignore generated files
|
|
||||||
*-metrika-yandex
|
|
||||||
|
|
||||||
test.cpp
|
test.cpp
|
||||||
utils/compressor/compressor
|
|
||||||
utils/corrector_utf8/corrector_utf8
|
|
||||||
utils/iotest/iotest
|
|
||||||
utils/iotest/iotest_aio
|
|
||||||
utils/iotest/iotest_nonblock
|
|
||||||
utils/config-processor/config-processor
|
|
||||||
CPackConfig.cmake
|
CPackConfig.cmake
|
||||||
CPackSourceConfig.cmake
|
CPackSourceConfig.cmake
|
||||||
contrib/libpoco/Poco/
|
|
||||||
contrib/libpoco/bin/
|
|
||||||
contrib/libpoco/cmake_uninstall.cmake
|
|
||||||
contrib/libre2/re2_st/
|
|
||||||
src/Client/clickhouse-benchmark
|
|
||||||
src/Client/clickhouse-client
|
|
||||||
src/Client/tests/test-connect
|
|
||||||
src/Common/tests/arena_with_free_lists
|
|
||||||
src/Common/tests/auto_array
|
|
||||||
src/Common/tests/compact_array
|
|
||||||
src/Common/tests/hash_table
|
|
||||||
src/Common/tests/hashes_test
|
|
||||||
src/Common/tests/int_hashes_perf
|
|
||||||
src/Common/tests/lru_cache
|
|
||||||
src/Common/tests/parallel_aggregation
|
|
||||||
src/Common/tests/parallel_aggregation2
|
|
||||||
src/Common/tests/radix_sort
|
|
||||||
src/Common/tests/shell_command_test
|
|
||||||
src/Common/tests/simple_cache
|
|
||||||
src/Common/tests/sip_hash
|
|
||||||
src/Common/tests/sip_hash_perf
|
|
||||||
src/Common/tests/small_table
|
|
||||||
src/Core/tests/exception
|
|
||||||
src/Core/tests/field
|
|
||||||
src/Core/tests/rvo_test
|
|
||||||
src/Core/tests/string_pool
|
|
||||||
src/DataStreams/tests/aggregating_stream
|
|
||||||
src/DataStreams/tests/block_tab_separated_streams
|
|
||||||
src/DataStreams/tests/collapsing_sorted_stream
|
|
||||||
src/DataStreams/tests/expression_stream
|
|
||||||
src/DataStreams/tests/filter_stream
|
|
||||||
src/DataStreams/tests/filter_stream_hitlog
|
|
||||||
src/DataStreams/tests/fork_streams
|
|
||||||
src/DataStreams/tests/glue_streams
|
|
||||||
src/DataStreams/tests/json_streams
|
|
||||||
src/DataStreams/tests/native_streams
|
|
||||||
src/DataStreams/tests/sorting_stream
|
|
||||||
src/DataStreams/tests/tab_separated_streams
|
|
||||||
src/DataStreams/tests/union_stream
|
|
||||||
src/DataStreams/tests/union_stream2
|
|
||||||
src/DataTypes/tests/data_type_string
|
|
||||||
src/DataTypes/tests/data_types_number_fixed
|
|
||||||
src/Functions/tests/functions_arithmetic
|
|
||||||
src/Functions/tests/logical_functions_performance
|
|
||||||
src/Functions/tests/number_traits
|
|
||||||
src/IO/tests/async_write
|
|
||||||
src/IO/tests/cached_compressed_read_buffer
|
|
||||||
src/IO/tests/compressed_buffer
|
|
||||||
src/IO/tests/hashing_read_buffer
|
|
||||||
src/IO/tests/hashing_write_buffer
|
|
||||||
src/IO/tests/io_and_exceptions
|
|
||||||
src/IO/tests/io_operators
|
|
||||||
src/IO/tests/mempbrk
|
|
||||||
src/IO/tests/o_direct_and_dirty_pages
|
|
||||||
src/IO/tests/parse_int_perf
|
|
||||||
src/IO/tests/parse_int_perf2
|
|
||||||
src/IO/tests/read_buffer
|
|
||||||
src/IO/tests/read_buffer_aio
|
|
||||||
src/IO/tests/read_buffer_perf
|
|
||||||
src/IO/tests/read_escaped_string
|
|
||||||
src/IO/tests/read_float_perf
|
|
||||||
src/IO/tests/read_write_int
|
|
||||||
src/IO/tests/valid_utf8
|
|
||||||
src/IO/tests/valid_utf8_perf
|
|
||||||
src/IO/tests/var_uint
|
|
||||||
src/IO/tests/write_buffer
|
|
||||||
src/IO/tests/write_buffer_aio
|
|
||||||
src/IO/tests/write_buffer_perf
|
|
||||||
src/Interpreters/tests/address_patterns
|
|
||||||
src/Interpreters/tests/aggregate
|
|
||||||
src/Interpreters/tests/compiler_test
|
|
||||||
src/Interpreters/tests/create_query
|
|
||||||
src/Interpreters/tests/expression
|
|
||||||
src/Interpreters/tests/expression_analyzer
|
|
||||||
src/Interpreters/tests/hash_map
|
|
||||||
src/Interpreters/tests/hash_map2
|
|
||||||
src/Interpreters/tests/hash_map3
|
|
||||||
src/Interpreters/tests/hash_map_string
|
|
||||||
src/Interpreters/tests/hash_map_string_2
|
|
||||||
src/Interpreters/tests/hash_map_string_3
|
|
||||||
src/Interpreters/tests/hash_map_string_small
|
|
||||||
src/Interpreters/tests/in_join_subqueries_preprocessor
|
|
||||||
src/Interpreters/tests/logical_expressions_optimizer
|
|
||||||
src/Interpreters/tests/select_query
|
|
||||||
src/Interpreters/tests/two_level_hash_map
|
|
||||||
src/Interpreters/tests/users
|
|
||||||
src/Parsers/tests/create_parser
|
|
||||||
src/Parsers/tests/select_parser
|
|
||||||
src/Server/clickhouse-server
|
|
||||||
src/Server/clickhouse-server.init
|
|
||||||
src/Storages/tests/hit_log
|
|
||||||
src/Storages/tests/merge_tree
|
|
||||||
src/Storages/tests/part_checker
|
|
||||||
src/Storages/tests/part_name
|
|
||||||
src/Storages/tests/pk_condition
|
|
||||||
src/Storages/tests/seek_speed_test
|
|
||||||
src/Storages/tests/storage_log
|
|
||||||
src/Storages/tests/system_numbers
|
|
||||||
libs/libcommon/src/revision.h
|
|
||||||
libs/libcommon/src/tests/date_lut2
|
|
||||||
libs/libcommon/src/tests/date_lut3
|
|
||||||
libs/libcommon/src/tests/date_lut4
|
|
||||||
libs/libcommon/src/tests/date_lut_init
|
|
||||||
libs/libcommon/src/tests/multi_version
|
|
||||||
libs/libmysqlxx/src/tests/failover
|
|
||||||
libs/libmysqlxx/src/tests/mysqlxx_test
|
|
||||||
libs/libzkutil/src/tests/zkutil_expiration_test
|
|
||||||
libs/libzkutil/src/tests/zkutil_test
|
|
||||||
libs/libzkutil/src/tests/zkutil_test_async
|
|
||||||
libs/libzkutil/src/tests/zkutil_test_commands
|
|
||||||
libs/libzkutil/src/tests/zkutil_test_lock
|
|
||||||
libs/libzkutil/src/tests/zkutil_zookeeper_holder
|
|
||||||
utils/zookeeper-create-entry-to-download-part/zookeeper-create-entry-to-download-part
|
|
||||||
utils/zookeeper-dump-tree/zookeeper-dump-tree
|
|
||||||
utils/zookeeper-remove-by-list/zookeeper-remove-by-list
|
|
||||||
src/Storages/tests/remove_symlink_directory
|
|
||||||
libs/libcommon/src/tests/json_test
|
|
||||||
utils/compressor/zstd_test
|
|
||||||
utils/wikistat-loader/wikistat-loader
|
|
||||||
src/Common/tests/pod_array
|
|
||||||
|
|
||||||
src/Server/data/*
|
|
||||||
src/Server/metadata/*
|
|
||||||
src/Server/status
|
|
||||||
config-9001.xml
|
|
||||||
|
|
||||||
*-preprocessed.xml
|
*-preprocessed.xml
|
||||||
|
|
||||||
@ -241,9 +108,6 @@ website/package-lock.json
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
*/.DS_Store
|
*/.DS_Store
|
||||||
|
|
||||||
# Ignore files for locally disabled tests
|
|
||||||
/src/queries/**/*.disabled
|
|
||||||
|
|
||||||
# cquery cache
|
# cquery cache
|
||||||
/.cquery-cache
|
/.cquery-cache
|
||||||
|
|
||||||
|
|||||||
20
.gitmodules
vendored
20
.gitmodules
vendored
@ -148,9 +148,23 @@
|
|||||||
path = contrib/avro
|
path = contrib/avro
|
||||||
url = https://github.com/ClickHouse-Extras/avro.git
|
url = https://github.com/ClickHouse-Extras/avro.git
|
||||||
ignore = untracked
|
ignore = untracked
|
||||||
[submodule "website/images/feathericons"]
|
|
||||||
path = website/images/feathericons
|
|
||||||
url = https://github.com/feathericons/feather
|
|
||||||
[submodule "contrib/msgpack-c"]
|
[submodule "contrib/msgpack-c"]
|
||||||
path = contrib/msgpack-c
|
path = contrib/msgpack-c
|
||||||
url = https://github.com/msgpack/msgpack-c
|
url = https://github.com/msgpack/msgpack-c
|
||||||
|
[submodule "contrib/libcpuid"]
|
||||||
|
path = contrib/libcpuid
|
||||||
|
url = https://github.com/ClickHouse-Extras/libcpuid.git
|
||||||
|
[submodule "contrib/openldap"]
|
||||||
|
path = contrib/openldap
|
||||||
|
url = https://github.com/openldap/openldap.git
|
||||||
|
[submodule "contrib/cassandra"]
|
||||||
|
path = contrib/cassandra
|
||||||
|
url = https://github.com/ClickHouse-Extras/cpp-driver.git
|
||||||
|
branch = clickhouse
|
||||||
|
[submodule "contrib/libuv"]
|
||||||
|
path = contrib/libuv
|
||||||
|
url = https://github.com/ClickHouse-Extras/libuv.git
|
||||||
|
branch = clickhouse
|
||||||
|
[submodule "contrib/fmtlib"]
|
||||||
|
path = contrib/fmtlib
|
||||||
|
url = https://github.com/fmtlib/fmt.git
|
||||||
|
|||||||
427
CHANGELOG.md
427
CHANGELOG.md
@ -1,5 +1,400 @@
|
|||||||
|
## ClickHouse release v20.4
|
||||||
|
|
||||||
|
### ClickHouse release v20.4.3.16-stable 2020-05-23
|
||||||
|
|
||||||
|
#### Bug Fix
|
||||||
|
|
||||||
|
* Removed logging from mutation finalization task if nothing was finalized. [#11109](https://github.com/ClickHouse/ClickHouse/pull/11109) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Fixed memory leak in registerDiskS3. [#11074](https://github.com/ClickHouse/ClickHouse/pull/11074) ([Pavel Kovalenko](https://github.com/Jokser)).
|
||||||
|
* Fixed the potential missed data during termination of Kafka engine table. [#11048](https://github.com/ClickHouse/ClickHouse/pull/11048) ([filimonov](https://github.com/filimonov)).
|
||||||
|
* Fixed `parseDateTime64BestEffort` argument resolution bugs. [#11038](https://github.com/ClickHouse/ClickHouse/pull/11038) ([Vasily Nemkov](https://github.com/Enmk)).
|
||||||
|
* Fixed very rare potential use-after-free error in `MergeTree` if table was not created successfully. [#10986](https://github.com/ClickHouse/ClickHouse/pull/10986), [#10970](https://github.com/ClickHouse/ClickHouse/pull/10970) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed metadata (relative path for rename) and data (relative path for symlink) handling for Atomic database. [#10980](https://github.com/ClickHouse/ClickHouse/pull/10980) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed server crash on concurrent `ALTER` and `DROP DATABASE` queries with `Atomic` database engine. [#10968](https://github.com/ClickHouse/ClickHouse/pull/10968) ([tavplubix](https://github.com/tavplubix)).
|
||||||
|
* Fixed incorrect raw data size in `getRawData()` method. [#10964](https://github.com/ClickHouse/ClickHouse/pull/10964) ([Igr](https://github.com/ObjatieGroba)).
|
||||||
|
* Fixed incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of GROUP BY result is large and aggregation is performed by a single String field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed sending partially written files by the `DistributedBlockOutputStream`. [#10940](https://github.com/ClickHouse/ClickHouse/pull/10940) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed crash in `SELECT count(notNullIn(NULL, []))`. [#10920](https://github.com/ClickHouse/ClickHouse/pull/10920) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed the hang which was happening sometimes during `DROP` of `Kafka` table engine. (or during server restarts). [#10910](https://github.com/ClickHouse/ClickHouse/pull/10910) ([filimonov](https://github.com/filimonov)).
|
||||||
|
* Fixed the impossibility of executing multiple `ALTER RENAME` like `a TO b, c TO a`. [#10895](https://github.com/ClickHouse/ClickHouse/pull/10895) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Fixed possible race which could happen when you get result from aggregate function state from multiple thread for the same column. The only way it can happen is when you use `finalizeAggregation` function while reading from table with `Memory` engine which stores `AggregateFunction` state for `quantile*` function. [#10890](https://github.com/ClickHouse/ClickHouse/pull/10890) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed backward compatibility with tuples in Distributed tables. [#10889](https://github.com/ClickHouse/ClickHouse/pull/10889) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* Fixed `SIGSEGV` in `StringHashTable` if such a key does not exist. [#10870](https://github.com/ClickHouse/ClickHouse/pull/10870) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed `WATCH` hangs after `LiveView` table was dropped from database with `Atomic` engine. [#10859](https://github.com/ClickHouse/ClickHouse/pull/10859) ([tavplubix](https://github.com/tavplubix)).
|
||||||
|
* Fixed bug in `ReplicatedMergeTree` which might cause some `ALTER` on `OPTIMIZE` query to hang waiting for some replica after it become inactive. [#10849](https://github.com/ClickHouse/ClickHouse/pull/10849) ([tavplubix](https://github.com/tavplubix)).
|
||||||
|
* Now constraints are updated if the column participating in `CONSTRAINT` expression was renamed. Fixes [#10844](https://github.com/ClickHouse/ClickHouse/issues/10844). [#10847](https://github.com/ClickHouse/ClickHouse/pull/10847) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Fixed potential read of uninitialized memory in cache-dictionary. [#10834](https://github.com/ClickHouse/ClickHouse/pull/10834) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed columns order after `Block::sortColumns()`. [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed the issue with `ODBC` bridge when no quoting of identifiers is requested. Fixes [#7984] (https://github.com/ClickHouse/ClickHouse/issues/7984). [#10821](https://github.com/ClickHouse/ClickHouse/pull/10821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed `UBSan` and `MSan` report in `DateLUT`. [#10798](https://github.com/ClickHouse/ClickHouse/pull/10798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed incorrect type conversion in key conditions. Fixes [#6287](https://github.com/ClickHouse/ClickHouse/issues/6287). [#10791](https://github.com/ClickHouse/ClickHouse/pull/10791) ([Andrew Onyshchuk](https://github.com/oandrew)).
|
||||||
|
* Fixed `parallel_view_processing` behavior. Now all insertions into `MATERIALIZED VIEW` without exception should be finished if exception happened. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#10757](https://github.com/ClickHouse/ClickHouse/pull/10757) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed combinator `-OrNull` and `-OrDefault` when combined with `-State`. [#10741](https://github.com/ClickHouse/ClickHouse/pull/10741) ([hcz](https://github.com/hczhcz)).
|
||||||
|
* Fixed possible buffer overflow in function `h3EdgeAngle`. [#10711](https://github.com/ClickHouse/ClickHouse/pull/10711) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed bug which locks concurrent alters when table has a lot of parts. [#10659](https://github.com/ClickHouse/ClickHouse/pull/10659) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Fixed `nullptr` dereference in `StorageBuffer` if server was shutdown before table startup. [#10641](https://github.com/ClickHouse/ClickHouse/pull/10641) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed `optimize_skip_unused_shards` with `LowCardinality`. [#10611](https://github.com/ClickHouse/ClickHouse/pull/10611) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed handling condition variable for synchronous mutations. In some cases signals to that condition variable could be lost. [#10588](https://github.com/ClickHouse/ClickHouse/pull/10588) ([Vladimir Chebotarev](https://github.com/excitoon)).
|
||||||
|
* Fixed possible crash when `createDictionary()` is called before `loadStoredObject()` has finished. [#10587](https://github.com/ClickHouse/ClickHouse/pull/10587) ([Vitaly Baranov](https://github.com/vitlibar)).
|
||||||
|
* Fixed `SELECT` of column `ALIAS` which default expression type different from column type. [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Implemented comparison between DateTime64 and String values. [#10560](https://github.com/ClickHouse/ClickHouse/pull/10560) ([Vasily Nemkov](https://github.com/Enmk)).
|
||||||
|
* Disable `GROUP BY` sharding_key optimization by default (`optimize_distributed_group_by_sharding_key` had been introduced and turned of by default, due to trickery of sharding_key analyzing, simple example is `if` in sharding key) and fix it for `WITH ROLLUP/CUBE/TOTALS`. [#10516](https://github.com/ClickHouse/ClickHouse/pull/10516) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed [#10263](https://github.com/ClickHouse/ClickHouse/issues/10263). [#10486](https://github.com/ClickHouse/ClickHouse/pull/10486) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Added tests about `max_rows_to_sort` setting. [#10268](https://github.com/ClickHouse/ClickHouse/pull/10268) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Added backward compatibility for create bloom filter index. [#10551](https://github.com/ClickHouse/ClickHouse/issues/10551). [#10569](https://github.com/ClickHouse/ClickHouse/pull/10569) ([Winter Zhang](https://github.com/zhang2014)).
|
||||||
|
|
||||||
|
### ClickHouse release v20.4.2.9, 2020-05-12
|
||||||
|
|
||||||
|
#### Backward Incompatible Change
|
||||||
|
* System tables (e.g. system.query_log, system.trace_log, system.metric_log) are using compact data part format for parts smaller than 10 MiB in size. Compact data part format is supported since version 20.3. If you are going to downgrade to version less than 20.3, you should manually delete table data for system logs in `/var/lib/clickhouse/data/system/`.
|
||||||
|
* When string comparison involves FixedString and compared arguments are of different sizes, do comparison as if smaller string is padded to the length of the larger. This is intented for SQL compatibility if we imagine that FixedString data type corresponds to SQL CHAR. This closes [#9272](https://github.com/ClickHouse/ClickHouse/issues/9272). [#10363](https://github.com/ClickHouse/ClickHouse/pull/10363) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Make SHOW CREATE TABLE multiline. Now it is more readable and more like MySQL. [#10049](https://github.com/ClickHouse/ClickHouse/pull/10049) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Added a setting `validate_polygons` that is used in `pointInPolygon` function and enabled by default. [#9857](https://github.com/ClickHouse/ClickHouse/pull/9857) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
|
||||||
|
#### New Feature
|
||||||
|
* Add support for secured connection from ClickHouse to Zookeeper [#10184](https://github.com/ClickHouse/ClickHouse/pull/10184) ([Konstantin Lebedev](https://github.com/xzkostyan))
|
||||||
|
* Support custom HTTP handlers. See ISSUES-5436 for description. [#7572](https://github.com/ClickHouse/ClickHouse/pull/7572) ([Winter Zhang](https://github.com/zhang2014))
|
||||||
|
* Add MessagePack Input/Output format. [#9889](https://github.com/ClickHouse/ClickHouse/pull/9889) ([Kruglov Pavel](https://github.com/Avogar))
|
||||||
|
* Add Regexp input format. [#9196](https://github.com/ClickHouse/ClickHouse/pull/9196) ([Kruglov Pavel](https://github.com/Avogar))
|
||||||
|
* Added output format `Markdown` for embedding tables in markdown documents. [#10317](https://github.com/ClickHouse/ClickHouse/pull/10317) ([Kruglov Pavel](https://github.com/Avogar))
|
||||||
|
* Added support for custom settings section in dictionaries. Also fixes issue [#2829](https://github.com/ClickHouse/ClickHouse/issues/2829). [#10137](https://github.com/ClickHouse/ClickHouse/pull/10137) ([Artem Streltsov](https://github.com/kekekekule))
|
||||||
|
* Added custom settings support in DDL-queries for CREATE DICTIONARY [#10465](https://github.com/ClickHouse/ClickHouse/pull/10465) ([Artem Streltsov](https://github.com/kekekekule))
|
||||||
|
* Add simple server-wide memory profiler that will collect allocation contexts when server memory usage becomes higher than the next allocation threshold. [#10444](https://github.com/ClickHouse/ClickHouse/pull/10444) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Add setting `always_fetch_merged_part` which restrict replica to merge parts by itself and always prefer dowloading from other replicas. [#10379](https://github.com/ClickHouse/ClickHouse/pull/10379) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Add function JSONExtractKeysAndValuesRaw which extracts raw data from JSON objects [#10378](https://github.com/ClickHouse/ClickHouse/pull/10378) ([hcz](https://github.com/hczhcz))
|
||||||
|
* Add memory usage from OS to `system.asynchronous_metrics`. [#10361](https://github.com/ClickHouse/ClickHouse/pull/10361) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Added generic variants for functions `least` and `greatest`. Now they work with arbitrary number of arguments of arbitrary types. This fixes [#4767](https://github.com/ClickHouse/ClickHouse/issues/4767) [#10318](https://github.com/ClickHouse/ClickHouse/pull/10318) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Now ClickHouse controls timeouts of dictionary sources on its side. Two new settings added to cache dictionary configuration: `strict_max_lifetime_seconds`, which is `max_lifetime` by default, and `query_wait_timeout_milliseconds`, which is one minute by default. The first settings is also useful with `allow_read_expired_keys` settings (to forbid reading very expired keys). [#10337](https://github.com/ClickHouse/ClickHouse/pull/10337) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
|
||||||
|
* Add log_queries_min_type to filter which entries will be written to query_log [#10053](https://github.com/ClickHouse/ClickHouse/pull/10053) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Added function `isConstant`. This function checks whether its argument is constant expression and returns 1 or 0. It is intended for development, debugging and demonstration purposes. [#10198](https://github.com/ClickHouse/ClickHouse/pull/10198) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* add joinGetOrNull to return NULL when key is missing instead of returning the default value. [#10094](https://github.com/ClickHouse/ClickHouse/pull/10094) ([Amos Bird](https://github.com/amosbird))
|
||||||
|
* Consider `NULL` to be equal to `NULL` in `IN` operator, if the option `transform_null_in` is set. [#10085](https://github.com/ClickHouse/ClickHouse/pull/10085) ([achimbab](https://github.com/achimbab))
|
||||||
|
* Add `ALTER TABLE ... RENAME COLUMN` for MergeTree table engines family. [#9948](https://github.com/ClickHouse/ClickHouse/pull/9948) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Support parallel distributed INSERT SELECT. [#9759](https://github.com/ClickHouse/ClickHouse/pull/9759) ([vxider](https://github.com/Vxider))
|
||||||
|
* Add ability to query Distributed over Distributed (w/o `distributed_group_by_no_merge`) ... [#9923](https://github.com/ClickHouse/ClickHouse/pull/9923) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Add function `arrayReduceInRanges` which aggregates array elements in given ranges. [#9598](https://github.com/ClickHouse/ClickHouse/pull/9598) ([hcz](https://github.com/hczhcz))
|
||||||
|
* Add Dictionary Status on prometheus exporter. [#9622](https://github.com/ClickHouse/ClickHouse/pull/9622) ([Guillaume Tassery](https://github.com/YiuRULE))
|
||||||
|
* Add function arrayAUC [#8698](https://github.com/ClickHouse/ClickHouse/pull/8698) ([taiyang-li](https://github.com/taiyang-li))
|
||||||
|
* Support `DROP VIEW` statement for better TPC-H compatibility. [#9831](https://github.com/ClickHouse/ClickHouse/pull/9831) ([Amos Bird](https://github.com/amosbird))
|
||||||
|
* Add 'strict_order' option to windowFunnel() [#9773](https://github.com/ClickHouse/ClickHouse/pull/9773) ([achimbab](https://github.com/achimbab))
|
||||||
|
* Support `DATE` and `TIMESTAMP` SQL operators, e.g. `SELECT date '2001-01-01'` [#9691](https://github.com/ClickHouse/ClickHouse/pull/9691) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
|
||||||
|
#### Experimental Feature
|
||||||
|
* Added experimental database engine Atomic. It supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHANGE TABLES t1 AND t2` query [#7512](https://github.com/ClickHouse/ClickHouse/pull/7512) ([tavplubix](https://github.com/tavplubix))
|
||||||
|
* Initial support for ReplicatedMergeTree over S3 (it works in suboptimal way) [#10126](https://github.com/ClickHouse/ClickHouse/pull/10126) ([Pavel Kovalenko](https://github.com/Jokser))
|
||||||
|
|
||||||
|
#### Bug Fix
|
||||||
|
* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fixed bug, which caused HTTP requests to get stuck on client closing connection when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix))
|
||||||
|
* Fix segfault in StorageBuffer when exception is thrown on server startup. Fixes [#10550](https://github.com/ClickHouse/ClickHouse/issues/10550) [#10609](https://github.com/ClickHouse/ClickHouse/pull/10609) ([tavplubix](https://github.com/tavplubix))
|
||||||
|
* The query`SYSTEM DROP DNS CACHE` now also drops caches used to check if user is allowed to connect from some IP addresses [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix))
|
||||||
|
* Fix usage of multiple `IN` operators with an identical set in one query. Fixes [#10539](https://github.com/ClickHouse/ClickHouse/issues/10539) [#10686](https://github.com/ClickHouse/ClickHouse/pull/10686) ([Anton Popov](https://github.com/CurtizJ))
|
||||||
|
* Fix crash in `generateRandom` with nested types. Fixes [#10583](https://github.com/ClickHouse/ClickHouse/issues/10583). [#10734](https://github.com/ClickHouse/ClickHouse/pull/10734) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix logic for aggregation_memory_efficient_merge_threads setting. [#10667](https://github.com/ClickHouse/ClickHouse/pull/10667) ([palasonic1](https://github.com/palasonic1))
|
||||||
|
* Fix disappearing totals. Totals could have being filtered if query had `JOIN` or subquery with external `WHERE` condition. Fixes [#10674](https://github.com/ClickHouse/ClickHouse/issues/10674) [#10698](https://github.com/ClickHouse/ClickHouse/pull/10698) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix the lack of parallel execution of remote queries with `distributed_aggregation_memory_efficient` enabled. Fixes [#10655](https://github.com/ClickHouse/ClickHouse/issues/10655) [#10664](https://github.com/ClickHouse/ClickHouse/pull/10664) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix possible incorrect number of rows for queries with `LIMIT`. Fixes [#10566](https://github.com/ClickHouse/ClickHouse/issues/10566), [#10709](https://github.com/ClickHouse/ClickHouse/issues/10709) [#10660](https://github.com/ClickHouse/ClickHouse/pull/10660) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix index corruption, which may occur in some cases after merging compact parts into another compact part. [#10531](https://github.com/ClickHouse/ClickHouse/pull/10531) ([Anton Popov](https://github.com/CurtizJ))
|
||||||
|
* Fix the situation, when mutation finished all parts, but hung up in `is_done=0`. [#10526](https://github.com/ClickHouse/ClickHouse/pull/10526) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fix overflow at beginning of unix epoch for timezones with fractional offset from UTC. Fixes [#9335](https://github.com/ClickHouse/ClickHouse/issues/9335). [#10513](https://github.com/ClickHouse/ClickHouse/pull/10513) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Better diagnostics for input formats. Fixes [#10204](https://github.com/ClickHouse/ClickHouse/issues/10204) [#10418](https://github.com/ClickHouse/ClickHouse/pull/10418) ([tavplubix](https://github.com/tavplubix))
|
||||||
|
* Fix numeric overflow in `simpleLinearRegression()` over large integers [#10474](https://github.com/ClickHouse/ClickHouse/pull/10474) ([hcz](https://github.com/hczhcz))
|
||||||
|
* Fix use-after-free in Distributed shutdown, avoid waiting for sending all batches [#10491](https://github.com/ClickHouse/ClickHouse/pull/10491) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Add CA certificates to clickhouse-server docker image [#10476](https://github.com/ClickHouse/ClickHouse/pull/10476) ([filimonov](https://github.com/filimonov))
|
||||||
|
* Fix a rare endless loop that might have occurred when using the `addressToLine` function or AggregateFunctionState columns. [#10466](https://github.com/ClickHouse/ClickHouse/pull/10466) ([Alexander Kuzmenkov](https://github.com/akuzm))
|
||||||
|
* Handle zookeeper "no node error" during distributed query [#10050](https://github.com/ClickHouse/ClickHouse/pull/10050) ([Daniel Chen](https://github.com/Phantomape))
|
||||||
|
* Fix bug when server cannot attach table after column's default was altered. [#10441](https://github.com/ClickHouse/ClickHouse/pull/10441) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Implicitly cast the default expression type to the column type for the ALIAS columns [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Don't remove metadata directory if `ATTACH DATABASE` fails [#10442](https://github.com/ClickHouse/ClickHouse/pull/10442) ([Winter Zhang](https://github.com/zhang2014))
|
||||||
|
* Avoid dependency on system tzdata. Fixes loading of `Africa/Casablanca` timezone on CentOS 8. Fixes [#10211](https://github.com/ClickHouse/ClickHouse/issues/10211) [#10425](https://github.com/ClickHouse/ClickHouse/pull/10425) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix some issues if data is inserted with quorum and then gets deleted (DROP PARTITION, TTL, etc.). It led to stuck of INSERTs or false-positive exceptions in SELECTs. Fixes [#9946](https://github.com/ClickHouse/ClickHouse/issues/9946) [#10188](https://github.com/ClickHouse/ClickHouse/pull/10188) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
|
||||||
|
* Check the number and type of arguments when creating BloomFilter index [#9623](https://github.com/ClickHouse/ClickHouse/issues/9623) [#10431](https://github.com/ClickHouse/ClickHouse/pull/10431) ([Winter Zhang](https://github.com/zhang2014))
|
||||||
|
* Prefer `fallback_to_stale_replicas` over `skip_unavailable_shards`, otherwise when both settings specified and there are no up-to-date replicas the query will fail (patch from @alex-zaitsev ) [#10422](https://github.com/ClickHouse/ClickHouse/pull/10422) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix the issue when a query with ARRAY JOIN, ORDER BY and LIMIT may return incomplete result. Fixes [#10226](https://github.com/ClickHouse/ClickHouse/issues/10226). [#10427](https://github.com/ClickHouse/ClickHouse/pull/10427) ([Vadim Plakhtinskiy](https://github.com/VadimPlh))
|
||||||
|
* Add database name to dictionary name after DETACH/ATTACH. Fixes system.dictionaries table and `SYSTEM RELOAD` query [#10415](https://github.com/ClickHouse/ClickHouse/pull/10415) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix possible incorrect result for extremes in processors pipeline. [#10131](https://github.com/ClickHouse/ClickHouse/pull/10131) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix possible segfault when the setting `distributed_group_by_no_merge` is enabled (introduced in 20.3.7.46 by [#10131](https://github.com/ClickHouse/ClickHouse/issues/10131)). [#10399](https://github.com/ClickHouse/ClickHouse/pull/10399) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix wrong flattening of `Array(Tuple(...))` data types. Fixes [#10259](https://github.com/ClickHouse/ClickHouse/issues/10259) [#10390](https://github.com/ClickHouse/ClickHouse/pull/10390) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix column names of constants inside JOIN that may clash with names of constants outside of JOIN [#9950](https://github.com/ClickHouse/ClickHouse/pull/9950) ([Alexander Kuzmenkov](https://github.com/akuzm))
|
||||||
|
* Fix order of columns after Block::sortColumns() [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix possible `Pipeline stuck` error in `ConcatProcessor` which may happen in remote query. [#10381](https://github.com/ClickHouse/ClickHouse/pull/10381) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Don't make disk reservations for aggregations. Fixes [#9241](https://github.com/ClickHouse/ClickHouse/issues/9241) [#10375](https://github.com/ClickHouse/ClickHouse/pull/10375) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix wrong behaviour of datetime functions for timezones that has altered between positive and negative offsets from UTC (e.g. Pacific/Kiritimati). Fixes [#7202](https://github.com/ClickHouse/ClickHouse/issues/7202) [#10369](https://github.com/ClickHouse/ClickHouse/pull/10369) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Avoid infinite loop in `dictIsIn` function. Fixes #515 [#10365](https://github.com/ClickHouse/ClickHouse/pull/10365) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Disable GROUP BY sharding_key optimization by default and fix it for WITH ROLLUP/CUBE/TOTALS [#10516](https://github.com/ClickHouse/ClickHouse/pull/10516) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Check for error code when checking parts and don't mark part as broken if the error is like "not enough memory". Fixes [#6269](https://github.com/ClickHouse/ClickHouse/issues/6269) [#10364](https://github.com/ClickHouse/ClickHouse/pull/10364) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Show information about not loaded dictionaries in system tables. [#10234](https://github.com/ClickHouse/ClickHouse/pull/10234) ([Vitaly Baranov](https://github.com/vitlibar))
|
||||||
|
* Fix nullptr dereference in StorageBuffer if server was shutdown before table startup. [#10641](https://github.com/ClickHouse/ClickHouse/pull/10641) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fixed `DROP` vs `OPTIMIZE` race in `ReplicatedMergeTree`. `DROP` could left some garbage in replica path in ZooKeeper if there was concurrent `OPTIMIZE` query. [#10312](https://github.com/ClickHouse/ClickHouse/pull/10312) ([tavplubix](https://github.com/tavplubix))
|
||||||
|
* Fix 'Logical error: CROSS JOIN has expressions' error for queries with comma and names joins mix. Fixes [#9910](https://github.com/ClickHouse/ClickHouse/issues/9910) [#10311](https://github.com/ClickHouse/ClickHouse/pull/10311) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Fix queries with `max_bytes_before_external_group_by`. [#10302](https://github.com/ClickHouse/ClickHouse/pull/10302) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Fix the issue with limiting maximum recursion depth in parser in certain cases. This fixes [#10283](https://github.com/ClickHouse/ClickHouse/issues/10283) This fix may introduce minor incompatibility: long and deep queries via clickhouse-client may refuse to work, and you should adjust settings `max_query_size` and `max_parser_depth` accordingly. [#10295](https://github.com/ClickHouse/ClickHouse/pull/10295) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Allow to use `count(*)` with multiple JOINs. Fixes [#9853](https://github.com/ClickHouse/ClickHouse/issues/9853) [#10291](https://github.com/ClickHouse/ClickHouse/pull/10291) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Fix error `Pipeline stuck` with `max_rows_to_group_by` and `group_by_overflow_mode = 'break'`. [#10279](https://github.com/ClickHouse/ClickHouse/pull/10279) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix 'Cannot add column' error while creating `range_hashed` dictionary using DDL query. Fixes [#10093](https://github.com/ClickHouse/ClickHouse/issues/10093). [#10235](https://github.com/ClickHouse/ClickHouse/pull/10235) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fix rare possible exception `Cannot drain connections: cancel first`. [#10239](https://github.com/ClickHouse/ClickHouse/pull/10239) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fixed bug where ClickHouse would throw "Unknown function lambda." error message when user tries to run ALTER UPDATE/DELETE on tables with ENGINE = Replicated*. Check for nondeterministic functions now handles lambda expressions correctly. [#10237](https://github.com/ClickHouse/ClickHouse/pull/10237) ([Alexander Kazakov](https://github.com/Akazz))
|
||||||
|
* Fixed reasonably rare segfault in StorageSystemTables that happens when SELECT ... FROM system.tables is run on a database with Lazy engine. [#10209](https://github.com/ClickHouse/ClickHouse/pull/10209) ([Alexander Kazakov](https://github.com/Akazz))
|
||||||
|
* Fix possible infinite query execution when the query actually should stop on LIMIT, while reading from infinite source like `system.numbers` or `system.zeros`. [#10206](https://github.com/ClickHouse/ClickHouse/pull/10206) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fixed "generateRandom" function for Date type. This fixes [#9973](https://github.com/ClickHouse/ClickHouse/issues/9973). Fix an edge case when dates with year 2106 are inserted to MergeTree tables with old-style partitioning but partitions are named with year 1970. [#10218](https://github.com/ClickHouse/ClickHouse/pull/10218) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Convert types if the table definition of a View does not correspond to the SELECT query. This fixes [#10180](https://github.com/ClickHouse/ClickHouse/issues/10180) and [#10022](https://github.com/ClickHouse/ClickHouse/issues/10022) [#10217](https://github.com/ClickHouse/ClickHouse/pull/10217) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix `parseDateTimeBestEffort` for strings in RFC-2822 when day of week is Tuesday or Thursday. This fixes [#10082](https://github.com/ClickHouse/ClickHouse/issues/10082) [#10214](https://github.com/ClickHouse/ClickHouse/pull/10214) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix column names of constants inside JOIN that may clash with names of constants outside of JOIN. [#10207](https://github.com/ClickHouse/ClickHouse/pull/10207) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix move-to-prewhere optimization in presense of arrayJoin functions (in certain cases). This fixes [#10092](https://github.com/ClickHouse/ClickHouse/issues/10092) [#10195](https://github.com/ClickHouse/ClickHouse/pull/10195) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix issue with separator appearing in SCRAMBLE for native mysql-connector-java (JDBC) [#10140](https://github.com/ClickHouse/ClickHouse/pull/10140) ([BohuTANG](https://github.com/BohuTANG))
|
||||||
|
* Fix using the current database for an access checking when the database isn't specified. [#10192](https://github.com/ClickHouse/ClickHouse/pull/10192) ([Vitaly Baranov](https://github.com/vitlibar))
|
||||||
|
* Fix ALTER of tables with compact parts. [#10130](https://github.com/ClickHouse/ClickHouse/pull/10130) ([Anton Popov](https://github.com/CurtizJ))
|
||||||
|
* Add the ability to relax the restriction on non-deterministic functions usage in mutations with `allow_nondeterministic_mutations` setting. [#10186](https://github.com/ClickHouse/ClickHouse/pull/10186) ([filimonov](https://github.com/filimonov))
|
||||||
|
* Fix `DROP TABLE` invoked for dictionary [#10165](https://github.com/ClickHouse/ClickHouse/pull/10165) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Convert blocks if structure does not match when doing `INSERT` into Distributed table [#10135](https://github.com/ClickHouse/ClickHouse/pull/10135) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* The number of rows was logged incorrectly (as sum across all parts) when inserted block is split by parts with partition key. [#10138](https://github.com/ClickHouse/ClickHouse/pull/10138) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Add some arguments check and support identifier arguments for MySQL Database Engine [#10077](https://github.com/ClickHouse/ClickHouse/pull/10077) ([Winter Zhang](https://github.com/zhang2014))
|
||||||
|
* Fix incorrect `index_granularity_bytes` check while creating new replica. Fixes [#10098](https://github.com/ClickHouse/ClickHouse/issues/10098). [#10121](https://github.com/ClickHouse/ClickHouse/pull/10121) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fix bug in `CHECK TABLE` query when table contain skip indices. [#10068](https://github.com/ClickHouse/ClickHouse/pull/10068) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fix Distributed-over-Distributed with the only one shard in a nested table [#9997](https://github.com/ClickHouse/ClickHouse/pull/9997) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix possible rows loss for queries with `JOIN` and `UNION ALL`. Fixes [#9826](https://github.com/ClickHouse/ClickHouse/issues/9826), [#10113](https://github.com/ClickHouse/ClickHouse/issues/10113). ... [#10099](https://github.com/ClickHouse/ClickHouse/pull/10099) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix bug in dictionary when local clickhouse server is used as source. It may caused memory corruption if types in dictionary and source are not compatible. [#10071](https://github.com/ClickHouse/ClickHouse/pull/10071) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fixed replicated tables startup when updating from an old ClickHouse version where `/table/replicas/replica_name/metadata` node doesn't exist. Fixes [#10037](https://github.com/ClickHouse/ClickHouse/issues/10037). [#10095](https://github.com/ClickHouse/ClickHouse/pull/10095) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fix error `Cannot clone block with columns because block has 0 columns ... While executing GroupingAggregatedTransform`. It happened when setting `distributed_aggregation_memory_efficient` was enabled, and distributed query read aggregating data with mixed single and two-level aggregation from different shards. [#10063](https://github.com/ClickHouse/ClickHouse/pull/10063) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix deadlock when database with materialized view failed attach at start [#10054](https://github.com/ClickHouse/ClickHouse/pull/10054) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix a segmentation fault that could occur in GROUP BY over string keys containing trailing zero bytes ([#8636](https://github.com/ClickHouse/ClickHouse/issues/8636), [#8925](https://github.com/ClickHouse/ClickHouse/issues/8925)). ... [#10025](https://github.com/ClickHouse/ClickHouse/pull/10025) ([Alexander Kuzmenkov](https://github.com/akuzm))
|
||||||
|
* Fix wrong results of distributed queries when alias could override qualified column name. Fixes [#9672](https://github.com/ClickHouse/ClickHouse/issues/9672) [#9714](https://github.com/ClickHouse/ClickHouse/issues/9714) [#9972](https://github.com/ClickHouse/ClickHouse/pull/9972) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Fix possible deadlock in `SYSTEM RESTART REPLICAS` [#9955](https://github.com/ClickHouse/ClickHouse/pull/9955) ([tavplubix](https://github.com/tavplubix))
|
||||||
|
* Fix the number of threads used for remote query execution (performance regression, since 20.3). This happened when query from `Distributed` table was executed simultaneously on local and remote shards. Fixes [#9965](https://github.com/ClickHouse/ClickHouse/issues/9965) [#9971](https://github.com/ClickHouse/ClickHouse/pull/9971) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fixed `DeleteOnDestroy` logic in `ATTACH PART` which could lead to automatic removal of attached part and added few tests [#9410](https://github.com/ClickHouse/ClickHouse/pull/9410) ([Vladimir Chebotarev](https://github.com/excitoon))
|
||||||
|
* Fix a bug with `ON CLUSTER` DDL queries freezing on server startup. [#9927](https://github.com/ClickHouse/ClickHouse/pull/9927) ([Gagan Arneja](https://github.com/garneja))
|
||||||
|
* Fix bug in which the necessary tables weren't retrieved at one of the processing stages of queries to some databases. Fixes [#9699](https://github.com/ClickHouse/ClickHouse/issues/9699). [#9949](https://github.com/ClickHouse/ClickHouse/pull/9949) ([achulkov2](https://github.com/achulkov2))
|
||||||
|
* Fix 'Not found column in block' error when `JOIN` appears with `TOTALS`. Fixes [#9839](https://github.com/ClickHouse/ClickHouse/issues/9839) [#9939](https://github.com/ClickHouse/ClickHouse/pull/9939) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Fix parsing multiple hosts set in the CREATE USER command [#9924](https://github.com/ClickHouse/ClickHouse/pull/9924) ([Vitaly Baranov](https://github.com/vitlibar))
|
||||||
|
* Fix `TRUNCATE` for Join table engine ([#9917](https://github.com/ClickHouse/ClickHouse/issues/9917)). [#9920](https://github.com/ClickHouse/ClickHouse/pull/9920) ([Amos Bird](https://github.com/amosbird))
|
||||||
|
* Fix race condition between drop and optimize in `ReplicatedMergeTree`. [#9901](https://github.com/ClickHouse/ClickHouse/pull/9901) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fix `DISTINCT` for Distributed when `optimize_skip_unused_shards` is set. [#9808](https://github.com/ClickHouse/ClickHouse/pull/9808) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix "scalar doesn't exist" error in ALTERs ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). ... [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird))
|
||||||
|
* Fix error with qualified names in `distributed_product_mode=\'local\'`. Fixes [#4756](https://github.com/ClickHouse/ClickHouse/issues/4756) [#9891](https://github.com/ClickHouse/ClickHouse/pull/9891) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* For INSERT queries shards now do clamp the settings from the initiator to their constraints instead of throwing an exception. This fix allows to send INSERT queries to a shard with another constraints. This change improves fix [#9447](https://github.com/ClickHouse/ClickHouse/issues/9447). [#9852](https://github.com/ClickHouse/ClickHouse/pull/9852) ([Vitaly Baranov](https://github.com/vitlibar))
|
||||||
|
* Add some retries when commiting offsets to Kafka broker, since it can reject commit if during `offsets.commit.timeout.ms` there were no enough replicas available for the `__consumer_offsets` topic [#9884](https://github.com/ClickHouse/ClickHouse/pull/9884) ([filimonov](https://github.com/filimonov))
|
||||||
|
* Fix Distributed engine behavior when virtual columns of the underlying table used in `WHERE` [#9847](https://github.com/ClickHouse/ClickHouse/pull/9847) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fixed some cases when timezone of the function argument wasn't used properly. [#9574](https://github.com/ClickHouse/ClickHouse/pull/9574) ([Vasily Nemkov](https://github.com/Enmk))
|
||||||
|
* Fix 'Different expressions with the same alias' error when query has PREWHERE and WHERE on distributed table and `SET distributed_product_mode = 'local'`. [#9871](https://github.com/ClickHouse/ClickHouse/pull/9871) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Fix mutations excessive memory consumption for tables with a composite primary key. This fixes [#9850](https://github.com/ClickHouse/ClickHouse/issues/9850). [#9860](https://github.com/ClickHouse/ClickHouse/pull/9860) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fix calculating grants for introspection functions from the setting `allow_introspection_functions`. [#9840](https://github.com/ClickHouse/ClickHouse/pull/9840) ([Vitaly Baranov](https://github.com/vitlibar))
|
||||||
|
* Fix max_distributed_connections (w/ and w/o Processors) [#9673](https://github.com/ClickHouse/ClickHouse/pull/9673) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix possible exception `Got 0 in totals chunk, expected 1` on client. It happened for queries with `JOIN` in case if right joined table had zero rows. Example: `select * from system.one t1 join system.one t2 on t1.dummy = t2.dummy limit 0 FORMAT TabSeparated;`. Fixes [#9777](https://github.com/ClickHouse/ClickHouse/issues/9777). ... [#9823](https://github.com/ClickHouse/ClickHouse/pull/9823) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix 'COMMA to CROSS JOIN rewriter is not enabled or cannot rewrite query' error in case of subqueries with COMMA JOIN out of tables lists (i.e. in WHERE). Fixes [#9782](https://github.com/ClickHouse/ClickHouse/issues/9782) [#9830](https://github.com/ClickHouse/ClickHouse/pull/9830) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Fix server crashing when `optimize_skip_unused_shards` is set and expression for key can't be converted to its field type [#9804](https://github.com/ClickHouse/ClickHouse/pull/9804) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix empty string handling in `splitByString`. [#9767](https://github.com/ClickHouse/ClickHouse/pull/9767) ([hcz](https://github.com/hczhcz))
|
||||||
|
* Fix broken `ALTER TABLE DELETE COLUMN` query for compact parts. [#9779](https://github.com/ClickHouse/ClickHouse/pull/9779) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fixed missing `rows_before_limit_at_least` for queries over http (with processors pipeline). Fixes [#9730](https://github.com/ClickHouse/ClickHouse/issues/9730) [#9757](https://github.com/ClickHouse/ClickHouse/pull/9757) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix excessive memory consumption in `ALTER` queries (mutations). This fixes [#9533](https://github.com/ClickHouse/ClickHouse/issues/9533) and [#9670](https://github.com/ClickHouse/ClickHouse/issues/9670). [#9754](https://github.com/ClickHouse/ClickHouse/pull/9754) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fix possible permanent "Cannot schedule a task" error. [#9154](https://github.com/ClickHouse/ClickHouse/pull/9154) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix bug in backquoting in external dictionaries DDL. Fixes [#9619](https://github.com/ClickHouse/ClickHouse/issues/9619). [#9734](https://github.com/ClickHouse/ClickHouse/pull/9734) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fixed data race in `text_log`. It does not correspond to any real bug. [#9726](https://github.com/ClickHouse/ClickHouse/pull/9726) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix bug in a replication that doesn't allow replication to work if the user has executed mutations on the previous version. This fixes [#9645](https://github.com/ClickHouse/ClickHouse/issues/9645). [#9652](https://github.com/ClickHouse/ClickHouse/pull/9652) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fixed incorrect internal function names for `sumKahan` and `sumWithOverflow`. It led to exception while using this functions in remote queries. [#9636](https://github.com/ClickHouse/ClickHouse/pull/9636) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Add setting `use_compact_format_in_distributed_parts_names` which allows to write files for `INSERT` queries into `Distributed` table with more compact format. This fixes [#9647](https://github.com/ClickHouse/ClickHouse/issues/9647). [#9653](https://github.com/ClickHouse/ClickHouse/pull/9653) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Fix RIGHT and FULL JOIN with LowCardinality in JOIN keys. [#9610](https://github.com/ClickHouse/ClickHouse/pull/9610) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Fix possible exceptions `Size of filter doesn't match size of column` and `Invalid number of rows in Chunk` in `MergeTreeRangeReader`. They could appear while executing `PREWHERE` in some cases. [#9612](https://github.com/ClickHouse/ClickHouse/pull/9612) ([Anton Popov](https://github.com/CurtizJ))
|
||||||
|
* Allow `ALTER ON CLUSTER` of Distributed tables with internal replication. This fixes [#3268](https://github.com/ClickHouse/ClickHouse/issues/3268) [#9617](https://github.com/ClickHouse/ClickHouse/pull/9617) ([shinoi2](https://github.com/shinoi2))
|
||||||
|
* Fix issue when timezone was not preserved if you write a simple arithmetic expression like `time + 1` (in contrast to an expression like `time + INTERVAL 1 SECOND`). This fixes [#5743](https://github.com/ClickHouse/ClickHouse/issues/5743) [#9323](https://github.com/ClickHouse/ClickHouse/pull/9323) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
|
||||||
|
#### Improvement
|
||||||
|
* Use time zone when comparing DateTime with string literal. This fixes [#5206](https://github.com/ClickHouse/ClickHouse/issues/5206). [#10515](https://github.com/ClickHouse/ClickHouse/pull/10515) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Print verbose diagnostic info if Decimal value cannot be parsed from text input format. [#10205](https://github.com/ClickHouse/ClickHouse/pull/10205) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Add tasks/memory metrics for distributed/buffer schedule pools [#10449](https://github.com/ClickHouse/ClickHouse/pull/10449) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Display result as soon as it's ready for SELECT DISTINCT queries in clickhouse-local and HTTP interface. This fixes [#8951](https://github.com/ClickHouse/ClickHouse/issues/8951) [#9559](https://github.com/ClickHouse/ClickHouse/pull/9559) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Allow to use `SAMPLE OFFSET` query instead of `cityHash64(PRIMARY KEY) % N == n` for splitting in `clickhouse-copier`. To use this feature, pass `--experimental-use-sample-offset 1` as a command line argument. [#10414](https://github.com/ClickHouse/ClickHouse/pull/10414) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
|
||||||
|
* Allow to parse BOM in TSV if the first column cannot contain BOM in its value. This fixes [#10301](https://github.com/ClickHouse/ClickHouse/issues/10301) [#10424](https://github.com/ClickHouse/ClickHouse/pull/10424) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Add Avro nested fields insert support [#10354](https://github.com/ClickHouse/ClickHouse/pull/10354) ([Andrew Onyshchuk](https://github.com/oandrew))
|
||||||
|
* Allowed to alter column in non-modifying data mode when the same type is specified. [#10382](https://github.com/ClickHouse/ClickHouse/pull/10382) ([Vladimir Chebotarev](https://github.com/excitoon))
|
||||||
|
* Auto `distributed_group_by_no_merge` on GROUP BY sharding key (if `optimize_skip_unused_shards` is set) [#10341](https://github.com/ClickHouse/ClickHouse/pull/10341) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Optimize queries with LIMIT/LIMIT BY/ORDER BY for distributed with GROUP BY sharding_key [#10373](https://github.com/ClickHouse/ClickHouse/pull/10373) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Added a setting `max_server_memory_usage` to limit total memory usage of the server. The metric `MemoryTracking` is now calculated without a drift. The setting `max_memory_usage_for_all_queries` is now obsolete and does nothing. This closes [#10293](https://github.com/ClickHouse/ClickHouse/issues/10293). [#10362](https://github.com/ClickHouse/ClickHouse/pull/10362) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Add config option `system_tables_lazy_load`. If it's set to false, then system tables with logs are loaded at the server startup. [Alexander Burmak](https://github.com/Alex-Burmak), [Svyatoslav Tkhon Il Pak](https://github.com/DeifyTheGod), [#9642](https://github.com/ClickHouse/ClickHouse/pull/9642) [#10359](https://github.com/ClickHouse/ClickHouse/pull/10359) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Use background thread pool (background_schedule_pool_size) for distributed sends [#10263](https://github.com/ClickHouse/ClickHouse/pull/10263) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Use background thread pool for background buffer flushes. [#10315](https://github.com/ClickHouse/ClickHouse/pull/10315) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Support for one special case of removing incompletely written parts. This fixes [#9940](https://github.com/ClickHouse/ClickHouse/issues/9940). [#10221](https://github.com/ClickHouse/ClickHouse/pull/10221) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Use isInjective() over manual list of such functions for GROUP BY optimization. [#10342](https://github.com/ClickHouse/ClickHouse/pull/10342) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Avoid printing error message in log if client sends RST packet immediately on connect. It is typical behaviour of IPVS balancer with keepalived and VRRP. This fixes [#1851](https://github.com/ClickHouse/ClickHouse/issues/1851) [#10274](https://github.com/ClickHouse/ClickHouse/pull/10274) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Allow to parse `+inf` for floating point types. This closes [#1839](https://github.com/ClickHouse/ClickHouse/issues/1839) [#10272](https://github.com/ClickHouse/ClickHouse/pull/10272) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Implemented `generateRandom` table function for Nested types. This closes [#9903](https://github.com/ClickHouse/ClickHouse/issues/9903) [#10219](https://github.com/ClickHouse/ClickHouse/pull/10219) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Provide `max_allowed_packed` in MySQL compatibility interface that will help some clients to communicate with ClickHouse via MySQL protocol. [#10199](https://github.com/ClickHouse/ClickHouse/pull/10199) ([BohuTANG](https://github.com/BohuTANG))
|
||||||
|
* Allow literals for GLOBAL IN (i.e. `SELECT * FROM remote('localhost', system.one) WHERE dummy global in (0)`) [#10196](https://github.com/ClickHouse/ClickHouse/pull/10196) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix various small issues in interactive mode of clickhouse-client [#10194](https://github.com/ClickHouse/ClickHouse/pull/10194) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Avoid superfluous dictionaries load (system.tables, DROP/SHOW CREATE TABLE) [#10164](https://github.com/ClickHouse/ClickHouse/pull/10164) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Update to RWLock: timeout parameter for getLock() + implementation reworked to be phase fair [#10073](https://github.com/ClickHouse/ClickHouse/pull/10073) ([Alexander Kazakov](https://github.com/Akazz))
|
||||||
|
* Enhanced compatibility with native mysql-connector-java(JDBC) [#10021](https://github.com/ClickHouse/ClickHouse/pull/10021) ([BohuTANG](https://github.com/BohuTANG))
|
||||||
|
* The function `toString` is considered monotonic and can be used for index analysis even when applied in tautological cases with String or LowCardinality(String) argument. [#10110](https://github.com/ClickHouse/ClickHouse/pull/10110) ([Amos Bird](https://github.com/amosbird))
|
||||||
|
* Add `ON CLUSTER` clause support to commands `{CREATE|DROP} USER/ROLE/ROW POLICY/SETTINGS PROFILE/QUOTA`, `GRANT`. [#9811](https://github.com/ClickHouse/ClickHouse/pull/9811) ([Vitaly Baranov](https://github.com/vitlibar))
|
||||||
|
* Virtual hosted-style support for S3 URI [#9998](https://github.com/ClickHouse/ClickHouse/pull/9998) ([Pavel Kovalenko](https://github.com/Jokser))
|
||||||
|
* Now layout type for dictionaries with no arguments can be specified without round brackets in dictionaries DDL-queries. Fixes [#10057](https://github.com/ClickHouse/ClickHouse/issues/10057). [#10064](https://github.com/ClickHouse/ClickHouse/pull/10064) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Add ability to use number ranges with leading zeros in filepath [#9989](https://github.com/ClickHouse/ClickHouse/pull/9989) ([Olga Khvostikova](https://github.com/stavrolia))
|
||||||
|
* Better memory usage in CROSS JOIN. [#10029](https://github.com/ClickHouse/ClickHouse/pull/10029) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Try to connect to all shards in cluster when getting structure of remote table and skip_unavailable_shards is set. [#7278](https://github.com/ClickHouse/ClickHouse/pull/7278) ([nvartolomei](https://github.com/nvartolomei))
|
||||||
|
* Add `total_rows`/`total_bytes` into the `system.tables` table. [#9919](https://github.com/ClickHouse/ClickHouse/pull/9919) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* System log tables now use polymorpic parts by default. [#9905](https://github.com/ClickHouse/ClickHouse/pull/9905) ([Anton Popov](https://github.com/CurtizJ))
|
||||||
|
* Add type column into system.settings/merge_tree_settings [#9909](https://github.com/ClickHouse/ClickHouse/pull/9909) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Check for available CPU instructions at server startup as early as possible. [#9888](https://github.com/ClickHouse/ClickHouse/pull/9888) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Remove `ORDER BY` stage from mutations because we read from a single ordered part in a single thread. Also add check that the rows in mutation are ordered by sorting key and this order is not violated. [#9886](https://github.com/ClickHouse/ClickHouse/pull/9886) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Implement operator LIKE for FixedString at left hand side. This is needed to better support TPC-DS queries. [#9890](https://github.com/ClickHouse/ClickHouse/pull/9890) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Add `force_optimize_skip_unused_shards_no_nested` that will disable `force_optimize_skip_unused_shards` for nested Distributed table [#9812](https://github.com/ClickHouse/ClickHouse/pull/9812) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Now columns size is calculated only once for MergeTree data parts. [#9827](https://github.com/ClickHouse/ClickHouse/pull/9827) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Evaluate constant expressions for `optimize_skip_unused_shards` (i.e. `SELECT * FROM foo_dist WHERE key=xxHash32(0)`) [#8846](https://github.com/ClickHouse/ClickHouse/pull/8846) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Check for using `Date` or `DateTime` column from TTL expressions was removed. [#9967](https://github.com/ClickHouse/ClickHouse/pull/9967) ([Vladimir Chebotarev](https://github.com/excitoon))
|
||||||
|
* DiskS3 hard links optimal implementation. [#9760](https://github.com/ClickHouse/ClickHouse/pull/9760) ([Pavel Kovalenko](https://github.com/Jokser))
|
||||||
|
* If `set multiple_joins_rewriter_version = 2` enables second version of multiple JOIN rewrites that keeps not clashed column names as is. It supports multiple JOINs with `USING` and allow `select *` for JOINs with subqueries. [#9739](https://github.com/ClickHouse/ClickHouse/pull/9739) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Implementation of "non-blocking" alter for StorageMergeTree [#9606](https://github.com/ClickHouse/ClickHouse/pull/9606) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Add MergeTree full support for DiskS3 [#9646](https://github.com/ClickHouse/ClickHouse/pull/9646) ([Pavel Kovalenko](https://github.com/Jokser))
|
||||||
|
* Extend `splitByString` to support empty strings as separators. [#9742](https://github.com/ClickHouse/ClickHouse/pull/9742) ([hcz](https://github.com/hczhcz))
|
||||||
|
* Add a `timestamp_ns` column to `system.trace_log`. It contains a high-definition timestamp of the trace event, and allows to build timelines of thread profiles ("flame charts"). [#9696](https://github.com/ClickHouse/ClickHouse/pull/9696) ([Alexander Kuzmenkov](https://github.com/akuzm))
|
||||||
|
* When the setting `send_logs_level` is enabled, avoid intermixing of log messages and query progress. [#9634](https://github.com/ClickHouse/ClickHouse/pull/9634) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Added support of `MATERIALIZE TTL IN PARTITION`. [#9581](https://github.com/ClickHouse/ClickHouse/pull/9581) ([Vladimir Chebotarev](https://github.com/excitoon))
|
||||||
|
* Support complex types inside Avro nested fields [#10502](https://github.com/ClickHouse/ClickHouse/pull/10502) ([Andrew Onyshchuk](https://github.com/oandrew))
|
||||||
|
|
||||||
|
#### Performance Improvement
|
||||||
|
* Better insert logic for right table for Partial MergeJoin. [#10467](https://github.com/ClickHouse/ClickHouse/pull/10467) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Improved performance of row-oriented formats (more than 10% for CSV and more than 35% for Avro in case of narrow tables). [#10503](https://github.com/ClickHouse/ClickHouse/pull/10503) ([Andrew Onyshchuk](https://github.com/oandrew))
|
||||||
|
* Improved performance of queries with explicitly defined sets at right side of IN operator and tuples on the left side. [#10385](https://github.com/ClickHouse/ClickHouse/pull/10385) ([Anton Popov](https://github.com/CurtizJ))
|
||||||
|
* Use less memory for hash table in HashJoin. [#10416](https://github.com/ClickHouse/ClickHouse/pull/10416) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Special HashJoin over StorageDictionary. Allow rewrite `dictGet()` functions with JOINs. It's not backward incompatible itself but could uncover [#8400](https://github.com/ClickHouse/ClickHouse/issues/8400) on some installations. [#10133](https://github.com/ClickHouse/ClickHouse/pull/10133) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Enable parallel insert of materialized view when its target table supports. [#10052](https://github.com/ClickHouse/ClickHouse/pull/10052) ([vxider](https://github.com/Vxider))
|
||||||
|
* Improved performance of index analysis with monotonic functions. [#9607](https://github.com/ClickHouse/ClickHouse/pull/9607)[#10026](https://github.com/ClickHouse/ClickHouse/pull/10026) ([Anton Popov](https://github.com/CurtizJ))
|
||||||
|
* Using SSE2 or SSE4.2 SIMD intrinsics to speed up tokenization in bloom filters. [#9968](https://github.com/ClickHouse/ClickHouse/pull/9968) ([Vasily Nemkov](https://github.com/Enmk))
|
||||||
|
* Improved performance of queries with explicitly defined sets at right side of `IN` operator. This fixes performance regression in version 20.3. [#9740](https://github.com/ClickHouse/ClickHouse/pull/9740) ([Anton Popov](https://github.com/CurtizJ))
|
||||||
|
* Now clickhouse-copier splits each partition in number of pieces and copies them independently. [#9075](https://github.com/ClickHouse/ClickHouse/pull/9075) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
|
||||||
|
* Adding more aggregation methods. For example TPC-H query 1 will now pick `FixedHashMap<UInt16, AggregateDataPtr>` and gets 25% performance gain [#9829](https://github.com/ClickHouse/ClickHouse/pull/9829) ([Amos Bird](https://github.com/amosbird))
|
||||||
|
* Use single row counter for multiple streams in pre-limit transform. This helps to avoid uniting pipeline streams in queries with `limit` but without `order by` (like `select f(x) from (select x from t limit 1000000000)`) and use multiple threads for further processing. [#9602](https://github.com/ClickHouse/ClickHouse/pull/9602) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
|
||||||
|
#### Build/Testing/Packaging Improvement
|
||||||
|
* Use a fork of AWS SDK libraries from ClickHouse-Extras [#10527](https://github.com/ClickHouse/ClickHouse/pull/10527) ([Pavel Kovalenko](https://github.com/Jokser))
|
||||||
|
* Add integration tests for new ALTER RENAME COLUMN query. [#10654](https://github.com/ClickHouse/ClickHouse/pull/10654) ([vzakaznikov](https://github.com/vzakaznikov))
|
||||||
|
* Fix possible signed integer overflow in invocation of function `now64` with wrong arguments. This fixes [#8973](https://github.com/ClickHouse/ClickHouse/issues/8973) [#10511](https://github.com/ClickHouse/ClickHouse/pull/10511) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Split fuzzer and sanitizer configurations to make build config compatible with Oss-fuzz. [#10494](https://github.com/ClickHouse/ClickHouse/pull/10494) ([kyprizel](https://github.com/kyprizel))
|
||||||
|
* Fixes for clang-tidy on clang-10. [#10420](https://github.com/ClickHouse/ClickHouse/pull/10420) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Display absolute paths in error messages. Otherwise KDevelop fails to navigate to correct file and opens a new file instead. [#10434](https://github.com/ClickHouse/ClickHouse/pull/10434) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Added `ASAN_OPTIONS` environment variable to investigate errors in CI stress tests with Address sanitizer. [#10440](https://github.com/ClickHouse/ClickHouse/pull/10440) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
|
||||||
|
* Enable ThinLTO for clang builds (experimental). [#10435](https://github.com/ClickHouse/ClickHouse/pull/10435) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Remove accidential dependency on Z3 that may be introduced if the system has Z3 solver installed. [#10426](https://github.com/ClickHouse/ClickHouse/pull/10426) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Move integration tests docker files to docker/ directory. [#10335](https://github.com/ClickHouse/ClickHouse/pull/10335) ([Ilya Yatsishin](https://github.com/qoega))
|
||||||
|
* Allow to use `clang-10` in CI. It ensures that [#10238](https://github.com/ClickHouse/ClickHouse/issues/10238) is fixed. [#10384](https://github.com/ClickHouse/ClickHouse/pull/10384) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Update OpenSSL to upstream master. Fixed the issue when TLS connections may fail with the message `OpenSSL SSL_read: error:14094438:SSL routines:ssl3_read_bytes:tlsv1 alert internal error` and `SSL Exception: error:2400006E:random number generator::error retrieving entropy`. The issue was present in version 20.1. [#8956](https://github.com/ClickHouse/ClickHouse/pull/8956) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix clang-10 build. https://github.com/ClickHouse/ClickHouse/issues/10238 [#10370](https://github.com/ClickHouse/ClickHouse/pull/10370) ([Amos Bird](https://github.com/amosbird))
|
||||||
|
* Add performance test for [Parallel INSERT for materialized view](https://github.com/ClickHouse/ClickHouse/pull/10052). [#10345](https://github.com/ClickHouse/ClickHouse/pull/10345) ([vxider](https://github.com/Vxider))
|
||||||
|
* Fix flaky test `test_settings_constraints_distributed.test_insert_clamps_settings`. [#10346](https://github.com/ClickHouse/ClickHouse/pull/10346) ([Vitaly Baranov](https://github.com/vitlibar))
|
||||||
|
* Add util to test results upload in CI ClickHouse [#10330](https://github.com/ClickHouse/ClickHouse/pull/10330) ([Ilya Yatsishin](https://github.com/qoega))
|
||||||
|
* Convert test results to JSONEachRow format in junit_to_html tool [#10323](https://github.com/ClickHouse/ClickHouse/pull/10323) ([Ilya Yatsishin](https://github.com/qoega))
|
||||||
|
* Update cctz. [#10215](https://github.com/ClickHouse/ClickHouse/pull/10215) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Allow to create HTML report from the purest JUnit XML report. [#10247](https://github.com/ClickHouse/ClickHouse/pull/10247) ([Ilya Yatsishin](https://github.com/qoega))
|
||||||
|
* Update the check for minimal compiler version. Fix the root cause of the issue [#10250](https://github.com/ClickHouse/ClickHouse/issues/10250) [#10256](https://github.com/ClickHouse/ClickHouse/pull/10256) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Initial support for live view tables over distributed [#10179](https://github.com/ClickHouse/ClickHouse/pull/10179) ([vzakaznikov](https://github.com/vzakaznikov))
|
||||||
|
* Fix (false) MSan report in MergeTreeIndexFullText. The issue first appeared in [#9968](https://github.com/ClickHouse/ClickHouse/issues/9968). [#10801](https://github.com/ClickHouse/ClickHouse/pull/10801) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* clickhouse-docker-util [#10151](https://github.com/ClickHouse/ClickHouse/pull/10151) ([filimonov](https://github.com/filimonov))
|
||||||
|
* Update pdqsort to recent version [#10171](https://github.com/ClickHouse/ClickHouse/pull/10171) ([Ivan](https://github.com/abyss7))
|
||||||
|
* Update libdivide to v3.0 [#10169](https://github.com/ClickHouse/ClickHouse/pull/10169) ([Ivan](https://github.com/abyss7))
|
||||||
|
* Add check with enabled polymorphic parts. [#10086](https://github.com/ClickHouse/ClickHouse/pull/10086) ([Anton Popov](https://github.com/CurtizJ))
|
||||||
|
* Add cross-compile build for FreeBSD. This fixes [#9465](https://github.com/ClickHouse/ClickHouse/issues/9465) [#9643](https://github.com/ClickHouse/ClickHouse/pull/9643) ([Ivan](https://github.com/abyss7))
|
||||||
|
* Add performance test for [#6924](https://github.com/ClickHouse/ClickHouse/issues/6924) [#6980](https://github.com/ClickHouse/ClickHouse/pull/6980) ([filimonov](https://github.com/filimonov))
|
||||||
|
* Add support of `/dev/null` in the `File` engine for better performance testing [#8455](https://github.com/ClickHouse/ClickHouse/pull/8455) ([Amos Bird](https://github.com/amosbird))
|
||||||
|
* Move all folders inside /dbms one level up [#9974](https://github.com/ClickHouse/ClickHouse/pull/9974) ([Ivan](https://github.com/abyss7))
|
||||||
|
* Add a test that checks that read from MergeTree with single thread is performed in order. Addition to [#9670](https://github.com/ClickHouse/ClickHouse/issues/9670) [#9762](https://github.com/ClickHouse/ClickHouse/pull/9762) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix the `00964_live_view_watch_events_heartbeat.py` test to avoid race condition. [#9944](https://github.com/ClickHouse/ClickHouse/pull/9944) ([vzakaznikov](https://github.com/vzakaznikov))
|
||||||
|
* Fix integration test `test_settings_constraints` [#9962](https://github.com/ClickHouse/ClickHouse/pull/9962) ([Vitaly Baranov](https://github.com/vitlibar))
|
||||||
|
* Every function in its own file, part 12. [#9922](https://github.com/ClickHouse/ClickHouse/pull/9922) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Added performance test for the case of extremely slow analysis of array of tuples. [#9872](https://github.com/ClickHouse/ClickHouse/pull/9872) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Update zstd to 1.4.4. It has some minor improvements in performance and compression ratio. If you run replicas with different versions of ClickHouse you may see reasonable error messages `Data after merge is not byte-identical to data on another replicas.` with explanation. These messages are Ok and you should not worry. [#10663](https://github.com/ClickHouse/ClickHouse/pull/10663) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix TSan report in `system.stack_trace`. [#9832](https://github.com/ClickHouse/ClickHouse/pull/9832) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Removed dependency on `clock_getres`. [#9833](https://github.com/ClickHouse/ClickHouse/pull/9833) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Added identifier names check with clang-tidy. [#9799](https://github.com/ClickHouse/ClickHouse/pull/9799) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Update "builder" docker image. This image is not used in CI but is useful for developers. [#9809](https://github.com/ClickHouse/ClickHouse/pull/9809) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Remove old `performance-test` tool that is no longer used in CI. `clickhouse-performance-test` is great but now we are using way superior tool that is doing comparison testing with sophisticated statistical formulas to achieve confident results regardless to various changes in environment. [#9796](https://github.com/ClickHouse/ClickHouse/pull/9796) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Added most of clang-static-analyzer checks. [#9765](https://github.com/ClickHouse/ClickHouse/pull/9765) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Update Poco to 1.9.3 in preparation for MongoDB URI support. [#6892](https://github.com/ClickHouse/ClickHouse/pull/6892) ([Alexander Kuzmenkov](https://github.com/akuzm))
|
||||||
|
* Fix build with `-DUSE_STATIC_LIBRARIES=0 -DENABLE_JEMALLOC=0` [#9651](https://github.com/ClickHouse/ClickHouse/pull/9651) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* For change log script, if merge commit was cherry-picked to release branch, take PR name from commit description. [#9708](https://github.com/ClickHouse/ClickHouse/pull/9708) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Support `vX.X-conflicts` tag in backport script. [#9705](https://github.com/ClickHouse/ClickHouse/pull/9705) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix `auto-label` for backporting script. [#9685](https://github.com/ClickHouse/ClickHouse/pull/9685) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Use libc++ in Darwin cross-build to make it consistent with native build. [#9665](https://github.com/ClickHouse/ClickHouse/pull/9665) ([Hui Wang](https://github.com/huiwang))
|
||||||
|
* Fix flacky test `01017_uniqCombined_memory_usage`. Continuation of [#7236](https://github.com/ClickHouse/ClickHouse/issues/7236). [#9667](https://github.com/ClickHouse/ClickHouse/pull/9667) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix build for native MacOS Clang compiler [#9649](https://github.com/ClickHouse/ClickHouse/pull/9649) ([Ivan](https://github.com/abyss7))
|
||||||
|
* Allow to add various glitches around `pthread_mutex_lock`, `pthread_mutex_unlock` functions. [#9635](https://github.com/ClickHouse/ClickHouse/pull/9635) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Add support for `clang-tidy` in `packager` script. [#9625](https://github.com/ClickHouse/ClickHouse/pull/9625) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Add ability to use unbundled msgpack. [#10168](https://github.com/ClickHouse/ClickHouse/pull/10168) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
|
||||||
|
|
||||||
## ClickHouse release v20.3
|
## ClickHouse release v20.3
|
||||||
|
|
||||||
|
### ClickHouse release v20.3.10.75-lts 2020-05-23
|
||||||
|
|
||||||
|
#### Bug Fix
|
||||||
|
|
||||||
|
* Removed logging from mutation finalization task if nothing was finalized. [#11109](https://github.com/ClickHouse/ClickHouse/pull/11109) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Fixed `parseDateTime64BestEffort` argument resolution bugs. [#11038](https://github.com/ClickHouse/ClickHouse/pull/11038) ([Vasily Nemkov](https://github.com/Enmk)).
|
||||||
|
* Fixed incorrect raw data size in method `getRawData()`. [#10964](https://github.com/ClickHouse/ClickHouse/pull/10964) ([Igr](https://github.com/ObjatieGroba)).
|
||||||
|
* Fixed incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of `GROUP BY` result is large and aggregation is performed by a single `String` field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed backward compatibility with tuples in `Distributed` tables. [#10889](https://github.com/ClickHouse/ClickHouse/pull/10889) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* Fixed `SIGSEGV` in `StringHashTable` if such a key does not exist. [#10870](https://github.com/ClickHouse/ClickHouse/pull/10870) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed bug in `ReplicatedMergeTree` which might cause some `ALTER` on `OPTIMIZE` query to hang waiting for some replica after it become inactive. [#10849](https://github.com/ClickHouse/ClickHouse/pull/10849) ([tavplubix](https://github.com/tavplubix)).
|
||||||
|
* Fixed columns order after `Block::sortColumns()`. [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed the issue with `ODBC` bridge when no quoting of identifiers is requested. Fixes [#7984] (https://github.com/ClickHouse/ClickHouse/issues/7984). [#10821](https://github.com/ClickHouse/ClickHouse/pull/10821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed `UBSan` and `MSan` report in `DateLUT`. [#10798](https://github.com/ClickHouse/ClickHouse/pull/10798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed incorrect type conversion in key conditions. Fixes [#6287](https://github.com/ClickHouse/ClickHouse/issues/6287). [#10791](https://github.com/ClickHouse/ClickHouse/pull/10791) ([Andrew Onyshchuk](https://github.com/oandrew))
|
||||||
|
* Fixed `parallel_view_processing` behavior. Now all insertions into `MATERIALIZED VIEW` without exception should be finished if exception happened. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#10757](https://github.com/ClickHouse/ClickHouse/pull/10757) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed combinator -`OrNull` and `-OrDefault` when combined with `-State`. [#10741](https://github.com/ClickHouse/ClickHouse/pull/10741) ([hcz](https://github.com/hczhcz)).
|
||||||
|
* Fixed crash in `generateRandom` with nested types. Fixes [#10583](https://github.com/ClickHouse/ClickHouse/issues/10583). [#10734](https://github.com/ClickHouse/ClickHouse/pull/10734) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed possible buffer overflow in function `h3EdgeAngle`. [#10711](https://github.com/ClickHouse/ClickHouse/pull/10711) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed disappearing totals. Totals could have being filtered if query had had join or subquery with external where condition. Fixes [#10674](https://github.com/ClickHouse/ClickHouse/issues/10674). [#10698](https://github.com/ClickHouse/ClickHouse/pull/10698) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed multiple usages of `IN` operator with the identical set in one query. [#10686](https://github.com/ClickHouse/ClickHouse/pull/10686) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* Fixed bug, which causes http requests stuck on client close when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. Fixes [#7939](https://github.com/ClickHouse/ClickHouse/issues/7939), [#7019](https://github.com/ClickHouse/ClickHouse/issues/7019), [#7736](https://github.com/ClickHouse/ClickHouse/issues/7736), [#7091](https://github.com/ClickHouse/ClickHouse/issues/7091). [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix)).
|
||||||
|
* Fixed order of parameters in `AggregateTransform` constructor. [#10667](https://github.com/ClickHouse/ClickHouse/pull/10667) ([palasonic1](https://github.com/palasonic1)).
|
||||||
|
* Fixed the lack of parallel execution of remote queries with `distributed_aggregation_memory_efficient` enabled. Fixes [#10655](https://github.com/ClickHouse/ClickHouse/issues/10655). [#10664](https://github.com/ClickHouse/ClickHouse/pull/10664) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed possible incorrect number of rows for queries with `LIMIT`. Fixes [#10566](https://github.com/ClickHouse/ClickHouse/issues/10566), [#10709](https://github.com/ClickHouse/ClickHouse/issues/10709). [#10660](https://github.com/ClickHouse/ClickHouse/pull/10660) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed a bug which locks concurrent alters when table has a lot of parts. [#10659](https://github.com/ClickHouse/ClickHouse/pull/10659) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Fixed a bug when on `SYSTEM DROP DNS CACHE` query also drop caches, which are used to check if user is allowed to connect from some IP addresses. [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix)).
|
||||||
|
* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table. [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed `SELECT` of column `ALIAS` which default expression type different from column type. [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Implemented comparison between DateTime64 and String values. [#10560](https://github.com/ClickHouse/ClickHouse/pull/10560) ([Vasily Nemkov](https://github.com/Enmk)).
|
||||||
|
* Fixed index corruption, which may accur in some cases after merge compact parts into another compact part. [#10531](https://github.com/ClickHouse/ClickHouse/pull/10531) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* Fixed the situation, when mutation finished all parts, but hung up in `is_done=0`. [#10526](https://github.com/ClickHouse/ClickHouse/pull/10526) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Fixed overflow at beginning of unix epoch for timezones with fractional offset from `UTC`. This fixes [#9335](https://github.com/ClickHouse/ClickHouse/issues/9335). [#10513](https://github.com/ClickHouse/ClickHouse/pull/10513) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed improper shutdown of `Distributed` storage. [#10491](https://github.com/ClickHouse/ClickHouse/pull/10491) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed numeric overflow in `simpleLinearRegression` over large integers. [#10474](https://github.com/ClickHouse/ClickHouse/pull/10474) ([hcz](https://github.com/hczhcz)).
|
||||||
|
|
||||||
|
|
||||||
|
#### Build/Testing/Packaging Improvement
|
||||||
|
|
||||||
|
* Fix UBSan report in LZ4 library. [#10631](https://github.com/ClickHouse/ClickHouse/pull/10631) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fix clang-10 build. https://github.com/ClickHouse/ClickHouse/issues/10238. [#10370](https://github.com/ClickHouse/ClickHouse/pull/10370) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* Added failing tests about `max_rows_to_sort` setting. [#10268](https://github.com/ClickHouse/ClickHouse/pull/10268) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Added some improvements in printing diagnostic info in input formats. Fixes [#10204](https://github.com/ClickHouse/ClickHouse/issues/10204). [#10418](https://github.com/ClickHouse/ClickHouse/pull/10418) ([tavplubix](https://github.com/tavplubix)).
|
||||||
|
* Added CA certificates to clickhouse-server docker image. [#10476](https://github.com/ClickHouse/ClickHouse/pull/10476) ([filimonov](https://github.com/filimonov)).
|
||||||
|
|
||||||
|
#### Bug fix
|
||||||
|
|
||||||
|
* #10551. [#10569](https://github.com/ClickHouse/ClickHouse/pull/10569) ([Winter Zhang](https://github.com/zhang2014)).
|
||||||
|
|
||||||
|
|
||||||
|
### ClickHouse release v20.3.8.53, 2020-04-23
|
||||||
|
|
||||||
|
#### Bug Fix
|
||||||
|
* Fixed wrong behaviour of datetime functions for timezones that has altered between positive and negative offsets from UTC (e.g. Pacific/Kiritimati). This fixes [#7202](https://github.com/ClickHouse/ClickHouse/issues/7202) [#10369](https://github.com/ClickHouse/ClickHouse/pull/10369) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Fix possible segfault with `distributed_group_by_no_merge` enabled (introduced in 20.3.7.46 by [#10131](https://github.com/ClickHouse/ClickHouse/issues/10131)). [#10399](https://github.com/ClickHouse/ClickHouse/pull/10399) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fix wrong flattening of `Array(Tuple(...))` data types. This fixes [#10259](https://github.com/ClickHouse/ClickHouse/issues/10259) [#10390](https://github.com/ClickHouse/ClickHouse/pull/10390) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Drop disks reservation in Aggregator. This fixes bug in disk space reservation, which may cause big external aggregation to fail even if it could be completed successfully [#10375](https://github.com/ClickHouse/ClickHouse/pull/10375) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fixed `DROP` vs `OPTIMIZE` race in `ReplicatedMergeTree`. `DROP` could left some garbage in replica path in ZooKeeper if there was concurrent `OPTIMIZE` query. [#10312](https://github.com/ClickHouse/ClickHouse/pull/10312) ([tavplubix](https://github.com/tavplubix))
|
||||||
|
* Fix bug when server cannot attach table after column default was altered. [#10441](https://github.com/ClickHouse/ClickHouse/pull/10441) ([alesapin](https://github.com/alesapin))
|
||||||
|
* Do not remove metadata directory when attach database fails before loading tables. [#10442](https://github.com/ClickHouse/ClickHouse/pull/10442) ([Winter Zhang](https://github.com/zhang2014))
|
||||||
|
* Fixed several bugs when some data was inserted with quorum, then deleted somehow (DROP PARTITION, TTL) and this leaded to the stuck of INSERTs or false-positive exceptions in SELECTs. This fixes [#9946](https://github.com/ClickHouse/ClickHouse/issues/9946) [#10188](https://github.com/ClickHouse/ClickHouse/pull/10188) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
|
||||||
|
* Fix possible `Pipeline stuck` error in `ConcatProcessor` which could have happened in remote query. [#10381](https://github.com/ClickHouse/ClickHouse/pull/10381) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
|
||||||
|
* Fixed wrong behavior in HashTable that caused compilation error when trying to read HashMap from buffer. [#10386](https://github.com/ClickHouse/ClickHouse/pull/10386) ([palasonic1](https://github.com/palasonic1))
|
||||||
|
* Allow to use `count(*)` with multiple JOINs. Fixes [#9853](https://github.com/ClickHouse/ClickHouse/issues/9853) [#10291](https://github.com/ClickHouse/ClickHouse/pull/10291) ([Artem Zuikov](https://github.com/4ertus2))
|
||||||
|
* Prefer `fallback_to_stale_replicas` over `skip_unavailable_shards`, otherwise when both settings specified and there are no up-to-date replicas the query will fail (patch from @alex-zaitsev). Fixes: [#2564](https://github.com/ClickHouse/ClickHouse/issues/2564). [#10422](https://github.com/ClickHouse/ClickHouse/pull/10422) ([Azat Khuzhin](https://github.com/azat))
|
||||||
|
* Fix the issue when a query with ARRAY JOIN, ORDER BY and LIMIT may return incomplete result. This fixes [#10226](https://github.com/ClickHouse/ClickHouse/issues/10226). Author: [Vadim Plakhtinskiy](https://github.com/VadimPlh). [#10427](https://github.com/ClickHouse/ClickHouse/pull/10427) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
* Check the number and type of arguments when creating BloomFilter index [#9623](https://github.com/ClickHouse/ClickHouse/issues/9623) [#10431](https://github.com/ClickHouse/ClickHouse/pull/10431) ([Winter Zhang](https://github.com/zhang2014))
|
||||||
|
|
||||||
|
#### Performance Improvement
|
||||||
|
* Improved performance of queries with explicitly defined sets at right side of `IN` operator and tuples in the left side. This fixes performance regression in version 20.3. [#9740](https://github.com/ClickHouse/ClickHouse/pull/9740), [#10385](https://github.com/ClickHouse/ClickHouse/pull/10385) ([Anton Popov](https://github.com/CurtizJ))
|
||||||
|
|
||||||
### ClickHouse release v20.3.7.46, 2020-04-17
|
### ClickHouse release v20.3.7.46, 2020-04-17
|
||||||
|
|
||||||
#### Bug Fix
|
#### Bug Fix
|
||||||
@ -38,7 +433,6 @@
|
|||||||
* Fix bug in `CHECK TABLE` query when table contain skip indices. [#10068](https://github.com/ClickHouse/ClickHouse/pull/10068) ([alesapin](https://github.com/alesapin)).
|
* Fix bug in `CHECK TABLE` query when table contain skip indices. [#10068](https://github.com/ClickHouse/ClickHouse/pull/10068) ([alesapin](https://github.com/alesapin)).
|
||||||
* Fix error `Cannot clone block with columns because block has 0 columns ... While executing GroupingAggregatedTransform`. It happened when setting `distributed_aggregation_memory_efficient` was enabled, and distributed query read aggregating data with different level from different shards (mixed single and two level aggregation). [#10063](https://github.com/ClickHouse/ClickHouse/pull/10063) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
* Fix error `Cannot clone block with columns because block has 0 columns ... While executing GroupingAggregatedTransform`. It happened when setting `distributed_aggregation_memory_efficient` was enabled, and distributed query read aggregating data with different level from different shards (mixed single and two level aggregation). [#10063](https://github.com/ClickHouse/ClickHouse/pull/10063) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
* Fix a segmentation fault that could occur in GROUP BY over string keys containing trailing zero bytes ([#8636](https://github.com/ClickHouse/ClickHouse/issues/8636), [#8925](https://github.com/ClickHouse/ClickHouse/issues/8925)). [#10025](https://github.com/ClickHouse/ClickHouse/pull/10025) ([Alexander Kuzmenkov](https://github.com/akuzm)).
|
* Fix a segmentation fault that could occur in GROUP BY over string keys containing trailing zero bytes ([#8636](https://github.com/ClickHouse/ClickHouse/issues/8636), [#8925](https://github.com/ClickHouse/ClickHouse/issues/8925)). [#10025](https://github.com/ClickHouse/ClickHouse/pull/10025) ([Alexander Kuzmenkov](https://github.com/akuzm)).
|
||||||
* Fix parallel distributed INSERT SELECT for remote table. This PR fixes the solution provided in [#9759](https://github.com/ClickHouse/ClickHouse/pull/9759). [#9999](https://github.com/ClickHouse/ClickHouse/pull/9999) ([Vitaly Baranov](https://github.com/vitlibar)).
|
|
||||||
* Fix the number of threads used for remote query execution (performance regression, since 20.3). This happened when query from `Distributed` table was executed simultaneously on local and remote shards. Fixes [#9965](https://github.com/ClickHouse/ClickHouse/issues/9965). [#9971](https://github.com/ClickHouse/ClickHouse/pull/9971) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
* Fix the number of threads used for remote query execution (performance regression, since 20.3). This happened when query from `Distributed` table was executed simultaneously on local and remote shards. Fixes [#9965](https://github.com/ClickHouse/ClickHouse/issues/9965). [#9971](https://github.com/ClickHouse/ClickHouse/pull/9971) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
* Fix bug in which the necessary tables weren't retrieved at one of the processing stages of queries to some databases. Fixes [#9699](https://github.com/ClickHouse/ClickHouse/issues/9699). [#9949](https://github.com/ClickHouse/ClickHouse/pull/9949) ([achulkov2](https://github.com/achulkov2)).
|
* Fix bug in which the necessary tables weren't retrieved at one of the processing stages of queries to some databases. Fixes [#9699](https://github.com/ClickHouse/ClickHouse/issues/9699). [#9949](https://github.com/ClickHouse/ClickHouse/pull/9949) ([achulkov2](https://github.com/achulkov2)).
|
||||||
* Fix 'Not found column in block' error when `JOIN` appears with `TOTALS`. Fixes [#9839](https://github.com/ClickHouse/ClickHouse/issues/9839). [#9939](https://github.com/ClickHouse/ClickHouse/pull/9939) ([Artem Zuikov](https://github.com/4ertus2)).
|
* Fix 'Not found column in block' error when `JOIN` appears with `TOTALS`. Fixes [#9839](https://github.com/ClickHouse/ClickHouse/issues/9839). [#9939](https://github.com/ClickHouse/ClickHouse/pull/9939) ([Artem Zuikov](https://github.com/4ertus2)).
|
||||||
@ -330,6 +724,35 @@
|
|||||||
|
|
||||||
## ClickHouse release v20.1
|
## ClickHouse release v20.1
|
||||||
|
|
||||||
|
### ClickHouse release v20.1.12.86, 2020-05-26
|
||||||
|
|
||||||
|
#### Bug Fix
|
||||||
|
|
||||||
|
* Fixed incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of GROUP BY result is large and aggregation is performed by a single String field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed bug, which causes http requests stuck on client close when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. Fixes [#7939](https://github.com/ClickHouse/ClickHouse/issues/7939), [#7019](https://github.com/ClickHouse/ClickHouse/issues/7019), [#7736](https://github.com/ClickHouse/ClickHouse/issues/7736), [#7091](https://github.com/ClickHouse/ClickHouse/issues/7091). [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix)).
|
||||||
|
* Fixed a bug when on `SYSTEM DROP DNS CACHE` query also drop caches, which are used to check if user is allowed to connect from some IP addresses. [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix)).
|
||||||
|
* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table. [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed the situation when mutation finished all parts, but hung up in `is_done=0`. [#10526](https://github.com/ClickHouse/ClickHouse/pull/10526) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Fixed overflow at beginning of unix epoch for timezones with fractional offset from UTC. This fixes [#9335](https://github.com/ClickHouse/ClickHouse/issues/9335). [#10513](https://github.com/ClickHouse/ClickHouse/pull/10513) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed improper shutdown of Distributed storage. [#10491](https://github.com/ClickHouse/ClickHouse/pull/10491) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed numeric overflow in `simpleLinearRegression` over large integers. [#10474](https://github.com/ClickHouse/ClickHouse/pull/10474) ([hcz](https://github.com/hczhcz)).
|
||||||
|
* Fixed removing metadata directory when attach database fails. [#10442](https://github.com/ClickHouse/ClickHouse/pull/10442) ([Winter Zhang](https://github.com/zhang2014)).
|
||||||
|
* Added a check of number and type of arguments when creating `BloomFilter` index [#9623](https://github.com/ClickHouse/ClickHouse/issues/9623). [#10431](https://github.com/ClickHouse/ClickHouse/pull/10431) ([Winter Zhang](https://github.com/zhang2014)).
|
||||||
|
* Fixed the issue when a query with `ARRAY JOIN`, `ORDER BY` and `LIMIT` may return incomplete result. This fixes [#10226](https://github.com/ClickHouse/ClickHouse/issues/10226). [#10427](https://github.com/ClickHouse/ClickHouse/pull/10427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Prefer `fallback_to_stale_replicas` over `skip_unavailable_shards`. [#10422](https://github.com/ClickHouse/ClickHouse/pull/10422) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fixed wrong flattening of `Array(Tuple(...))` data types. This fixes [#10259](https://github.com/ClickHouse/ClickHouse/issues/10259). [#10390](https://github.com/ClickHouse/ClickHouse/pull/10390) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fixed wrong behavior in `HashTable` that caused compilation error when trying to read HashMap from buffer. [#10386](https://github.com/ClickHouse/ClickHouse/pull/10386) ([palasonic1](https://github.com/palasonic1)).
|
||||||
|
* Fixed possible `Pipeline stuck` error in `ConcatProcessor` which could have happened in remote query. [#10381](https://github.com/ClickHouse/ClickHouse/pull/10381) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed error `Pipeline stuck` with `max_rows_to_group_by` and `group_by_overflow_mode = 'break'`. [#10279](https://github.com/ClickHouse/ClickHouse/pull/10279) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed several bugs when some data was inserted with quorum, then deleted somehow (DROP PARTITION, TTL) and this leaded to the stuck of INSERTs or false-positive exceptions in SELECTs. This fixes [#9946](https://github.com/ClickHouse/ClickHouse/issues/9946). [#10188](https://github.com/ClickHouse/ClickHouse/pull/10188) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
|
||||||
|
* Fixed incompatibility when versions prior to 18.12.17 are used on remote servers and newer is used on initiating server, and GROUP BY both fixed and non-fixed keys, and when two-level group by method is activated. [#3254](https://github.com/ClickHouse/ClickHouse/pull/3254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
|
||||||
|
#### Build/Testing/Packaging Improvement
|
||||||
|
|
||||||
|
* Added CA certificates to clickhouse-server docker image. [#10476](https://github.com/ClickHouse/ClickHouse/pull/10476) ([filimonov](https://github.com/filimonov)).
|
||||||
|
|
||||||
|
|
||||||
### ClickHouse release v20.1.10.70, 2020-04-17
|
### ClickHouse release v20.1.10.70, 2020-04-17
|
||||||
|
|
||||||
#### Bug Fix
|
#### Bug Fix
|
||||||
@ -765,4 +1188,4 @@
|
|||||||
#### Security Fix
|
#### Security Fix
|
||||||
* Fixed the possibility of reading directories structure in tables with `File` table engine. This fixes [#8536](https://github.com/ClickHouse/ClickHouse/issues/8536). [#8537](https://github.com/ClickHouse/ClickHouse/pull/8537) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
* Fixed the possibility of reading directories structure in tables with `File` table engine. This fixes [#8536](https://github.com/ClickHouse/ClickHouse/issues/8536). [#8537](https://github.com/ClickHouse/ClickHouse/pull/8537) ([alexey-milovidov](https://github.com/alexey-milovidov))
|
||||||
|
|
||||||
## [Changelog for 2019](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/whats_new/changelog/2019.md)
|
## [Changelog for 2019](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/whats-new/changelog/2019.md)
|
||||||
|
|||||||
113
CMakeLists.txt
113
CMakeLists.txt
@ -30,7 +30,11 @@ set(CMAKE_LINK_DEPENDS_NO_SHARED 1) # Do not relink all depended targets on .so
|
|||||||
set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Debug;Release;MinSizeRel" CACHE STRING "" FORCE)
|
set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Debug;Release;MinSizeRel" CACHE STRING "" FORCE)
|
||||||
set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Generate debug library name with a postfix.") # To be consistent with CMakeLists from contrib libs.
|
set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Generate debug library name with a postfix.") # To be consistent with CMakeLists from contrib libs.
|
||||||
|
|
||||||
option(ENABLE_IPO "Enable inter-procedural optimization (aka LTO)" OFF) # need cmake 3.9+
|
# Enable the ability to organize targets into hierarchies of "folders" for capable GUI-based IDEs.
|
||||||
|
# For more info see https://cmake.org/cmake/help/latest/prop_gbl/USE_FOLDERS.html
|
||||||
|
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||||
|
|
||||||
|
option(ENABLE_IPO "Enable full link time optimization (it's usually impractical; see also ENABLE_THINLTO)" OFF) # need cmake 3.9+
|
||||||
if(ENABLE_IPO)
|
if(ENABLE_IPO)
|
||||||
cmake_policy(SET CMP0069 NEW)
|
cmake_policy(SET CMP0069 NEW)
|
||||||
include(CheckIPOSupported)
|
include(CheckIPOSupported)
|
||||||
@ -53,12 +57,12 @@ endif ()
|
|||||||
include (cmake/find/ccache.cmake)
|
include (cmake/find/ccache.cmake)
|
||||||
|
|
||||||
if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "None")
|
if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "None")
|
||||||
message (STATUS "CMAKE_BUILD_TYPE is not set, set to default = RELWITHDEBINFO")
|
set (CMAKE_BUILD_TYPE "RelWithDebInfo")
|
||||||
set (CMAKE_BUILD_TYPE "RELWITHDEBINFO")
|
message (STATUS "CMAKE_BUILD_TYPE is not set, set to default = ${CMAKE_BUILD_TYPE}")
|
||||||
endif ()
|
endif ()
|
||||||
string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC)
|
|
||||||
message (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
|
message (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
|
||||||
|
|
||||||
|
string (TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC)
|
||||||
|
|
||||||
option (USE_STATIC_LIBRARIES "Set to FALSE to use shared libraries" ON)
|
option (USE_STATIC_LIBRARIES "Set to FALSE to use shared libraries" ON)
|
||||||
option (MAKE_STATIC_LIBRARIES "Set to FALSE to make shared libraries" ${USE_STATIC_LIBRARIES})
|
option (MAKE_STATIC_LIBRARIES "Set to FALSE to make shared libraries" ${USE_STATIC_LIBRARIES})
|
||||||
@ -99,16 +103,7 @@ endif ()
|
|||||||
include (cmake/add_warning.cmake)
|
include (cmake/add_warning.cmake)
|
||||||
|
|
||||||
if (NOT MSVC)
|
if (NOT MSVC)
|
||||||
set (COMMON_WARNING_FLAGS "${COMMON_WARNING_FLAGS} -Wall") # -Werror is also added inside directories with our own code.
|
set (COMMON_WARNING_FLAGS "${COMMON_WARNING_FLAGS} -Wall") # -Werror and many more is also added inside cmake/warnings.cmake
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (COMPILER_GCC OR COMPILER_CLANG)
|
|
||||||
set (CXX_WARNING_FLAGS "${CXX_WARNING_FLAGS} -Wnon-virtual-dtor")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (COMPILER_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "8.3.0")
|
|
||||||
# Warnings in protobuf generating
|
|
||||||
set (CXX_WARNING_FLAGS "${CXX_WARNING_FLAGS} -Wno-array-bounds")
|
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (COMPILER_CLANG)
|
if (COMPILER_CLANG)
|
||||||
@ -188,16 +183,16 @@ endif ()
|
|||||||
|
|
||||||
option(WITH_COVERAGE "Build with coverage." 0)
|
option(WITH_COVERAGE "Build with coverage." 0)
|
||||||
|
|
||||||
if(WITH_COVERAGE AND COMPILER_CLANG)
|
if (WITH_COVERAGE AND COMPILER_CLANG)
|
||||||
set(COMPILER_FLAGS "${COMPILER_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
|
set(COMPILER_FLAGS "${COMPILER_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
|
||||||
# If we want to disable coverage for specific translation units
|
# If we want to disable coverage for specific translation units
|
||||||
set(WITHOUT_COVERAGE "-fno-profile-instr-generate -fno-coverage-mapping")
|
set(WITHOUT_COVERAGE "-fno-profile-instr-generate -fno-coverage-mapping")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_COVERAGE AND COMPILER_GCC)
|
if (WITH_COVERAGE AND COMPILER_GCC)
|
||||||
set(COMPILER_FLAGS "${COMPILER_FLAGS} -fprofile-arcs -ftest-coverage")
|
set(COMPILER_FLAGS "${COMPILER_FLAGS} -fprofile-arcs -ftest-coverage")
|
||||||
set(COVERAGE_OPTION "-lgcov")
|
set(COVERAGE_OPTION "-lgcov")
|
||||||
set(WITHOUT_COVERAGE "-fno-profile-arcs -fno-test-coverage")
|
set(WITHOUT_COVERAGE "-fno-profile-arcs -fno-test-coverage")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set (CMAKE_BUILD_COLOR_MAKEFILE ON)
|
set (CMAKE_BUILD_COLOR_MAKEFILE ON)
|
||||||
@ -210,18 +205,44 @@ set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 ${
|
|||||||
set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g3 -ggdb3 -fno-inline ${CMAKE_C_FLAGS_ADD}")
|
set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g3 -ggdb3 -fno-inline ${CMAKE_C_FLAGS_ADD}")
|
||||||
|
|
||||||
if (COMPILER_CLANG)
|
if (COMPILER_CLANG)
|
||||||
# Exception unwinding doesn't work in clang release build without this option
|
|
||||||
# TODO investigate that
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer")
|
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-omit-frame-pointer")
|
|
||||||
|
|
||||||
if (OS_DARWIN)
|
if (OS_DARWIN)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wl,-U,_inside_main")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-U,_inside_main")
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-U,_inside_main")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Display absolute paths in error messages. Otherwise KDevelop fails to navigate to correct file and opens a new file instead.
|
# Display absolute paths in error messages. Otherwise KDevelop fails to navigate to correct file and opens a new file instead.
|
||||||
set(COMPILER_FLAGS "${COMPILER_FLAGS} -fdiagnostics-absolute-paths")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-absolute-paths")
|
||||||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-absolute-paths")
|
||||||
|
|
||||||
|
option(ENABLE_THINLTO "Enable Thin LTO. Only applicable for clang. It's also suppressed when building with tests or sanitizers." ON)
|
||||||
|
|
||||||
|
# We cannot afford to use LTO when compiling unitests, and it's not enough
|
||||||
|
# to only supply -fno-lto at the final linking stage. So we disable it
|
||||||
|
# completely.
|
||||||
|
if (ENABLE_THINLTO AND NOT ENABLE_TESTS AND NOT SANITIZE)
|
||||||
|
# Link time optimization
|
||||||
|
set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -flto=thin")
|
||||||
|
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -flto=thin")
|
||||||
|
set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -flto=thin")
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
# Always prefer llvm tools when using clang. For instance, we cannot use GNU ar when llvm LTO is enabled
|
||||||
|
|
||||||
|
find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
|
||||||
|
if (LLVM_AR_PATH)
|
||||||
|
message(STATUS "Using llvm-ar: ${LLVM_AR_PATH}.")
|
||||||
|
set (CMAKE_AR ${LLVM_AR_PATH})
|
||||||
|
else ()
|
||||||
|
message(WARNING "Cannot find llvm-ar. System ar will be used instead. It does not work with ThinLTO.")
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-10" "llvm-ranlib-9" "llvm-ranlib-8")
|
||||||
|
if (LLVM_RANLIB_PATH)
|
||||||
|
message(STATUS "Using llvm-ranlib: ${LLVM_RANLIB_PATH}.")
|
||||||
|
set (CMAKE_RANLIB ${LLVM_RANLIB_PATH})
|
||||||
|
else ()
|
||||||
|
message(WARNING "Cannot find llvm-ranlib. System ranlib will be used instead. It does not work with ThinLTO.")
|
||||||
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
option (ENABLE_LIBRARIES "Enable all libraries (Global default switch)" ON)
|
option (ENABLE_LIBRARIES "Enable all libraries (Global default switch)" ON)
|
||||||
@ -247,7 +268,7 @@ endif ()
|
|||||||
# Make this extra-checks for correct library dependencies.
|
# Make this extra-checks for correct library dependencies.
|
||||||
if (OS_LINUX AND NOT SANITIZE)
|
if (OS_LINUX AND NOT SANITIZE)
|
||||||
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
|
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
|
||||||
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
|
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
include(cmake/dbms_glob_sources.cmake)
|
include(cmake/dbms_glob_sources.cmake)
|
||||||
@ -264,7 +285,6 @@ endif ()
|
|||||||
### Add targets below this comment ###
|
### Add targets below this comment ###
|
||||||
######################################
|
######################################
|
||||||
|
|
||||||
string (TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC)
|
|
||||||
set (CMAKE_POSTFIX_VARIABLE "CMAKE_${CMAKE_BUILD_TYPE_UC}_POSTFIX")
|
set (CMAKE_POSTFIX_VARIABLE "CMAKE_${CMAKE_BUILD_TYPE_UC}_POSTFIX")
|
||||||
|
|
||||||
if (MAKE_STATIC_LIBRARIES)
|
if (MAKE_STATIC_LIBRARIES)
|
||||||
@ -305,34 +325,26 @@ endif ()
|
|||||||
|
|
||||||
message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE} ; USE_STATIC_LIBRARIES=${USE_STATIC_LIBRARIES} MAKE_STATIC_LIBRARIES=${MAKE_STATIC_LIBRARIES} SPLIT_SHARED=${SPLIT_SHARED_LIBRARIES} UNBUNDLED=${UNBUNDLED} CCACHE=${CCACHE_FOUND} ${CCACHE_VERSION}")
|
message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE} ; USE_STATIC_LIBRARIES=${USE_STATIC_LIBRARIES} MAKE_STATIC_LIBRARIES=${MAKE_STATIC_LIBRARIES} SPLIT_SHARED=${SPLIT_SHARED_LIBRARIES} UNBUNDLED=${UNBUNDLED} CCACHE=${CCACHE_FOUND} ${CCACHE_VERSION}")
|
||||||
|
|
||||||
include(GNUInstallDirs)
|
include (GNUInstallDirs)
|
||||||
include (cmake/contrib_finder.cmake)
|
include (cmake/contrib_finder.cmake)
|
||||||
include (cmake/lib_name.cmake)
|
|
||||||
|
|
||||||
find_contrib_lib(double-conversion) # Must be before parquet
|
find_contrib_lib(double-conversion) # Must be before parquet
|
||||||
include (cmake/find/ssl.cmake)
|
include (cmake/find/ssl.cmake)
|
||||||
|
include (cmake/find/ldap.cmake) # after ssl
|
||||||
include (cmake/find/icu.cmake)
|
include (cmake/find/icu.cmake)
|
||||||
include (cmake/find/boost.cmake)
|
|
||||||
include (cmake/find/zlib.cmake)
|
include (cmake/find/zlib.cmake)
|
||||||
include (cmake/find/zstd.cmake)
|
include (cmake/find/zstd.cmake)
|
||||||
include (cmake/find/ltdl.cmake) # for odbc
|
include (cmake/find/ltdl.cmake) # for odbc
|
||||||
include (cmake/find/termcap.cmake)
|
include (cmake/find/termcap.cmake)
|
||||||
include (cmake/find/odbc.cmake)
|
# openssl, zlib before poco
|
||||||
# openssl, zlib, odbc before poco
|
|
||||||
include (cmake/find/poco.cmake)
|
|
||||||
include (cmake/find/lz4.cmake)
|
|
||||||
include (cmake/find/xxhash.cmake)
|
|
||||||
include (cmake/find/sparsehash.cmake)
|
include (cmake/find/sparsehash.cmake)
|
||||||
include (cmake/find/re2.cmake)
|
include (cmake/find/re2.cmake)
|
||||||
include (cmake/find/libgsasl.cmake)
|
include (cmake/find/libgsasl.cmake)
|
||||||
include (cmake/find/rdkafka.cmake)
|
include (cmake/find/rdkafka.cmake)
|
||||||
include (cmake/find/capnp.cmake)
|
include (cmake/find/capnp.cmake)
|
||||||
include (cmake/find/llvm.cmake)
|
include (cmake/find/llvm.cmake)
|
||||||
|
include (cmake/find/opencl.cmake)
|
||||||
include (cmake/find/h3.cmake)
|
include (cmake/find/h3.cmake)
|
||||||
include (cmake/find/cpuid.cmake) # Freebsd, bundled
|
|
||||||
if (NOT USE_CPUID)
|
|
||||||
include (cmake/find/cpuinfo.cmake) # Debian
|
|
||||||
endif()
|
|
||||||
include (cmake/find/libxml2.cmake)
|
include (cmake/find/libxml2.cmake)
|
||||||
include (cmake/find/brotli.cmake)
|
include (cmake/find/brotli.cmake)
|
||||||
include (cmake/find/protobuf.cmake)
|
include (cmake/find/protobuf.cmake)
|
||||||
@ -342,17 +354,16 @@ include (cmake/find/hdfs3.cmake) # uses protobuf
|
|||||||
include (cmake/find/s3.cmake)
|
include (cmake/find/s3.cmake)
|
||||||
include (cmake/find/base64.cmake)
|
include (cmake/find/base64.cmake)
|
||||||
include (cmake/find/parquet.cmake)
|
include (cmake/find/parquet.cmake)
|
||||||
include (cmake/find/hyperscan.cmake)
|
|
||||||
include (cmake/find/simdjson.cmake)
|
include (cmake/find/simdjson.cmake)
|
||||||
include (cmake/find/rapidjson.cmake)
|
include (cmake/find/rapidjson.cmake)
|
||||||
include (cmake/find/fastops.cmake)
|
include (cmake/find/fastops.cmake)
|
||||||
include (cmake/find/orc.cmake)
|
include (cmake/find/orc.cmake)
|
||||||
include (cmake/find/avro.cmake)
|
include (cmake/find/avro.cmake)
|
||||||
include (cmake/find/msgpack.cmake)
|
include (cmake/find/msgpack.cmake)
|
||||||
|
include (cmake/find/cassandra.cmake)
|
||||||
|
|
||||||
find_contrib_lib(cityhash)
|
find_contrib_lib(cityhash)
|
||||||
find_contrib_lib(farmhash)
|
find_contrib_lib(farmhash)
|
||||||
find_contrib_lib(metrohash)
|
|
||||||
find_contrib_lib(btrie)
|
find_contrib_lib(btrie)
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
@ -368,6 +379,13 @@ if (OS_LINUX AND NOT ENABLE_JEMALLOC)
|
|||||||
message (WARNING "Non default allocator is disabled. This is not recommended for production Linux builds.")
|
message (WARNING "Non default allocator is disabled. This is not recommended for production Linux builds.")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
if (USE_OPENCL)
|
||||||
|
if (OS_DARWIN)
|
||||||
|
set(OPENCL_LINKER_FLAGS "-framework OpenCL")
|
||||||
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OPENCL_LINKER_FLAGS}")
|
||||||
|
endif ()
|
||||||
|
endif ()
|
||||||
|
|
||||||
include (cmake/print_flags.cmake)
|
include (cmake/print_flags.cmake)
|
||||||
|
|
||||||
if (TARGET global-group)
|
if (TARGET global-group)
|
||||||
@ -390,6 +408,9 @@ endmacro()
|
|||||||
set(ConfigIncludePath ${CMAKE_CURRENT_BINARY_DIR}/includes/configs CACHE INTERNAL "Path to generated configuration files.")
|
set(ConfigIncludePath ${CMAKE_CURRENT_BINARY_DIR}/includes/configs CACHE INTERNAL "Path to generated configuration files.")
|
||||||
include_directories(${ConfigIncludePath})
|
include_directories(${ConfigIncludePath})
|
||||||
|
|
||||||
|
# Add as many warnings as possible for our own code.
|
||||||
|
include (cmake/warnings.cmake)
|
||||||
|
|
||||||
add_subdirectory (base)
|
add_subdirectory (base)
|
||||||
add_subdirectory (programs)
|
add_subdirectory (programs)
|
||||||
add_subdirectory (src)
|
add_subdirectory (src)
|
||||||
|
|||||||
@ -10,10 +10,12 @@ ClickHouse is an open-source column-oriented database management system that all
|
|||||||
* [YouTube channel](https://www.youtube.com/c/ClickHouseDB) has a lot of content about ClickHouse in video format.
|
* [YouTube channel](https://www.youtube.com/c/ClickHouseDB) has a lot of content about ClickHouse in video format.
|
||||||
* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-d2zxkf9e-XyxDa_ucfPxzuH4SJIm~Ng) and [Telegram](https://telegram.me/clickhouse_en) allow to chat with ClickHouse users in real-time.
|
* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-d2zxkf9e-XyxDa_ucfPxzuH4SJIm~Ng) and [Telegram](https://telegram.me/clickhouse_en) allow to chat with ClickHouse users in real-time.
|
||||||
* [Blog](https://clickhouse.yandex/blog/en/) contains various ClickHouse-related articles, as well as announces and reports about events.
|
* [Blog](https://clickhouse.yandex/blog/en/) contains various ClickHouse-related articles, as well as announces and reports about events.
|
||||||
|
* [Yandex.Messenger channel](https://yandex.ru/chat/#/join/20e380d9-c7be-4123-ab06-e95fb946975e) shares announcements and useful links in Russian.
|
||||||
* [Contacts](https://clickhouse.tech/#contacts) can help to get your questions answered if there are any.
|
* [Contacts](https://clickhouse.tech/#contacts) can help to get your questions answered if there are any.
|
||||||
* You can also [fill this form](https://clickhouse.tech/#meet) to meet Yandex ClickHouse team in person.
|
* You can also [fill this form](https://clickhouse.tech/#meet) to meet Yandex ClickHouse team in person.
|
||||||
|
|
||||||
## Upcoming Events
|
## Upcoming Events
|
||||||
|
|
||||||
|
* [ClickHouse Online Meetup (in Russian)](https://events.yandex.ru/events/click-house-onlajn-vs-18-06-2020) on June 18, 2020.
|
||||||
* [ClickHouse Workshop in Novosibirsk](https://2020.codefest.ru/lecture/1628) on TBD date.
|
* [ClickHouse Workshop in Novosibirsk](https://2020.codefest.ru/lecture/1628) on TBD date.
|
||||||
* [Yandex C++ Open-Source Sprints in Moscow](https://events.yandex.ru/events/otkrytyj-kod-v-yandek-28-03-2020) on TBD date.
|
* [Yandex C++ Open-Source Sprints in Moscow](https://events.yandex.ru/events/otkrytyj-kod-v-yandek-28-03-2020) on TBD date.
|
||||||
|
|||||||
@ -1,5 +1,3 @@
|
|||||||
configure_file (config_common.h.in config_common.h)
|
|
||||||
|
|
||||||
set (SRCS
|
set (SRCS
|
||||||
argsToConfig.cpp
|
argsToConfig.cpp
|
||||||
coverage.cpp
|
coverage.cpp
|
||||||
@ -13,11 +11,12 @@ set (SRCS
|
|||||||
LineReader.cpp
|
LineReader.cpp
|
||||||
mremap.cpp
|
mremap.cpp
|
||||||
phdr_cache.cpp
|
phdr_cache.cpp
|
||||||
preciseExp10.c
|
preciseExp10.cpp
|
||||||
setTerminalEcho.cpp
|
setTerminalEcho.cpp
|
||||||
shift10.cpp
|
shift10.cpp
|
||||||
sleep.cpp
|
sleep.cpp
|
||||||
terminalColors.cpp
|
terminalColors.cpp
|
||||||
|
errnoToString.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
if (ENABLE_REPLXX)
|
if (ENABLE_REPLXX)
|
||||||
@ -45,15 +44,7 @@ endif()
|
|||||||
|
|
||||||
target_include_directories(common PUBLIC .. ${CMAKE_CURRENT_BINARY_DIR}/..)
|
target_include_directories(common PUBLIC .. ${CMAKE_CURRENT_BINARY_DIR}/..)
|
||||||
|
|
||||||
if (NOT USE_INTERNAL_BOOST_LIBRARY)
|
# Allow explicit fallback to readline
|
||||||
target_include_directories (common SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if(NOT USE_INTERNAL_POCO_LIBRARY)
|
|
||||||
target_include_directories (common SYSTEM BEFORE PUBLIC ${Poco_Foundation_INCLUDE_DIR})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# allow explicitly fallback to readline
|
|
||||||
if (NOT ENABLE_REPLXX AND ENABLE_READLINE)
|
if (NOT ENABLE_REPLXX AND ENABLE_READLINE)
|
||||||
message (STATUS "Attempt to fallback to readline explicitly")
|
message (STATUS "Attempt to fallback to readline explicitly")
|
||||||
set (READLINE_PATHS "/usr/local/opt/readline/lib")
|
set (READLINE_PATHS "/usr/local/opt/readline/lib")
|
||||||
@ -77,13 +68,16 @@ endif ()
|
|||||||
|
|
||||||
target_link_libraries (common
|
target_link_libraries (common
|
||||||
PUBLIC
|
PUBLIC
|
||||||
${Poco_Net_LIBRARY}
|
|
||||||
${Poco_Util_LIBRARY}
|
|
||||||
${Poco_Foundation_LIBRARY}
|
|
||||||
${CITYHASH_LIBRARIES}
|
${CITYHASH_LIBRARIES}
|
||||||
${Boost_SYSTEM_LIBRARY}
|
boost::headers_only
|
||||||
|
boost::system
|
||||||
FastMemcpy
|
FastMemcpy
|
||||||
|
Poco::Net
|
||||||
|
Poco::Net::SSL
|
||||||
|
Poco::Util
|
||||||
|
Poco::Foundation
|
||||||
replxx
|
replxx
|
||||||
|
fmt
|
||||||
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
cctz
|
cctz
|
||||||
|
|||||||
@ -31,9 +31,8 @@ UInt8 getDayOfWeek(const cctz::civil_day & date)
|
|||||||
case cctz::weekday::friday: return 5;
|
case cctz::weekday::friday: return 5;
|
||||||
case cctz::weekday::saturday: return 6;
|
case cctz::weekday::saturday: return 6;
|
||||||
case cctz::weekday::sunday: return 7;
|
case cctz::weekday::sunday: return 7;
|
||||||
default:
|
|
||||||
throw Poco::Exception("Logical error: incorrect week day.");
|
|
||||||
}
|
}
|
||||||
|
__builtin_unreachable();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -75,6 +74,11 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_)
|
|||||||
values.day_of_week = getDayOfWeek(date);
|
values.day_of_week = getDayOfWeek(date);
|
||||||
values.date = start_of_day;
|
values.date = start_of_day;
|
||||||
|
|
||||||
|
assert(values.year >= DATE_LUT_MIN_YEAR && values.year <= DATE_LUT_MAX_YEAR);
|
||||||
|
assert(values.month >= 1 && values.month <= 12);
|
||||||
|
assert(values.day_of_month >= 1 && values.day_of_month <= 31);
|
||||||
|
assert(values.day_of_week >= 1 && values.day_of_week <= 7);
|
||||||
|
|
||||||
if (values.day_of_month == 1)
|
if (values.day_of_month == 1)
|
||||||
{
|
{
|
||||||
cctz::civil_month month(date);
|
cctz::civil_month month(date);
|
||||||
@ -131,7 +135,7 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_)
|
|||||||
/// Fill excessive part of lookup table. This is needed only to simplify handling of overflow cases.
|
/// Fill excessive part of lookup table. This is needed only to simplify handling of overflow cases.
|
||||||
while (i < DATE_LUT_SIZE)
|
while (i < DATE_LUT_SIZE)
|
||||||
{
|
{
|
||||||
lut[i] = lut[DATE_LUT_MAX_DAY_NUM];
|
lut[i] = lut[i - 1];
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -37,7 +37,12 @@ using YearWeek = std::pair<UInt16, UInt8>;
|
|||||||
class DateLUTImpl
|
class DateLUTImpl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
DateLUTImpl(const std::string & time_zone);
|
explicit DateLUTImpl(const std::string & time_zone);
|
||||||
|
|
||||||
|
DateLUTImpl(const DateLUTImpl &) = delete;
|
||||||
|
DateLUTImpl & operator=(const DateLUTImpl &) = delete;
|
||||||
|
DateLUTImpl(const DateLUTImpl &&) = delete;
|
||||||
|
DateLUTImpl & operator=(const DateLUTImpl &&) = delete;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/// The order of fields matters for alignment and sizeof.
|
/// The order of fields matters for alignment and sizeof.
|
||||||
|
|||||||
@ -28,7 +28,7 @@ public:
|
|||||||
void exception() override { logException(); }
|
void exception() override { logException(); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Logger * log = &Logger::get("ServerErrorHandler");
|
Poco::Logger * log = &Poco::Logger::get("ServerErrorHandler");
|
||||||
|
|
||||||
void logException()
|
void logException()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -451,7 +451,10 @@ JSON JSON::operator[] (size_t n) const
|
|||||||
size_t i = 0;
|
size_t i = 0;
|
||||||
const_iterator it = begin();
|
const_iterator it = begin();
|
||||||
while (i < n && it != end())
|
while (i < n && it != end())
|
||||||
++it, ++i;
|
{
|
||||||
|
++it;
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
|
||||||
if (i != n)
|
if (i != n)
|
||||||
throw JSONException("JSON: array index " + std::to_string(n) + " out of bounds.");
|
throw JSONException("JSON: array index " + std::to_string(n) + " out of bounds.");
|
||||||
@ -626,7 +629,7 @@ std::string JSON::getString() const
|
|||||||
{
|
{
|
||||||
unicode = Poco::NumberParser::parseHex(hex);
|
unicode = Poco::NumberParser::parseHex(hex);
|
||||||
}
|
}
|
||||||
catch (const Poco::SyntaxException & e)
|
catch (const Poco::SyntaxException &)
|
||||||
{
|
{
|
||||||
throw JSONException("JSON: incorrect syntax: incorrect HEX code.");
|
throw JSONException("JSON: incorrect syntax: incorrect HEX code.");
|
||||||
}
|
}
|
||||||
|
|||||||
@ -67,8 +67,8 @@ LineReader::Suggest::WordsRange LineReader::Suggest::getCompletions(const String
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
LineReader::LineReader(const String & history_file_path_, char extender_, char delimiter_)
|
LineReader::LineReader(const String & history_file_path_, bool multiline_, Patterns extenders_, Patterns delimiters_)
|
||||||
: history_file_path(history_file_path_), extender(extender_), delimiter(delimiter_)
|
: history_file_path(history_file_path_), multiline(multiline_), extenders(std::move(extenders_)), delimiters(std::move(delimiters_))
|
||||||
{
|
{
|
||||||
/// FIXME: check extender != delimiter
|
/// FIXME: check extender != delimiter
|
||||||
}
|
}
|
||||||
@ -76,38 +76,60 @@ LineReader::LineReader(const String & history_file_path_, char extender_, char d
|
|||||||
String LineReader::readLine(const String & first_prompt, const String & second_prompt)
|
String LineReader::readLine(const String & first_prompt, const String & second_prompt)
|
||||||
{
|
{
|
||||||
String line;
|
String line;
|
||||||
bool is_multiline = false;
|
bool need_next_line = false;
|
||||||
|
|
||||||
while (auto status = readOneLine(is_multiline ? second_prompt : first_prompt))
|
while (auto status = readOneLine(need_next_line ? second_prompt : first_prompt))
|
||||||
{
|
{
|
||||||
if (status == RESET_LINE)
|
if (status == RESET_LINE)
|
||||||
{
|
{
|
||||||
line.clear();
|
line.clear();
|
||||||
is_multiline = false;
|
need_next_line = false;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input.empty())
|
if (input.empty())
|
||||||
{
|
{
|
||||||
if (!line.empty() && !delimiter && !hasInputData())
|
if (!line.empty() && !multiline && !hasInputData())
|
||||||
break;
|
break;
|
||||||
else
|
else
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
is_multiline = (input.back() == extender) || (delimiter && input.back() != delimiter) || hasInputData();
|
#if !defined(ARCADIA_BUILD) /// C++20
|
||||||
|
const char * has_extender = nullptr;
|
||||||
if (input.back() == extender)
|
for (const auto * extender : extenders)
|
||||||
{
|
{
|
||||||
input = input.substr(0, input.size() - 1);
|
if (input.ends_with(extender))
|
||||||
|
{
|
||||||
|
has_extender = extender;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const char * has_delimiter = nullptr;
|
||||||
|
for (const auto * delimiter : delimiters)
|
||||||
|
{
|
||||||
|
if (input.ends_with(delimiter))
|
||||||
|
{
|
||||||
|
has_delimiter = delimiter;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
need_next_line = has_extender || (multiline && !has_delimiter) || hasInputData();
|
||||||
|
|
||||||
|
if (has_extender)
|
||||||
|
{
|
||||||
|
input.resize(input.size() - strlen(has_extender));
|
||||||
trim(input);
|
trim(input);
|
||||||
if (input.empty())
|
if (input.empty())
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
line += (line.empty() ? "" : " ") + input;
|
line += (line.empty() ? "" : " ") + input;
|
||||||
|
|
||||||
if (!is_multiline)
|
if (!need_next_line)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,9 @@ public:
|
|||||||
WordsRange getCompletions(const String & prefix, size_t prefix_length) const;
|
WordsRange getCompletions(const String & prefix, size_t prefix_length) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
LineReader(const String & history_file_path, char extender, char delimiter = 0); /// if delimiter != 0, then it's multiline mode
|
using Patterns = std::vector<const char *>;
|
||||||
|
|
||||||
|
LineReader(const String & history_file_path, bool multiline, Patterns extenders, Patterns delimiters);
|
||||||
virtual ~LineReader() {}
|
virtual ~LineReader() {}
|
||||||
|
|
||||||
/// Reads the whole line until delimiter (in multiline mode) or until the last line without extender.
|
/// Reads the whole line until delimiter (in multiline mode) or until the last line without extender.
|
||||||
@ -51,8 +53,10 @@ protected:
|
|||||||
String input;
|
String input;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const char extender;
|
bool multiline;
|
||||||
const char delimiter;
|
|
||||||
|
Patterns extenders;
|
||||||
|
Patterns delimiters;
|
||||||
|
|
||||||
String prev_line;
|
String prev_line;
|
||||||
|
|
||||||
|
|||||||
@ -56,8 +56,9 @@ static char * generate(const char * text, int state)
|
|||||||
return nextMatch();
|
return nextMatch();
|
||||||
};
|
};
|
||||||
|
|
||||||
ReadlineLineReader::ReadlineLineReader(const Suggest & suggest_, const String & history_file_path_, char extender_, char delimiter_)
|
ReadlineLineReader::ReadlineLineReader(
|
||||||
: LineReader(history_file_path_, extender_, delimiter_)
|
const Suggest & suggest_, const String & history_file_path_, bool multiline_, Patterns extenders_, Patterns delimiters_)
|
||||||
|
: LineReader(history_file_path_, multiline_, std::move(extenders_), std::move(delimiters_))
|
||||||
{
|
{
|
||||||
suggest = &suggest_;
|
suggest = &suggest_;
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
class ReadlineLineReader : public LineReader
|
class ReadlineLineReader : public LineReader
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ReadlineLineReader(const Suggest & suggest, const String & history_file_path, char extender, char delimiter = 0);
|
ReadlineLineReader(const Suggest & suggest, const String & history_file_path, bool multiline, Patterns extenders_, Patterns delimiters_);
|
||||||
~ReadlineLineReader() override;
|
~ReadlineLineReader() override;
|
||||||
|
|
||||||
void enableBracketedPaste() override;
|
void enableBracketedPaste() override;
|
||||||
|
|||||||
@ -1,9 +1,11 @@
|
|||||||
#include <common/ReplxxLineReader.h>
|
#include <common/ReplxxLineReader.h>
|
||||||
|
#include <common/errnoToString.h>
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
#include <sys/file.h>
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
@ -16,14 +18,42 @@ void trim(String & s)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ReplxxLineReader::ReplxxLineReader(const Suggest & suggest, const String & history_file_path_, char extender_, char delimiter_)
|
ReplxxLineReader::ReplxxLineReader(
|
||||||
: LineReader(history_file_path_, extender_, delimiter_)
|
const Suggest & suggest,
|
||||||
|
const String & history_file_path_,
|
||||||
|
bool multiline_,
|
||||||
|
Patterns extenders_,
|
||||||
|
Patterns delimiters_,
|
||||||
|
replxx::Replxx::highlighter_callback_t highlighter_)
|
||||||
|
: LineReader(history_file_path_, multiline_, std::move(extenders_), std::move(delimiters_)), highlighter(std::move(highlighter_))
|
||||||
{
|
{
|
||||||
using namespace std::placeholders;
|
using namespace std::placeholders;
|
||||||
using Replxx = replxx::Replxx;
|
using Replxx = replxx::Replxx;
|
||||||
|
|
||||||
if (!history_file_path.empty())
|
if (!history_file_path.empty())
|
||||||
rx.history_load(history_file_path);
|
{
|
||||||
|
history_file_fd = open(history_file_path.c_str(), O_RDWR);
|
||||||
|
if (history_file_fd < 0)
|
||||||
|
{
|
||||||
|
rx.print("Open of history file failed: %s\n", errnoToString(errno).c_str());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (flock(history_file_fd, LOCK_SH))
|
||||||
|
{
|
||||||
|
rx.print("Shared lock of history file failed: %s\n", errnoToString(errno).c_str());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
rx.history_load(history_file_path);
|
||||||
|
|
||||||
|
if (flock(history_file_fd, LOCK_UN))
|
||||||
|
{
|
||||||
|
rx.print("Unlock of history file failed: %s\n", errnoToString(errno).c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
auto callback = [&suggest] (const String & context, size_t context_size)
|
auto callback = [&suggest] (const String & context, size_t context_size)
|
||||||
{
|
{
|
||||||
@ -35,6 +65,9 @@ ReplxxLineReader::ReplxxLineReader(const Suggest & suggest, const String & histo
|
|||||||
rx.set_complete_on_empty(false);
|
rx.set_complete_on_empty(false);
|
||||||
rx.set_word_break_characters(word_break_characters);
|
rx.set_word_break_characters(word_break_characters);
|
||||||
|
|
||||||
|
if (highlighter)
|
||||||
|
rx.set_highlighter_callback(highlighter);
|
||||||
|
|
||||||
/// By default C-p/C-n binded to COMPLETE_NEXT/COMPLETE_PREV,
|
/// By default C-p/C-n binded to COMPLETE_NEXT/COMPLETE_PREV,
|
||||||
/// bind C-p/C-n to history-previous/history-next like readline.
|
/// bind C-p/C-n to history-previous/history-next like readline.
|
||||||
rx.bind_key(Replxx::KEY::control('N'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::HISTORY_NEXT, code); });
|
rx.bind_key(Replxx::KEY::control('N'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::HISTORY_NEXT, code); });
|
||||||
@ -48,8 +81,8 @@ ReplxxLineReader::ReplxxLineReader(const Suggest & suggest, const String & histo
|
|||||||
|
|
||||||
ReplxxLineReader::~ReplxxLineReader()
|
ReplxxLineReader::~ReplxxLineReader()
|
||||||
{
|
{
|
||||||
if (!history_file_path.empty())
|
if (close(history_file_fd))
|
||||||
rx.history_save(history_file_path);
|
rx.print("Close of history file failed: %s\n", strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
LineReader::InputStatus ReplxxLineReader::readOneLine(const String & prompt)
|
LineReader::InputStatus ReplxxLineReader::readOneLine(const String & prompt)
|
||||||
@ -67,7 +100,20 @@ LineReader::InputStatus ReplxxLineReader::readOneLine(const String & prompt)
|
|||||||
|
|
||||||
void ReplxxLineReader::addToHistory(const String & line)
|
void ReplxxLineReader::addToHistory(const String & line)
|
||||||
{
|
{
|
||||||
|
// locking history file to prevent from inconsistent concurrent changes
|
||||||
|
bool locked = false;
|
||||||
|
if (flock(history_file_fd, LOCK_EX))
|
||||||
|
rx.print("Lock of history file failed: %s\n", strerror(errno));
|
||||||
|
else
|
||||||
|
locked = true;
|
||||||
|
|
||||||
rx.history_add(line);
|
rx.history_add(line);
|
||||||
|
|
||||||
|
// flush changes to the disk
|
||||||
|
rx.history_save(history_file_path);
|
||||||
|
|
||||||
|
if (locked && 0 != flock(history_file_fd, LOCK_UN))
|
||||||
|
rx.print("Unlock of history file failed: %s\n", strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReplxxLineReader::enableBracketedPaste()
|
void ReplxxLineReader::enableBracketedPaste()
|
||||||
|
|||||||
@ -4,10 +4,17 @@
|
|||||||
|
|
||||||
#include <replxx.hxx>
|
#include <replxx.hxx>
|
||||||
|
|
||||||
|
|
||||||
class ReplxxLineReader : public LineReader
|
class ReplxxLineReader : public LineReader
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ReplxxLineReader(const Suggest & suggest, const String & history_file_path, char extender, char delimiter = 0);
|
ReplxxLineReader(
|
||||||
|
const Suggest & suggest,
|
||||||
|
const String & history_file_path,
|
||||||
|
bool multiline,
|
||||||
|
Patterns extenders_,
|
||||||
|
Patterns delimiters_,
|
||||||
|
replxx::Replxx::highlighter_callback_t highlighter_);
|
||||||
~ReplxxLineReader() override;
|
~ReplxxLineReader() override;
|
||||||
|
|
||||||
void enableBracketedPaste() override;
|
void enableBracketedPaste() override;
|
||||||
@ -17,4 +24,8 @@ private:
|
|||||||
void addToHistory(const String & line) override;
|
void addToHistory(const String & line) override;
|
||||||
|
|
||||||
replxx::Replxx rx;
|
replxx::Replxx rx;
|
||||||
|
replxx::Replxx::highlighter_callback_t highlighter;
|
||||||
|
|
||||||
|
// used to call flock() to synchronize multiple clients using same history file
|
||||||
|
int history_file_fd = -1;
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
#include "argsToConfig.h"
|
#include "argsToConfig.h"
|
||||||
|
|
||||||
#include <Poco/Util/Application.h>
|
|
||||||
#include <Poco/Util/LayeredConfiguration.h>
|
#include <Poco/Util/LayeredConfiguration.h>
|
||||||
#include <Poco/Util/MapConfiguration.h>
|
#include <Poco/Util/MapConfiguration.h>
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
// .h autogenerated by cmake !
|
|
||||||
|
|
||||||
#cmakedefine01 UNBUNDLED
|
|
||||||
@ -1,16 +1,8 @@
|
|||||||
#include <common/demangle.h>
|
#include <common/demangle.h>
|
||||||
|
|
||||||
#if defined(__has_feature)
|
#if defined(_MSC_VER)
|
||||||
#if __has_feature(memory_sanitizer)
|
|
||||||
#define MEMORY_SANITIZER 1
|
|
||||||
#endif
|
|
||||||
#elif defined(__MEMORY_SANITIZER__)
|
|
||||||
#define MEMORY_SANITIZER 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if _MSC_VER || MEMORY_SANITIZER
|
DemangleResult tryDemangle(const char *)
|
||||||
|
|
||||||
DemangleResult tryDemangle(const char * name)
|
|
||||||
{
|
{
|
||||||
return DemangleResult{};
|
return DemangleResult{};
|
||||||
}
|
}
|
||||||
|
|||||||
29
base/common/errnoToString.cpp
Normal file
29
base/common/errnoToString.cpp
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
#include "errnoToString.h"
|
||||||
|
|
||||||
|
#include <fmt/format.h>
|
||||||
|
|
||||||
|
|
||||||
|
std::string errnoToString(int code, int the_errno)
|
||||||
|
{
|
||||||
|
const size_t buf_size = 128;
|
||||||
|
char buf[buf_size];
|
||||||
|
#ifndef _GNU_SOURCE
|
||||||
|
int rc = strerror_r(the_errno, buf, buf_size);
|
||||||
|
#ifdef __APPLE__
|
||||||
|
if (rc != 0 && rc != EINVAL)
|
||||||
|
#else
|
||||||
|
if (rc != 0)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
std::string tmp = std::to_string(code);
|
||||||
|
const char * code_str = tmp.c_str();
|
||||||
|
const char * unknown_message = "Unknown error ";
|
||||||
|
strcpy(buf, unknown_message);
|
||||||
|
strcpy(buf + strlen(unknown_message), code_str);
|
||||||
|
}
|
||||||
|
return fmt::format("errno: {}, strerror: {}", the_errno, buf);
|
||||||
|
#else
|
||||||
|
(void)code;
|
||||||
|
return fmt::format("errno: {}, strerror: {}", the_errno, strerror_r(the_errno, buf, sizeof(buf)));
|
||||||
|
#endif
|
||||||
|
}
|
||||||
6
base/common/errnoToString.h
Normal file
6
base/common/errnoToString.h
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cerrno>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
std::string errnoToString(int code, int the_errno = errno);
|
||||||
@ -1,9 +1,9 @@
|
|||||||
#include <common/getThreadId.h>
|
#include <common/getThreadId.h>
|
||||||
|
|
||||||
#if OS_LINUX
|
#if defined(OS_LINUX)
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <syscall.h>
|
#include <syscall.h>
|
||||||
#elif OS_FREEBSD
|
#elif defined(OS_FREEBSD)
|
||||||
#include <pthread_np.h>
|
#include <pthread_np.h>
|
||||||
#else
|
#else
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
@ -16,9 +16,9 @@ uint64_t getThreadId()
|
|||||||
{
|
{
|
||||||
if (!current_tid)
|
if (!current_tid)
|
||||||
{
|
{
|
||||||
#if OS_LINUX
|
#if defined(OS_LINUX)
|
||||||
current_tid = syscall(SYS_gettid); /// This call is always successful. - man gettid
|
current_tid = syscall(SYS_gettid); /// This call is always successful. - man gettid
|
||||||
#elif OS_FREEBSD
|
#elif defined(OS_FREEBSD)
|
||||||
current_tid = pthread_getthreadid_np();
|
current_tid = pthread_getthreadid_np();
|
||||||
#else
|
#else
|
||||||
if (0 != pthread_threadid_np(nullptr, ¤t_tid))
|
if (0 != pthread_threadid_np(nullptr, ¤t_tid))
|
||||||
|
|||||||
@ -2,38 +2,40 @@
|
|||||||
|
|
||||||
/// Macros for convenient usage of Poco logger.
|
/// Macros for convenient usage of Poco logger.
|
||||||
|
|
||||||
#include <sstream>
|
#include <fmt/format.h>
|
||||||
|
#include <fmt/ostream.h>
|
||||||
#include <Poco/Logger.h>
|
#include <Poco/Logger.h>
|
||||||
#include <Poco/Message.h>
|
#include <Poco/Message.h>
|
||||||
#include <Poco/Version.h>
|
|
||||||
#include <Common/CurrentThread.h>
|
#include <Common/CurrentThread.h>
|
||||||
|
|
||||||
#ifndef QUERY_PREVIEW_LENGTH
|
|
||||||
#define QUERY_PREVIEW_LENGTH 160
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using Poco::Logger;
|
namespace
|
||||||
using Poco::Message;
|
{
|
||||||
using DB::LogsLevel;
|
template <typename... Ts> constexpr size_t numArgs(Ts &&...) { return sizeof...(Ts); }
|
||||||
using DB::CurrentThread;
|
template <typename T, typename... Ts> constexpr auto firstArg(T && x, Ts &&...) { return std::forward<T>(x); }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Logs a message to a specified logger with that level.
|
/// Logs a message to a specified logger with that level.
|
||||||
|
/// If more than one argument is provided,
|
||||||
|
/// the first argument is interpreted as template with {}-substitutions
|
||||||
|
/// and the latter arguments treat as values to substitute.
|
||||||
|
/// If only one argument is provided, it is threat as message without substitutions.
|
||||||
|
|
||||||
#define LOG_SIMPLE(logger, message, priority, PRIORITY) do \
|
#define LOG_IMPL(logger, priority, PRIORITY, ...) do \
|
||||||
{ \
|
{ \
|
||||||
const bool is_clients_log = (CurrentThread::getGroup() != nullptr) && \
|
const bool is_clients_log = (DB::CurrentThread::getGroup() != nullptr) && \
|
||||||
(CurrentThread::getGroup()->client_logs_level >= (priority)); \
|
(DB::CurrentThread::getGroup()->client_logs_level >= (priority)); \
|
||||||
if ((logger)->is((PRIORITY)) || is_clients_log) \
|
if ((logger)->is((PRIORITY)) || is_clients_log) \
|
||||||
{ \
|
{ \
|
||||||
std::stringstream oss_internal_rare; \
|
std::string formatted_message = numArgs(__VA_ARGS__) > 1 ? fmt::format(__VA_ARGS__) : firstArg(__VA_ARGS__); \
|
||||||
oss_internal_rare << message; \
|
|
||||||
if (auto channel = (logger)->getChannel()) \
|
if (auto channel = (logger)->getChannel()) \
|
||||||
{ \
|
{ \
|
||||||
std::string file_function; \
|
std::string file_function; \
|
||||||
file_function += __FILE__; \
|
file_function += __FILE__; \
|
||||||
file_function += "; "; \
|
file_function += "; "; \
|
||||||
file_function += __PRETTY_FUNCTION__; \
|
file_function += __PRETTY_FUNCTION__; \
|
||||||
Message poco_message((logger)->name(), oss_internal_rare.str(), \
|
Poco::Message poco_message((logger)->name(), formatted_message, \
|
||||||
(PRIORITY), file_function.c_str(), __LINE__); \
|
(PRIORITY), file_function.c_str(), __LINE__); \
|
||||||
channel->log(poco_message); \
|
channel->log(poco_message); \
|
||||||
} \
|
} \
|
||||||
@ -41,10 +43,18 @@ using DB::CurrentThread;
|
|||||||
} while (false)
|
} while (false)
|
||||||
|
|
||||||
|
|
||||||
#define LOG_TRACE(logger, message) LOG_SIMPLE(logger, message, LogsLevel::trace, Message::PRIO_TRACE)
|
#define LOG_TRACE(logger, ...) LOG_IMPL(logger, DB::LogsLevel::trace, Poco::Message::PRIO_TRACE, __VA_ARGS__)
|
||||||
#define LOG_DEBUG(logger, message) LOG_SIMPLE(logger, message, LogsLevel::debug, Message::PRIO_DEBUG)
|
#define LOG_DEBUG(logger, ...) LOG_IMPL(logger, DB::LogsLevel::debug, Poco::Message::PRIO_DEBUG, __VA_ARGS__)
|
||||||
#define LOG_INFO(logger, message) LOG_SIMPLE(logger, message, LogsLevel::information, Message::PRIO_INFORMATION)
|
#define LOG_INFO(logger, ...) LOG_IMPL(logger, DB::LogsLevel::information, Poco::Message::PRIO_INFORMATION, __VA_ARGS__)
|
||||||
#define LOG_WARNING(logger, message) LOG_SIMPLE(logger, message, LogsLevel::warning, Message::PRIO_WARNING)
|
#define LOG_WARNING(logger, ...) LOG_IMPL(logger, DB::LogsLevel::warning, Poco::Message::PRIO_WARNING, __VA_ARGS__)
|
||||||
#define LOG_ERROR(logger, message) LOG_SIMPLE(logger, message, LogsLevel::error, Message::PRIO_ERROR)
|
#define LOG_ERROR(logger, ...) LOG_IMPL(logger, DB::LogsLevel::error, Poco::Message::PRIO_ERROR, __VA_ARGS__)
|
||||||
#define LOG_FATAL(logger, message) LOG_SIMPLE(logger, message, LogsLevel::error, Message::PRIO_FATAL)
|
#define LOG_FATAL(logger, ...) LOG_IMPL(logger, DB::LogsLevel::error, Poco::Message::PRIO_FATAL, __VA_ARGS__)
|
||||||
|
|
||||||
|
|
||||||
|
/// Compatibility for external projects.
|
||||||
|
#if defined(ARCADIA_BUILD)
|
||||||
|
using Poco::Logger;
|
||||||
|
using Poco::Message;
|
||||||
|
using DB::LogsLevel;
|
||||||
|
using DB::CurrentThread;
|
||||||
|
#endif
|
||||||
|
|||||||
@ -3,20 +3,12 @@
|
|||||||
#include <new>
|
#include <new>
|
||||||
#include "defines.h"
|
#include "defines.h"
|
||||||
|
|
||||||
#if __has_include(<common/config_common.h>)
|
|
||||||
#include <common/config_common.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if USE_JEMALLOC
|
#if USE_JEMALLOC
|
||||||
#include <jemalloc/jemalloc.h>
|
# include <jemalloc/jemalloc.h>
|
||||||
|
|
||||||
#if JEMALLOC_VERSION_MAJOR < 4
|
|
||||||
#undef USE_JEMALLOC
|
|
||||||
#define USE_JEMALLOC 0
|
|
||||||
#include <cstdlib>
|
|
||||||
#endif
|
#endif
|
||||||
#else
|
|
||||||
#include <cstdlib>
|
#if !USE_JEMALLOC || JEMALLOC_VERSION_MAJOR < 4
|
||||||
|
# include <cstdlib>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@ -43,7 +35,7 @@ inline ALWAYS_INLINE void deleteImpl(void * ptr) noexcept
|
|||||||
free(ptr);
|
free(ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if USE_JEMALLOC
|
#if USE_JEMALLOC && JEMALLOC_VERSION_MAJOR >= 4
|
||||||
|
|
||||||
inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
|
inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
|
||||||
{
|
{
|
||||||
|
|||||||
@ -19,7 +19,7 @@ void * mremap_fallback(
|
|||||||
return MAP_FAILED;
|
return MAP_FAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if _MSC_VER
|
#if defined(_MSC_VER)
|
||||||
void * new_address = ::operator new(new_size);
|
void * new_address = ::operator new(new_size);
|
||||||
#else
|
#else
|
||||||
void * new_address = mmap(nullptr, new_size, mmap_prot, mmap_flags, mmap_fd, mmap_offset);
|
void * new_address = mmap(nullptr, new_size, mmap_prot, mmap_flags, mmap_fd, mmap_offset);
|
||||||
@ -29,7 +29,7 @@ void * mremap_fallback(
|
|||||||
|
|
||||||
memcpy(new_address, old_address, old_size);
|
memcpy(new_address, old_address, old_size);
|
||||||
|
|
||||||
#if _MSC_VER
|
#if defined(_MSC_VER)
|
||||||
delete old_address;
|
delete old_address;
|
||||||
#else
|
#else
|
||||||
if (munmap(old_address, old_size))
|
if (munmap(old_address, old_size))
|
||||||
|
|||||||
@ -1,25 +1,19 @@
|
|||||||
/// This code was based on the code by Fedor Korotkiy (prime@yandex-team.ru) for YT product in Yandex.
|
/// This code was based on the code by Fedor Korotkiy (prime@yandex-team.ru) for YT product in Yandex.
|
||||||
|
|
||||||
#if defined(__has_feature)
|
#include <common/defines.h>
|
||||||
#if __has_feature(address_sanitizer)
|
|
||||||
#define ADDRESS_SANITIZER 1
|
|
||||||
#endif
|
|
||||||
#if __has_feature(thread_sanitizer)
|
|
||||||
#define THREAD_SANITIZER 1
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
#if defined(__SANITIZE_ADDRESS__)
|
|
||||||
#define ADDRESS_SANITIZER 1
|
|
||||||
#endif
|
|
||||||
#if defined(__SANITIZE_THREAD__)
|
|
||||||
#define THREAD_SANITIZER 1
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__linux__) && !defined(THREAD_SANITIZER)
|
#if defined(__linux__) && !defined(THREAD_SANITIZER)
|
||||||
#define USE_PHDR_CACHE 1
|
#define USE_PHDR_CACHE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/// Thread Sanitizer uses dl_iterate_phdr function on initialization and fails if we provide our own.
|
||||||
|
#ifdef USE_PHDR_CACHE
|
||||||
|
|
||||||
|
#if defined(__clang__)
|
||||||
|
# pragma clang diagnostic ignored "-Wreserved-id-macro"
|
||||||
|
# pragma clang diagnostic ignored "-Wunused-macros"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define __msan_unpoison(X, Y)
|
#define __msan_unpoison(X, Y)
|
||||||
#if defined(__has_feature)
|
#if defined(__has_feature)
|
||||||
# if __has_feature(memory_sanitizer)
|
# if __has_feature(memory_sanitizer)
|
||||||
@ -28,9 +22,6 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/// Thread Sanitizer uses dl_iterate_phdr function on initialization and fails if we provide our own.
|
|
||||||
#ifdef USE_PHDR_CACHE
|
|
||||||
|
|
||||||
#include <link.h>
|
#include <link.h>
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
@ -1,227 +0,0 @@
|
|||||||
/*
|
|
||||||
|
|
||||||
https://www.musl-libc.org/
|
|
||||||
http://git.musl-libc.org/cgit/musl/tree/src/math/exp10.c
|
|
||||||
|
|
||||||
musl as a whole is licensed under the following standard MIT license:
|
|
||||||
|
|
||||||
----------------------------------------------------------------------
|
|
||||||
Copyright © 2005-2014 Rich Felker, et al.
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
a copy of this software and associated documentation files (the
|
|
||||||
"Software"), to deal in the Software without restriction, including
|
|
||||||
without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be
|
|
||||||
included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
||||||
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
||||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
||||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
||||||
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
----------------------------------------------------------------------
|
|
||||||
|
|
||||||
Authors/contributors include:
|
|
||||||
|
|
||||||
Alex Dowad
|
|
||||||
Alexander Monakov
|
|
||||||
Anthony G. Basile
|
|
||||||
Arvid Picciani
|
|
||||||
Bobby Bingham
|
|
||||||
Boris Brezillon
|
|
||||||
Brent Cook
|
|
||||||
Chris Spiegel
|
|
||||||
Clément Vasseur
|
|
||||||
Daniel Micay
|
|
||||||
Denys Vlasenko
|
|
||||||
Emil Renner Berthing
|
|
||||||
Felix Fietkau
|
|
||||||
Felix Janda
|
|
||||||
Gianluca Anzolin
|
|
||||||
Hauke Mehrtens
|
|
||||||
Hiltjo Posthuma
|
|
||||||
Isaac Dunham
|
|
||||||
Jaydeep Patil
|
|
||||||
Jens Gustedt
|
|
||||||
Jeremy Huntwork
|
|
||||||
Jo-Philipp Wich
|
|
||||||
Joakim Sindholt
|
|
||||||
John Spencer
|
|
||||||
Josiah Worcester
|
|
||||||
Justin Cormack
|
|
||||||
Khem Raj
|
|
||||||
Kylie McClain
|
|
||||||
Luca Barbato
|
|
||||||
Luka Perkov
|
|
||||||
M Farkas-Dyck (Strake)
|
|
||||||
Mahesh Bodapati
|
|
||||||
Michael Forney
|
|
||||||
Natanael Copa
|
|
||||||
Nicholas J. Kain
|
|
||||||
orc
|
|
||||||
Pascal Cuoq
|
|
||||||
Petr Hosek
|
|
||||||
Pierre Carrier
|
|
||||||
Rich Felker
|
|
||||||
Richard Pennington
|
|
||||||
Shiz
|
|
||||||
sin
|
|
||||||
Solar Designer
|
|
||||||
Stefan Kristiansson
|
|
||||||
Szabolcs Nagy
|
|
||||||
Timo Teräs
|
|
||||||
Trutz Behn
|
|
||||||
Valentin Ochs
|
|
||||||
William Haddon
|
|
||||||
|
|
||||||
Portions of this software are derived from third-party works licensed
|
|
||||||
under terms compatible with the above MIT license:
|
|
||||||
|
|
||||||
The TRE regular expression implementation (src/regex/reg* and
|
|
||||||
src/regex/tre*) is Copyright © 2001-2008 Ville Laurikari and licensed
|
|
||||||
under a 2-clause BSD license (license text in the source files). The
|
|
||||||
included version has been heavily modified by Rich Felker in 2012, in
|
|
||||||
the interests of size, simplicity, and namespace cleanliness.
|
|
||||||
|
|
||||||
Much of the math library code (src/math/ * and src/complex/ *) is
|
|
||||||
Copyright © 1993,2004 Sun Microsystems or
|
|
||||||
Copyright © 2003-2011 David Schultz or
|
|
||||||
Copyright © 2003-2009 Steven G. Kargl or
|
|
||||||
Copyright © 2003-2009 Bruce D. Evans or
|
|
||||||
Copyright © 2008 Stephen L. Moshier
|
|
||||||
and labelled as such in comments in the individual source files. All
|
|
||||||
have been licensed under extremely permissive terms.
|
|
||||||
|
|
||||||
The ARM memcpy code (src/string/arm/memcpy_el.S) is Copyright © 2008
|
|
||||||
The Android Open Source Project and is licensed under a two-clause BSD
|
|
||||||
license. It was taken from Bionic libc, used on Android.
|
|
||||||
|
|
||||||
The implementation of DES for crypt (src/crypt/crypt_des.c) is
|
|
||||||
Copyright © 1994 David Burren. It is licensed under a BSD license.
|
|
||||||
|
|
||||||
The implementation of blowfish crypt (src/crypt/crypt_blowfish.c) was
|
|
||||||
originally written by Solar Designer and placed into the public
|
|
||||||
domain. The code also comes with a fallback permissive license for use
|
|
||||||
in jurisdictions that may not recognize the public domain.
|
|
||||||
|
|
||||||
The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011
|
|
||||||
Valentin Ochs and is licensed under an MIT-style license.
|
|
||||||
|
|
||||||
The BSD PRNG implementation (src/prng/random.c) and XSI search API
|
|
||||||
(src/search/ *.c) functions are Copyright © 2011 Szabolcs Nagy and
|
|
||||||
licensed under following terms: "Permission to use, copy, modify,
|
|
||||||
and/or distribute this code for any purpose with or without fee is
|
|
||||||
hereby granted. There is no warranty."
|
|
||||||
|
|
||||||
The x86_64 port was written by Nicholas J. Kain and is licensed under
|
|
||||||
the standard MIT terms.
|
|
||||||
|
|
||||||
The mips and microblaze ports were originally written by Richard
|
|
||||||
Pennington for use in the ellcc project. The original code was adapted
|
|
||||||
by Rich Felker for build system and code conventions during upstream
|
|
||||||
integration. It is licensed under the standard MIT terms.
|
|
||||||
|
|
||||||
The mips64 port was contributed by Imagination Technologies and is
|
|
||||||
licensed under the standard MIT terms.
|
|
||||||
|
|
||||||
The powerpc port was also originally written by Richard Pennington,
|
|
||||||
and later supplemented and integrated by John Spencer. It is licensed
|
|
||||||
under the standard MIT terms.
|
|
||||||
|
|
||||||
All other files which have no copyright comments are original works
|
|
||||||
produced specifically for use as part of this library, written either
|
|
||||||
by Rich Felker, the main author of the library, or by one or more
|
|
||||||
contibutors listed above. Details on authorship of individual files
|
|
||||||
can be found in the git version control history of the project. The
|
|
||||||
omission of copyright and license comments in each file is in the
|
|
||||||
interest of source tree size.
|
|
||||||
|
|
||||||
In addition, permission is hereby granted for all public header files
|
|
||||||
(include/ * and arch/ * /bits/ *) and crt files intended to be linked into
|
|
||||||
applications (crt/ *, ldso/dlstart.c, and arch/ * /crt_arch.h) to omit
|
|
||||||
the copyright notice and permission notice otherwise required by the
|
|
||||||
license, and to use these files without any requirement of
|
|
||||||
attribution. These files include substantial contributions from:
|
|
||||||
|
|
||||||
Bobby Bingham
|
|
||||||
John Spencer
|
|
||||||
Nicholas J. Kain
|
|
||||||
Rich Felker
|
|
||||||
Richard Pennington
|
|
||||||
Stefan Kristiansson
|
|
||||||
Szabolcs Nagy
|
|
||||||
|
|
||||||
all of whom have explicitly granted such permission.
|
|
||||||
|
|
||||||
This file previously contained text expressing a belief that most of
|
|
||||||
the files covered by the above exception were sufficiently trivial not
|
|
||||||
to be subject to copyright, resulting in confusion over whether it
|
|
||||||
negated the permissions granted in the license. In the spirit of
|
|
||||||
permissive licensing, and of not having licensing issues being an
|
|
||||||
obstacle to adoption, that text has been removed.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <math.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
double preciseExp10(double x)
|
|
||||||
{
|
|
||||||
if (isnan(x)) return NAN;
|
|
||||||
|
|
||||||
// ranging between DBL_TRUE_MIN and DBL_MAX. Outsiders are treated as zeros or infinities
|
|
||||||
static const double p10[]
|
|
||||||
= {1e-323, 1e-322, 1e-321, 1e-320, 1e-319, 1e-318, 1e-317, 1e-316, 1e-315, 1e-314, 1e-313, 1e-312, 1e-311, 1e-310, 1e-309, 1e-308, 1e-307,
|
|
||||||
1e-306, 1e-305, 1e-304, 1e-303, 1e-302, 1e-301, 1e-300, 1e-299, 1e-298, 1e-297, 1e-296, 1e-295, 1e-294, 1e-293, 1e-292, 1e-291, 1e-290,
|
|
||||||
1e-289, 1e-288, 1e-287, 1e-286, 1e-285, 1e-284, 1e-283, 1e-282, 1e-281, 1e-280, 1e-279, 1e-278, 1e-277, 1e-276, 1e-275, 1e-274, 1e-273,
|
|
||||||
1e-272, 1e-271, 1e-270, 1e-269, 1e-268, 1e-267, 1e-266, 1e-265, 1e-264, 1e-263, 1e-262, 1e-261, 1e-260, 1e-259, 1e-258, 1e-257, 1e-256,
|
|
||||||
1e-255, 1e-254, 1e-253, 1e-252, 1e-251, 1e-250, 1e-249, 1e-248, 1e-247, 1e-246, 1e-245, 1e-244, 1e-243, 1e-242, 1e-241, 1e-240, 1e-239,
|
|
||||||
1e-238, 1e-237, 1e-236, 1e-235, 1e-234, 1e-233, 1e-232, 1e-231, 1e-230, 1e-229, 1e-228, 1e-227, 1e-226, 1e-225, 1e-224, 1e-223, 1e-222,
|
|
||||||
1e-221, 1e-220, 1e-219, 1e-218, 1e-217, 1e-216, 1e-215, 1e-214, 1e-213, 1e-212, 1e-211, 1e-210, 1e-209, 1e-208, 1e-207, 1e-206, 1e-205,
|
|
||||||
1e-204, 1e-203, 1e-202, 1e-201, 1e-200, 1e-199, 1e-198, 1e-197, 1e-196, 1e-195, 1e-194, 1e-193, 1e-192, 1e-191, 1e-190, 1e-189, 1e-188,
|
|
||||||
1e-187, 1e-186, 1e-185, 1e-184, 1e-183, 1e-182, 1e-181, 1e-180, 1e-179, 1e-178, 1e-177, 1e-176, 1e-175, 1e-174, 1e-173, 1e-172, 1e-171,
|
|
||||||
1e-170, 1e-169, 1e-168, 1e-167, 1e-166, 1e-165, 1e-164, 1e-163, 1e-162, 1e-161, 1e-160, 1e-159, 1e-158, 1e-157, 1e-156, 1e-155, 1e-154,
|
|
||||||
1e-153, 1e-152, 1e-151, 1e-150, 1e-149, 1e-148, 1e-147, 1e-146, 1e-145, 1e-144, 1e-143, 1e-142, 1e-141, 1e-140, 1e-139, 1e-138, 1e-137,
|
|
||||||
1e-136, 1e-135, 1e-134, 1e-133, 1e-132, 1e-131, 1e-130, 1e-129, 1e-128, 1e-127, 1e-126, 1e-125, 1e-124, 1e-123, 1e-122, 1e-121, 1e-120,
|
|
||||||
1e-119, 1e-118, 1e-117, 1e-116, 1e-115, 1e-114, 1e-113, 1e-112, 1e-111, 1e-110, 1e-109, 1e-108, 1e-107, 1e-106, 1e-105, 1e-104, 1e-103,
|
|
||||||
1e-102, 1e-101, 1e-100, 1e-99, 1e-98, 1e-97, 1e-96, 1e-95, 1e-94, 1e-93, 1e-92, 1e-91, 1e-90, 1e-89, 1e-88, 1e-87, 1e-86,
|
|
||||||
1e-85, 1e-84, 1e-83, 1e-82, 1e-81, 1e-80, 1e-79, 1e-78, 1e-77, 1e-76, 1e-75, 1e-74, 1e-73, 1e-72, 1e-71, 1e-70, 1e-69,
|
|
||||||
1e-68, 1e-67, 1e-66, 1e-65, 1e-64, 1e-63, 1e-62, 1e-61, 1e-60, 1e-59, 1e-58, 1e-57, 1e-56, 1e-55, 1e-54, 1e-53, 1e-52,
|
|
||||||
1e-51, 1e-50, 1e-49, 1e-48, 1e-47, 1e-46, 1e-45, 1e-44, 1e-43, 1e-42, 1e-41, 1e-40, 1e-39, 1e-38, 1e-37, 1e-36, 1e-35,
|
|
||||||
1e-34, 1e-33, 1e-32, 1e-31, 1e-30, 1e-29, 1e-28, 1e-27, 1e-26, 1e-25, 1e-24, 1e-23, 1e-22, 1e-21, 1e-20, 1e-19, 1e-18,
|
|
||||||
1e-17, 1e-16, 1e-15, 1e-14, 1e-13, 1e-12, 1e-11, 1e-10, 1e-9, 1e-8, 1e-7, 1e-6, 1e-5, 1e-4, 1e-3, 1e-2, 1e-1,
|
|
||||||
1e0, 1e+1, 1e+2, 1e+3, 1e+4, 1e+5, 1e+6, 1e+7, 1e+8, 1e+9, 1e+10, 1e+11, 1e+12, 1e+13, 1e+14, 1e+15, 1e+16,
|
|
||||||
1e+17, 1e+18, 1e+19, 1e+20, 1e+21, 1e+22, 1e+23, 1e+24, 1e+25, 1e+26, 1e+27, 1e+28, 1e+29, 1e+30, 1e+31, 1e+32, 1e+33,
|
|
||||||
1e+34, 1e+35, 1e+36, 1e+37, 1e+38, 1e+39, 1e+40, 1e+41, 1e+42, 1e+43, 1e+44, 1e+45, 1e+46, 1e+47, 1e+48, 1e+49, 1e+50,
|
|
||||||
1e+51, 1e+52, 1e+53, 1e+54, 1e+55, 1e+56, 1e+57, 1e+58, 1e+59, 1e+60, 1e+61, 1e+62, 1e+63, 1e+64, 1e+65, 1e+66, 1e+67,
|
|
||||||
1e+68, 1e+69, 1e+70, 1e+71, 1e+72, 1e+73, 1e+74, 1e+75, 1e+76, 1e+77, 1e+78, 1e+79, 1e+80, 1e+81, 1e+82, 1e+83, 1e+84,
|
|
||||||
1e+85, 1e+86, 1e+87, 1e+88, 1e+89, 1e+90, 1e+91, 1e+92, 1e+93, 1e+94, 1e+95, 1e+96, 1e+97, 1e+98, 1e+99, 1e+100, 1e+101,
|
|
||||||
1e+102, 1e+103, 1e+104, 1e+105, 1e+106, 1e+107, 1e+108, 1e+109, 1e+110, 1e+111, 1e+112, 1e+113, 1e+114, 1e+115, 1e+116, 1e+117, 1e+118,
|
|
||||||
1e+119, 1e+120, 1e+121, 1e+122, 1e+123, 1e+124, 1e+125, 1e+126, 1e+127, 1e+128, 1e+129, 1e+130, 1e+131, 1e+132, 1e+133, 1e+134, 1e+135,
|
|
||||||
1e+136, 1e+137, 1e+138, 1e+139, 1e+140, 1e+141, 1e+142, 1e+143, 1e+144, 1e+145, 1e+146, 1e+147, 1e+148, 1e+149, 1e+150, 1e+151, 1e+152,
|
|
||||||
1e+153, 1e+154, 1e+155, 1e+156, 1e+157, 1e+158, 1e+159, 1e+160, 1e+161, 1e+162, 1e+163, 1e+164, 1e+165, 1e+166, 1e+167, 1e+168, 1e+169,
|
|
||||||
1e+170, 1e+171, 1e+172, 1e+173, 1e+174, 1e+175, 1e+176, 1e+177, 1e+178, 1e+179, 1e+180, 1e+181, 1e+182, 1e+183, 1e+184, 1e+185, 1e+186,
|
|
||||||
1e+187, 1e+188, 1e+189, 1e+190, 1e+191, 1e+192, 1e+193, 1e+194, 1e+195, 1e+196, 1e+197, 1e+198, 1e+199, 1e+200, 1e+201, 1e+202, 1e+203,
|
|
||||||
1e+204, 1e+205, 1e+206, 1e+207, 1e+208, 1e+209, 1e+210, 1e+211, 1e+212, 1e+213, 1e+214, 1e+215, 1e+216, 1e+217, 1e+218, 1e+219, 1e+220,
|
|
||||||
1e+221, 1e+222, 1e+223, 1e+224, 1e+225, 1e+226, 1e+227, 1e+228, 1e+229, 1e+230, 1e+231, 1e+232, 1e+233, 1e+234, 1e+235, 1e+236, 1e+237,
|
|
||||||
1e+238, 1e+239, 1e+240, 1e+241, 1e+242, 1e+243, 1e+244, 1e+245, 1e+246, 1e+247, 1e+248, 1e+249, 1e+250, 1e+251, 1e+252, 1e+253, 1e+254,
|
|
||||||
1e+255, 1e+256, 1e+257, 1e+258, 1e+259, 1e+260, 1e+261, 1e+262, 1e+263, 1e+264, 1e+265, 1e+266, 1e+267, 1e+268, 1e+269, 1e+270, 1e+271,
|
|
||||||
1e+272, 1e+273, 1e+274, 1e+275, 1e+276, 1e+277, 1e+278, 1e+279, 1e+280, 1e+281, 1e+282, 1e+283, 1e+284, 1e+285, 1e+286, 1e+287, 1e+288,
|
|
||||||
1e+289, 1e+290, 1e+291, 1e+292, 1e+293, 1e+294, 1e+295, 1e+296, 1e+297, 1e+298, 1e+299, 1e+300, 1e+301, 1e+302, 1e+303, 1e+304, 1e+305,
|
|
||||||
1e+306, 1e+307, 1e+308};
|
|
||||||
|
|
||||||
double n, y = modf(x, &n);
|
|
||||||
if (n > 308) return INFINITY;
|
|
||||||
if (n < -323) return 0;
|
|
||||||
|
|
||||||
// Using lookup table based formula to get accurate results for integer arguments.
|
|
||||||
return exp2(3.32192809488736234787031942948939 * y) * p10[(int)n + 323];
|
|
||||||
}
|
|
||||||
227
base/common/preciseExp10.cpp
Normal file
227
base/common/preciseExp10.cpp
Normal file
@ -0,0 +1,227 @@
|
|||||||
|
/*
|
||||||
|
|
||||||
|
https://www.musl-libc.org/
|
||||||
|
http://git.musl-libc.org/cgit/musl/tree/src/math/exp10.c
|
||||||
|
|
||||||
|
musl as a whole is licensed under the following standard MIT license:
|
||||||
|
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
Copyright © 2005-2014 Rich Felker, et al.
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of this software and associated documentation files (the
|
||||||
|
"Software"), to deal in the Software without restriction, including
|
||||||
|
without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be
|
||||||
|
included in all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||||
|
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||||
|
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||||
|
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||||
|
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
|
||||||
|
Authors/contributors include:
|
||||||
|
|
||||||
|
Alex Dowad
|
||||||
|
Alexander Monakov
|
||||||
|
Anthony G. Basile
|
||||||
|
Arvid Picciani
|
||||||
|
Bobby Bingham
|
||||||
|
Boris Brezillon
|
||||||
|
Brent Cook
|
||||||
|
Chris Spiegel
|
||||||
|
Clément Vasseur
|
||||||
|
Daniel Micay
|
||||||
|
Denys Vlasenko
|
||||||
|
Emil Renner Berthing
|
||||||
|
Felix Fietkau
|
||||||
|
Felix Janda
|
||||||
|
Gianluca Anzolin
|
||||||
|
Hauke Mehrtens
|
||||||
|
Hiltjo Posthuma
|
||||||
|
Isaac Dunham
|
||||||
|
Jaydeep Patil
|
||||||
|
Jens Gustedt
|
||||||
|
Jeremy Huntwork
|
||||||
|
Jo-Philipp Wich
|
||||||
|
Joakim Sindholt
|
||||||
|
John Spencer
|
||||||
|
Josiah Worcester
|
||||||
|
Justin Cormack
|
||||||
|
Khem Raj
|
||||||
|
Kylie McClain
|
||||||
|
Luca Barbato
|
||||||
|
Luka Perkov
|
||||||
|
M Farkas-Dyck (Strake)
|
||||||
|
Mahesh Bodapati
|
||||||
|
Michael Forney
|
||||||
|
Natanael Copa
|
||||||
|
Nicholas J. Kain
|
||||||
|
orc
|
||||||
|
Pascal Cuoq
|
||||||
|
Petr Hosek
|
||||||
|
Pierre Carrier
|
||||||
|
Rich Felker
|
||||||
|
Richard Pennington
|
||||||
|
Shiz
|
||||||
|
sin
|
||||||
|
Solar Designer
|
||||||
|
Stefan Kristiansson
|
||||||
|
Szabolcs Nagy
|
||||||
|
Timo Teräs
|
||||||
|
Trutz Behn
|
||||||
|
Valentin Ochs
|
||||||
|
William Haddon
|
||||||
|
|
||||||
|
Portions of this software are derived from third-party works licensed
|
||||||
|
under terms compatible with the above MIT license:
|
||||||
|
|
||||||
|
The TRE regular expression implementation (src/regex/reg* and
|
||||||
|
src/regex/tre*) is Copyright © 2001-2008 Ville Laurikari and licensed
|
||||||
|
under a 2-clause BSD license (license text in the source files). The
|
||||||
|
included version has been heavily modified by Rich Felker in 2012, in
|
||||||
|
the interests of size, simplicity, and namespace cleanliness.
|
||||||
|
|
||||||
|
Much of the math library code (src/math/ * and src/complex/ *) is
|
||||||
|
Copyright © 1993,2004 Sun Microsystems or
|
||||||
|
Copyright © 2003-2011 David Schultz or
|
||||||
|
Copyright © 2003-2009 Steven G. Kargl or
|
||||||
|
Copyright © 2003-2009 Bruce D. Evans or
|
||||||
|
Copyright © 2008 Stephen L. Moshier
|
||||||
|
and labelled as such in comments in the individual source files. All
|
||||||
|
have been licensed under extremely permissive terms.
|
||||||
|
|
||||||
|
The ARM memcpy code (src/string/arm/memcpy_el.S) is Copyright © 2008
|
||||||
|
The Android Open Source Project and is licensed under a two-clause BSD
|
||||||
|
license. It was taken from Bionic libc, used on Android.
|
||||||
|
|
||||||
|
The implementation of DES for crypt (src/crypt/crypt_des.c) is
|
||||||
|
Copyright © 1994 David Burren. It is licensed under a BSD license.
|
||||||
|
|
||||||
|
The implementation of blowfish crypt (src/crypt/crypt_blowfish.c) was
|
||||||
|
originally written by Solar Designer and placed into the public
|
||||||
|
domain. The code also comes with a fallback permissive license for use
|
||||||
|
in jurisdictions that may not recognize the public domain.
|
||||||
|
|
||||||
|
The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011
|
||||||
|
Valentin Ochs and is licensed under an MIT-style license.
|
||||||
|
|
||||||
|
The BSD PRNG implementation (src/prng/random.c) and XSI search API
|
||||||
|
(src/search/ *.c) functions are Copyright © 2011 Szabolcs Nagy and
|
||||||
|
licensed under following terms: "Permission to use, copy, modify,
|
||||||
|
and/or distribute this code for any purpose with or without fee is
|
||||||
|
hereby granted. There is no warranty."
|
||||||
|
|
||||||
|
The x86_64 port was written by Nicholas J. Kain and is licensed under
|
||||||
|
the standard MIT terms.
|
||||||
|
|
||||||
|
The mips and microblaze ports were originally written by Richard
|
||||||
|
Pennington for use in the ellcc project. The original code was adapted
|
||||||
|
by Rich Felker for build system and code conventions during upstream
|
||||||
|
integration. It is licensed under the standard MIT terms.
|
||||||
|
|
||||||
|
The mips64 port was contributed by Imagination Technologies and is
|
||||||
|
licensed under the standard MIT terms.
|
||||||
|
|
||||||
|
The powerpc port was also originally written by Richard Pennington,
|
||||||
|
and later supplemented and integrated by John Spencer. It is licensed
|
||||||
|
under the standard MIT terms.
|
||||||
|
|
||||||
|
All other files which have no copyright comments are original works
|
||||||
|
produced specifically for use as part of this library, written either
|
||||||
|
by Rich Felker, the main author of the library, or by one or more
|
||||||
|
contibutors listed above. Details on authorship of individual files
|
||||||
|
can be found in the git version control history of the project. The
|
||||||
|
omission of copyright and license comments in each file is in the
|
||||||
|
interest of source tree size.
|
||||||
|
|
||||||
|
In addition, permission is hereby granted for all public header files
|
||||||
|
(include/ * and arch/ * /bits/ *) and crt files intended to be linked into
|
||||||
|
applications (crt/ *, ldso/dlstart.c, and arch/ * /crt_arch.h) to omit
|
||||||
|
the copyright notice and permission notice otherwise required by the
|
||||||
|
license, and to use these files without any requirement of
|
||||||
|
attribution. These files include substantial contributions from:
|
||||||
|
|
||||||
|
Bobby Bingham
|
||||||
|
John Spencer
|
||||||
|
Nicholas J. Kain
|
||||||
|
Rich Felker
|
||||||
|
Richard Pennington
|
||||||
|
Stefan Kristiansson
|
||||||
|
Szabolcs Nagy
|
||||||
|
|
||||||
|
all of whom have explicitly granted such permission.
|
||||||
|
|
||||||
|
This file previously contained text expressing a belief that most of
|
||||||
|
the files covered by the above exception were sufficiently trivial not
|
||||||
|
to be subject to copyright, resulting in confusion over whether it
|
||||||
|
negated the permissions granted in the license. In the spirit of
|
||||||
|
permissive licensing, and of not having licensing issues being an
|
||||||
|
obstacle to adoption, that text has been removed.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <math.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
double preciseExp10(double x)
|
||||||
|
{
|
||||||
|
if (isnan(x)) return NAN;
|
||||||
|
|
||||||
|
// ranging between DBL_TRUE_MIN and DBL_MAX. Outsiders are treated as zeros or infinities
|
||||||
|
static const double p10[]
|
||||||
|
= {1e-323, 1e-322, 1e-321, 1e-320, 1e-319, 1e-318, 1e-317, 1e-316, 1e-315, 1e-314, 1e-313, 1e-312, 1e-311, 1e-310, 1e-309, 1e-308, 1e-307,
|
||||||
|
1e-306, 1e-305, 1e-304, 1e-303, 1e-302, 1e-301, 1e-300, 1e-299, 1e-298, 1e-297, 1e-296, 1e-295, 1e-294, 1e-293, 1e-292, 1e-291, 1e-290,
|
||||||
|
1e-289, 1e-288, 1e-287, 1e-286, 1e-285, 1e-284, 1e-283, 1e-282, 1e-281, 1e-280, 1e-279, 1e-278, 1e-277, 1e-276, 1e-275, 1e-274, 1e-273,
|
||||||
|
1e-272, 1e-271, 1e-270, 1e-269, 1e-268, 1e-267, 1e-266, 1e-265, 1e-264, 1e-263, 1e-262, 1e-261, 1e-260, 1e-259, 1e-258, 1e-257, 1e-256,
|
||||||
|
1e-255, 1e-254, 1e-253, 1e-252, 1e-251, 1e-250, 1e-249, 1e-248, 1e-247, 1e-246, 1e-245, 1e-244, 1e-243, 1e-242, 1e-241, 1e-240, 1e-239,
|
||||||
|
1e-238, 1e-237, 1e-236, 1e-235, 1e-234, 1e-233, 1e-232, 1e-231, 1e-230, 1e-229, 1e-228, 1e-227, 1e-226, 1e-225, 1e-224, 1e-223, 1e-222,
|
||||||
|
1e-221, 1e-220, 1e-219, 1e-218, 1e-217, 1e-216, 1e-215, 1e-214, 1e-213, 1e-212, 1e-211, 1e-210, 1e-209, 1e-208, 1e-207, 1e-206, 1e-205,
|
||||||
|
1e-204, 1e-203, 1e-202, 1e-201, 1e-200, 1e-199, 1e-198, 1e-197, 1e-196, 1e-195, 1e-194, 1e-193, 1e-192, 1e-191, 1e-190, 1e-189, 1e-188,
|
||||||
|
1e-187, 1e-186, 1e-185, 1e-184, 1e-183, 1e-182, 1e-181, 1e-180, 1e-179, 1e-178, 1e-177, 1e-176, 1e-175, 1e-174, 1e-173, 1e-172, 1e-171,
|
||||||
|
1e-170, 1e-169, 1e-168, 1e-167, 1e-166, 1e-165, 1e-164, 1e-163, 1e-162, 1e-161, 1e-160, 1e-159, 1e-158, 1e-157, 1e-156, 1e-155, 1e-154,
|
||||||
|
1e-153, 1e-152, 1e-151, 1e-150, 1e-149, 1e-148, 1e-147, 1e-146, 1e-145, 1e-144, 1e-143, 1e-142, 1e-141, 1e-140, 1e-139, 1e-138, 1e-137,
|
||||||
|
1e-136, 1e-135, 1e-134, 1e-133, 1e-132, 1e-131, 1e-130, 1e-129, 1e-128, 1e-127, 1e-126, 1e-125, 1e-124, 1e-123, 1e-122, 1e-121, 1e-120,
|
||||||
|
1e-119, 1e-118, 1e-117, 1e-116, 1e-115, 1e-114, 1e-113, 1e-112, 1e-111, 1e-110, 1e-109, 1e-108, 1e-107, 1e-106, 1e-105, 1e-104, 1e-103,
|
||||||
|
1e-102, 1e-101, 1e-100, 1e-99, 1e-98, 1e-97, 1e-96, 1e-95, 1e-94, 1e-93, 1e-92, 1e-91, 1e-90, 1e-89, 1e-88, 1e-87, 1e-86,
|
||||||
|
1e-85, 1e-84, 1e-83, 1e-82, 1e-81, 1e-80, 1e-79, 1e-78, 1e-77, 1e-76, 1e-75, 1e-74, 1e-73, 1e-72, 1e-71, 1e-70, 1e-69,
|
||||||
|
1e-68, 1e-67, 1e-66, 1e-65, 1e-64, 1e-63, 1e-62, 1e-61, 1e-60, 1e-59, 1e-58, 1e-57, 1e-56, 1e-55, 1e-54, 1e-53, 1e-52,
|
||||||
|
1e-51, 1e-50, 1e-49, 1e-48, 1e-47, 1e-46, 1e-45, 1e-44, 1e-43, 1e-42, 1e-41, 1e-40, 1e-39, 1e-38, 1e-37, 1e-36, 1e-35,
|
||||||
|
1e-34, 1e-33, 1e-32, 1e-31, 1e-30, 1e-29, 1e-28, 1e-27, 1e-26, 1e-25, 1e-24, 1e-23, 1e-22, 1e-21, 1e-20, 1e-19, 1e-18,
|
||||||
|
1e-17, 1e-16, 1e-15, 1e-14, 1e-13, 1e-12, 1e-11, 1e-10, 1e-9, 1e-8, 1e-7, 1e-6, 1e-5, 1e-4, 1e-3, 1e-2, 1e-1,
|
||||||
|
1e0, 1e+1, 1e+2, 1e+3, 1e+4, 1e+5, 1e+6, 1e+7, 1e+8, 1e+9, 1e+10, 1e+11, 1e+12, 1e+13, 1e+14, 1e+15, 1e+16,
|
||||||
|
1e+17, 1e+18, 1e+19, 1e+20, 1e+21, 1e+22, 1e+23, 1e+24, 1e+25, 1e+26, 1e+27, 1e+28, 1e+29, 1e+30, 1e+31, 1e+32, 1e+33,
|
||||||
|
1e+34, 1e+35, 1e+36, 1e+37, 1e+38, 1e+39, 1e+40, 1e+41, 1e+42, 1e+43, 1e+44, 1e+45, 1e+46, 1e+47, 1e+48, 1e+49, 1e+50,
|
||||||
|
1e+51, 1e+52, 1e+53, 1e+54, 1e+55, 1e+56, 1e+57, 1e+58, 1e+59, 1e+60, 1e+61, 1e+62, 1e+63, 1e+64, 1e+65, 1e+66, 1e+67,
|
||||||
|
1e+68, 1e+69, 1e+70, 1e+71, 1e+72, 1e+73, 1e+74, 1e+75, 1e+76, 1e+77, 1e+78, 1e+79, 1e+80, 1e+81, 1e+82, 1e+83, 1e+84,
|
||||||
|
1e+85, 1e+86, 1e+87, 1e+88, 1e+89, 1e+90, 1e+91, 1e+92, 1e+93, 1e+94, 1e+95, 1e+96, 1e+97, 1e+98, 1e+99, 1e+100, 1e+101,
|
||||||
|
1e+102, 1e+103, 1e+104, 1e+105, 1e+106, 1e+107, 1e+108, 1e+109, 1e+110, 1e+111, 1e+112, 1e+113, 1e+114, 1e+115, 1e+116, 1e+117, 1e+118,
|
||||||
|
1e+119, 1e+120, 1e+121, 1e+122, 1e+123, 1e+124, 1e+125, 1e+126, 1e+127, 1e+128, 1e+129, 1e+130, 1e+131, 1e+132, 1e+133, 1e+134, 1e+135,
|
||||||
|
1e+136, 1e+137, 1e+138, 1e+139, 1e+140, 1e+141, 1e+142, 1e+143, 1e+144, 1e+145, 1e+146, 1e+147, 1e+148, 1e+149, 1e+150, 1e+151, 1e+152,
|
||||||
|
1e+153, 1e+154, 1e+155, 1e+156, 1e+157, 1e+158, 1e+159, 1e+160, 1e+161, 1e+162, 1e+163, 1e+164, 1e+165, 1e+166, 1e+167, 1e+168, 1e+169,
|
||||||
|
1e+170, 1e+171, 1e+172, 1e+173, 1e+174, 1e+175, 1e+176, 1e+177, 1e+178, 1e+179, 1e+180, 1e+181, 1e+182, 1e+183, 1e+184, 1e+185, 1e+186,
|
||||||
|
1e+187, 1e+188, 1e+189, 1e+190, 1e+191, 1e+192, 1e+193, 1e+194, 1e+195, 1e+196, 1e+197, 1e+198, 1e+199, 1e+200, 1e+201, 1e+202, 1e+203,
|
||||||
|
1e+204, 1e+205, 1e+206, 1e+207, 1e+208, 1e+209, 1e+210, 1e+211, 1e+212, 1e+213, 1e+214, 1e+215, 1e+216, 1e+217, 1e+218, 1e+219, 1e+220,
|
||||||
|
1e+221, 1e+222, 1e+223, 1e+224, 1e+225, 1e+226, 1e+227, 1e+228, 1e+229, 1e+230, 1e+231, 1e+232, 1e+233, 1e+234, 1e+235, 1e+236, 1e+237,
|
||||||
|
1e+238, 1e+239, 1e+240, 1e+241, 1e+242, 1e+243, 1e+244, 1e+245, 1e+246, 1e+247, 1e+248, 1e+249, 1e+250, 1e+251, 1e+252, 1e+253, 1e+254,
|
||||||
|
1e+255, 1e+256, 1e+257, 1e+258, 1e+259, 1e+260, 1e+261, 1e+262, 1e+263, 1e+264, 1e+265, 1e+266, 1e+267, 1e+268, 1e+269, 1e+270, 1e+271,
|
||||||
|
1e+272, 1e+273, 1e+274, 1e+275, 1e+276, 1e+277, 1e+278, 1e+279, 1e+280, 1e+281, 1e+282, 1e+283, 1e+284, 1e+285, 1e+286, 1e+287, 1e+288,
|
||||||
|
1e+289, 1e+290, 1e+291, 1e+292, 1e+293, 1e+294, 1e+295, 1e+296, 1e+297, 1e+298, 1e+299, 1e+300, 1e+301, 1e+302, 1e+303, 1e+304, 1e+305,
|
||||||
|
1e+306, 1e+307, 1e+308};
|
||||||
|
|
||||||
|
double n, y = modf(x, &n);
|
||||||
|
if (n > 308) return INFINITY;
|
||||||
|
if (n < -323) return 0;
|
||||||
|
|
||||||
|
// Using lookup table based formula to get accurate results for integer arguments.
|
||||||
|
return exp2(3.32192809488736234787031942948939 * y) * p10[static_cast<int>(n) + 323];
|
||||||
|
}
|
||||||
@ -8,9 +8,4 @@
|
|||||||
* Note: the function names are different to avoid confusion with symbols from the system libm.
|
* Note: the function names are different to avoid confusion with symbols from the system libm.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
|
|
||||||
double preciseExp10(double x);
|
double preciseExp10(double x);
|
||||||
|
|
||||||
}
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@ void sleepForNanoseconds(uint64_t nanoseconds)
|
|||||||
#if defined(OS_DARWIN)
|
#if defined(OS_DARWIN)
|
||||||
//https://developer.apple.com/library/archive/technotes/tn2169/_index.html
|
//https://developer.apple.com/library/archive/technotes/tn2169/_index.html
|
||||||
//https://dshil.github.io/blog/missed-os-x-clock-guide/
|
//https://dshil.github.io/blog/missed-os-x-clock-guide/
|
||||||
static mach_timebase_info_data_t timebase_info = {0};
|
static mach_timebase_info_data_t timebase_info{};
|
||||||
if (timebase_info.denom == 0)
|
if (timebase_info.denom == 0)
|
||||||
mach_timebase_info(&timebase_info);
|
mach_timebase_info(&timebase_info);
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <functional>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
template <class T, class Tag>
|
template <class T, class Tag>
|
||||||
struct StrongTypedef
|
struct StrongTypedef
|
||||||
|
|||||||
@ -1,5 +1,3 @@
|
|||||||
#define BOOST_TEST_MODULE StrongTypedef
|
|
||||||
|
|
||||||
#include <common/strong_typedef.h>
|
#include <common/strong_typedef.h>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
@ -12,15 +10,15 @@
|
|||||||
TEST(StrongTypedefSuite, TypedefsOfTheSameType)
|
TEST(StrongTypedefSuite, TypedefsOfTheSameType)
|
||||||
{
|
{
|
||||||
/// check that strong typedefs of same type differ
|
/// check that strong typedefs of same type differ
|
||||||
STRONG_TYPEDEF(int, Int);
|
STRONG_TYPEDEF(int, Int)
|
||||||
STRONG_TYPEDEF(int, AnotherInt);
|
STRONG_TYPEDEF(int, AnotherInt)
|
||||||
|
|
||||||
EXPECT_TRUE(!(std::is_same<Int, AnotherInt>::value));
|
EXPECT_TRUE(!(std::is_same<Int, AnotherInt>::value));
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(StrongTypedefSuite, Map)
|
TEST(StrongTypedefSuite, Map)
|
||||||
{
|
{
|
||||||
STRONG_TYPEDEF(int, Int);
|
STRONG_TYPEDEF(int, Int)
|
||||||
|
|
||||||
/// check that this code compiles
|
/// check that this code compiles
|
||||||
std::set<Int> int_set;
|
std::set<Int> int_set;
|
||||||
@ -31,13 +29,13 @@ TEST(StrongTypedefSuite, Map)
|
|||||||
|
|
||||||
TEST(StrongTypedefSuite, CopyAndMoveCtor)
|
TEST(StrongTypedefSuite, CopyAndMoveCtor)
|
||||||
{
|
{
|
||||||
STRONG_TYPEDEF(int, Int);
|
STRONG_TYPEDEF(int, Int)
|
||||||
Int a(1);
|
Int a(1);
|
||||||
Int b(2);
|
Int b(2);
|
||||||
a = b;
|
a = b;
|
||||||
EXPECT_EQ(a.toUnderType(), 2);
|
EXPECT_EQ(a.toUnderType(), 2);
|
||||||
|
|
||||||
STRONG_TYPEDEF(std::unique_ptr<int>, IntPtr);
|
STRONG_TYPEDEF(std::unique_ptr<int>, IntPtr)
|
||||||
{
|
{
|
||||||
IntPtr ptr;
|
IntPtr ptr;
|
||||||
ptr = IntPtr(std::make_unique<int>(3));
|
ptr = IntPtr(std::make_unique<int>(3));
|
||||||
@ -57,6 +55,6 @@ TEST(StrongTypedefSuite, NoDefaultCtor)
|
|||||||
NoDefaultCtor(int) {} // NOLINT
|
NoDefaultCtor(int) {} // NOLINT
|
||||||
};
|
};
|
||||||
|
|
||||||
STRONG_TYPEDEF(NoDefaultCtor, MyStruct);
|
STRONG_TYPEDEF(NoDefaultCtor, MyStruct)
|
||||||
MyStruct m(1);
|
MyStruct m(1);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,6 +7,10 @@ ADDINCL(
|
|||||||
|
|
||||||
CFLAGS (GLOBAL -DARCADIA_BUILD)
|
CFLAGS (GLOBAL -DARCADIA_BUILD)
|
||||||
|
|
||||||
|
CFLAGS (GLOBAL -DUSE_CPUID=1)
|
||||||
|
CFLAGS (GLOBAL -DUSE_JEMALLOC=0)
|
||||||
|
CFLAGS (GLOBAL -DUSE_RAPIDJSON=1)
|
||||||
|
|
||||||
IF (OS_DARWIN)
|
IF (OS_DARWIN)
|
||||||
CFLAGS (GLOBAL -DOS_DARWIN)
|
CFLAGS (GLOBAL -DOS_DARWIN)
|
||||||
ELSEIF (OS_FREEBSD)
|
ELSEIF (OS_FREEBSD)
|
||||||
@ -20,6 +24,7 @@ PEERDIR(
|
|||||||
contrib/libs/cxxsupp/libcxx-filesystem
|
contrib/libs/cxxsupp/libcxx-filesystem
|
||||||
contrib/libs/poco/Net
|
contrib/libs/poco/Net
|
||||||
contrib/libs/poco/Util
|
contrib/libs/poco/Util
|
||||||
|
contrib/libs/fmt
|
||||||
contrib/restricted/boost
|
contrib/restricted/boost
|
||||||
contrib/restricted/cityhash-1.0.2
|
contrib/restricted/cityhash-1.0.2
|
||||||
)
|
)
|
||||||
@ -37,11 +42,12 @@ SRCS(
|
|||||||
LineReader.cpp
|
LineReader.cpp
|
||||||
mremap.cpp
|
mremap.cpp
|
||||||
phdr_cache.cpp
|
phdr_cache.cpp
|
||||||
preciseExp10.c
|
preciseExp10.cpp
|
||||||
setTerminalEcho.cpp
|
setTerminalEcho.cpp
|
||||||
shift10.cpp
|
shift10.cpp
|
||||||
sleep.cpp
|
sleep.cpp
|
||||||
terminalColors.cpp
|
terminalColors.cpp
|
||||||
|
errnoToString.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
END()
|
END()
|
||||||
|
|||||||
@ -52,11 +52,12 @@
|
|||||||
#include <Common/Config/ConfigProcessor.h>
|
#include <Common/Config/ConfigProcessor.h>
|
||||||
|
|
||||||
#if !defined(ARCADIA_BUILD)
|
#if !defined(ARCADIA_BUILD)
|
||||||
# include <Common/config_version.h>
|
# include <Common/config_version.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(OS_DARWIN)
|
#if defined(OS_DARWIN)
|
||||||
# define _XOPEN_SOURCE 700 // ucontext is not available without _XOPEN_SOURCE
|
# pragma GCC diagnostic ignored "-Wunused-macros"
|
||||||
|
# define _XOPEN_SOURCE 700 // ucontext is not available without _XOPEN_SOURCE
|
||||||
#endif
|
#endif
|
||||||
#include <ucontext.h>
|
#include <ucontext.h>
|
||||||
|
|
||||||
@ -76,7 +77,7 @@ static void call_default_signal_handler(int sig)
|
|||||||
|
|
||||||
static constexpr size_t max_query_id_size = 127;
|
static constexpr size_t max_query_id_size = 127;
|
||||||
|
|
||||||
static const size_t buf_size =
|
static const size_t signal_pipe_buf_size =
|
||||||
sizeof(int)
|
sizeof(int)
|
||||||
+ sizeof(siginfo_t)
|
+ sizeof(siginfo_t)
|
||||||
+ sizeof(ucontext_t)
|
+ sizeof(ucontext_t)
|
||||||
@ -91,8 +92,8 @@ static void writeSignalIDtoSignalPipe(int sig)
|
|||||||
{
|
{
|
||||||
auto saved_errno = errno; /// We must restore previous value of errno in signal handler.
|
auto saved_errno = errno; /// We must restore previous value of errno in signal handler.
|
||||||
|
|
||||||
char buf[buf_size];
|
char buf[signal_pipe_buf_size];
|
||||||
DB::WriteBufferFromFileDescriptor out(signal_pipe.fds_rw[1], buf_size, buf);
|
DB::WriteBufferFromFileDescriptor out(signal_pipe.fds_rw[1], signal_pipe_buf_size, buf);
|
||||||
DB::writeBinary(sig, out);
|
DB::writeBinary(sig, out);
|
||||||
out.next();
|
out.next();
|
||||||
|
|
||||||
@ -117,13 +118,13 @@ static void signalHandler(int sig, siginfo_t * info, void * context)
|
|||||||
{
|
{
|
||||||
auto saved_errno = errno; /// We must restore previous value of errno in signal handler.
|
auto saved_errno = errno; /// We must restore previous value of errno in signal handler.
|
||||||
|
|
||||||
char buf[buf_size];
|
char buf[signal_pipe_buf_size];
|
||||||
DB::WriteBufferFromFileDescriptorDiscardOnFailure out(signal_pipe.fds_rw[1], buf_size, buf);
|
DB::WriteBufferFromFileDescriptorDiscardOnFailure out(signal_pipe.fds_rw[1], signal_pipe_buf_size, buf);
|
||||||
|
|
||||||
const ucontext_t signal_context = *reinterpret_cast<ucontext_t *>(context);
|
const ucontext_t signal_context = *reinterpret_cast<ucontext_t *>(context);
|
||||||
const StackTrace stack_trace(signal_context);
|
const StackTrace stack_trace(signal_context);
|
||||||
|
|
||||||
StringRef query_id = CurrentThread::getQueryId(); /// This is signal safe.
|
StringRef query_id = DB::CurrentThread::getQueryId(); /// This is signal safe.
|
||||||
query_id.size = std::min(query_id.size, max_query_id_size);
|
query_id.size = std::min(query_id.size, max_query_id_size);
|
||||||
|
|
||||||
DB::writeBinary(sig, out);
|
DB::writeBinary(sig, out);
|
||||||
@ -161,15 +162,15 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
explicit SignalListener(BaseDaemon & daemon_)
|
explicit SignalListener(BaseDaemon & daemon_)
|
||||||
: log(&Logger::get("BaseDaemon"))
|
: log(&Poco::Logger::get("BaseDaemon"))
|
||||||
, daemon(daemon_)
|
, daemon(daemon_)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void run()
|
void run() override
|
||||||
{
|
{
|
||||||
char buf[buf_size];
|
char buf[signal_pipe_buf_size];
|
||||||
DB::ReadBufferFromFileDescriptor in(signal_pipe.fds_rw[0], buf_size, buf);
|
DB::ReadBufferFromFileDescriptor in(signal_pipe.fds_rw[0], signal_pipe_buf_size, buf);
|
||||||
|
|
||||||
while (!in.eof())
|
while (!in.eof())
|
||||||
{
|
{
|
||||||
@ -179,7 +180,7 @@ public:
|
|||||||
// levels and more info, but for completeness we log all signals
|
// levels and more info, but for completeness we log all signals
|
||||||
// here at trace level.
|
// here at trace level.
|
||||||
// Don't use strsignal here, because it's not thread-safe.
|
// Don't use strsignal here, because it's not thread-safe.
|
||||||
LOG_TRACE(log, "Received signal " << sig);
|
LOG_TRACE(log, "Received signal {}", sig);
|
||||||
|
|
||||||
if (sig == Signals::StopThread)
|
if (sig == Signals::StopThread)
|
||||||
{
|
{
|
||||||
@ -230,12 +231,12 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Logger * log;
|
Poco::Logger * log;
|
||||||
BaseDaemon & daemon;
|
BaseDaemon & daemon;
|
||||||
|
|
||||||
void onTerminate(const std::string & message, UInt32 thread_num) const
|
void onTerminate(const std::string & message, UInt32 thread_num) const
|
||||||
{
|
{
|
||||||
LOG_FATAL(log, "(version " << VERSION_STRING << VERSION_OFFICIAL << ") (from thread " << thread_num << ") " << message);
|
LOG_FATAL(log, "(version {}{}) (from thread {}) {}", VERSION_STRING, VERSION_OFFICIAL, thread_num, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
void onFault(
|
void onFault(
|
||||||
@ -256,9 +257,9 @@ private:
|
|||||||
message << " (no query)";
|
message << " (no query)";
|
||||||
else
|
else
|
||||||
message << " (query_id: " << query_id << ")";
|
message << " (query_id: " << query_id << ")";
|
||||||
message << " Received signal " << strsignal(sig) << " (" << sig << ")" << ".";
|
message << " Received signal " << strsignal(sig) << " (" << sig << ").";
|
||||||
|
|
||||||
LOG_FATAL(log, message.rdbuf());
|
LOG_FATAL(log, message.str());
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_FATAL(log, signalToErrorMessage(sig, info, context));
|
LOG_FATAL(log, signalToErrorMessage(sig, info, context));
|
||||||
@ -273,7 +274,7 @@ private:
|
|||||||
for (size_t i = stack_trace.getOffset(); i < stack_trace.getSize(); ++i)
|
for (size_t i = stack_trace.getOffset(); i < stack_trace.getSize(); ++i)
|
||||||
bare_stacktrace << ' ' << stack_trace.getFrames()[i];
|
bare_stacktrace << ' ' << stack_trace.getFrames()[i];
|
||||||
|
|
||||||
LOG_FATAL(log, bare_stacktrace.rdbuf());
|
LOG_FATAL(log, bare_stacktrace.str());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Write symbolized stack trace line by line for better grep-ability.
|
/// Write symbolized stack trace line by line for better grep-ability.
|
||||||
@ -282,19 +283,56 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(SANITIZER)
|
||||||
|
extern "C" void __sanitizer_set_death_callback(void (*)());
|
||||||
|
|
||||||
|
static void sanitizerDeathCallback()
|
||||||
|
{
|
||||||
|
Poco::Logger * log = &Poco::Logger::get("BaseDaemon");
|
||||||
|
|
||||||
|
StringRef query_id = DB::CurrentThread::getQueryId(); /// This is signal safe.
|
||||||
|
|
||||||
|
{
|
||||||
|
std::stringstream message;
|
||||||
|
message << "(version " << VERSION_STRING << VERSION_OFFICIAL << ")";
|
||||||
|
message << " (from thread " << getThreadId() << ")";
|
||||||
|
if (query_id.size == 0)
|
||||||
|
message << " (no query)";
|
||||||
|
else
|
||||||
|
message << " (query_id: " << query_id << ")";
|
||||||
|
message << " Sanitizer trap.";
|
||||||
|
|
||||||
|
LOG_FATAL(log, message.str());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Just in case print our own stack trace. In case when llvm-symbolizer does not work.
|
||||||
|
StackTrace stack_trace;
|
||||||
|
if (stack_trace.getSize())
|
||||||
|
{
|
||||||
|
std::stringstream bare_stacktrace;
|
||||||
|
bare_stacktrace << "Stack trace:";
|
||||||
|
for (size_t i = stack_trace.getOffset(); i < stack_trace.getSize(); ++i)
|
||||||
|
bare_stacktrace << ' ' << stack_trace.getFrames()[i];
|
||||||
|
|
||||||
|
LOG_FATAL(log, bare_stacktrace.str());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Write symbolized stack trace line by line for better grep-ability.
|
||||||
|
stack_trace.toStringEveryLine([&](const std::string & s) { LOG_FATAL(log, s); });
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/** To use with std::set_terminate.
|
/** To use with std::set_terminate.
|
||||||
* Collects slightly more info than __gnu_cxx::__verbose_terminate_handler,
|
* Collects slightly more info than __gnu_cxx::__verbose_terminate_handler,
|
||||||
* and send it to pipe. Other thread will read this info from pipe and asynchronously write it to log.
|
* and send it to pipe. Other thread will read this info from pipe and asynchronously write it to log.
|
||||||
* Look at libstdc++-v3/libsupc++/vterminate.cc for example.
|
* Look at libstdc++-v3/libsupc++/vterminate.cc for example.
|
||||||
*/
|
*/
|
||||||
static void terminate_handler()
|
[[noreturn]] static void terminate_handler()
|
||||||
{
|
{
|
||||||
static thread_local bool terminating = false;
|
static thread_local bool terminating = false;
|
||||||
if (terminating)
|
if (terminating)
|
||||||
{
|
|
||||||
abort();
|
abort();
|
||||||
return; /// Just for convenience.
|
|
||||||
}
|
|
||||||
|
|
||||||
terminating = true;
|
terminating = true;
|
||||||
|
|
||||||
@ -341,7 +379,7 @@ static bool tryCreateDirectories(Poco::Logger * logger, const std::string & path
|
|||||||
}
|
}
|
||||||
catch (...)
|
catch (...)
|
||||||
{
|
{
|
||||||
LOG_WARNING(logger, __PRETTY_FUNCTION__ << ": when creating " << path << ", " << DB::getCurrentExceptionMessage(true));
|
LOG_WARNING(logger, "{}: when creating {}, {}", __PRETTY_FUNCTION__, path, DB::getCurrentExceptionMessage(true));
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -460,11 +498,10 @@ void debugIncreaseOOMScore()
|
|||||||
}
|
}
|
||||||
catch (const Poco::Exception & e)
|
catch (const Poco::Exception & e)
|
||||||
{
|
{
|
||||||
LOG_WARNING(&Logger::root(), "Failed to adjust OOM score: '" +
|
LOG_WARNING(&Poco::Logger::root(), "Failed to adjust OOM score: '{}'.", e.displayText());
|
||||||
e.displayText() + "'.");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
LOG_INFO(&Logger::root(), "Set OOM score adjustment to " + new_score);
|
LOG_INFO(&Poco::Logger::root(), "Set OOM score adjustment to {}", new_score);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
void debugIncreaseOOMScore() {}
|
void debugIncreaseOOMScore() {}
|
||||||
@ -524,12 +561,12 @@ void BaseDaemon::initialize(Application & self)
|
|||||||
/// This must be done before any usage of DateLUT. In particular, before any logging.
|
/// This must be done before any usage of DateLUT. In particular, before any logging.
|
||||||
if (config().has("timezone"))
|
if (config().has("timezone"))
|
||||||
{
|
{
|
||||||
const std::string timezone = config().getString("timezone");
|
const std::string config_timezone = config().getString("timezone");
|
||||||
if (0 != setenv("TZ", timezone.data(), 1))
|
if (0 != setenv("TZ", config_timezone.data(), 1))
|
||||||
throw Poco::Exception("Cannot setenv TZ variable");
|
throw Poco::Exception("Cannot setenv TZ variable");
|
||||||
|
|
||||||
tzset();
|
tzset();
|
||||||
DateLUT::setDefaultTimezone(timezone);
|
DateLUT::setDefaultTimezone(config_timezone);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string log_path = config().getString("logger.log", "");
|
std::string log_path = config().getString("logger.log", "");
|
||||||
@ -547,6 +584,9 @@ void BaseDaemon::initialize(Application & self)
|
|||||||
std::string stderr_path = config().getString("logger.stderr", log_path + "/stderr.log");
|
std::string stderr_path = config().getString("logger.stderr", log_path + "/stderr.log");
|
||||||
if (!freopen(stderr_path.c_str(), "a+", stderr))
|
if (!freopen(stderr_path.c_str(), "a+", stderr))
|
||||||
throw Poco::OpenFileException("Cannot attach stderr to " + stderr_path);
|
throw Poco::OpenFileException("Cannot attach stderr to " + stderr_path);
|
||||||
|
|
||||||
|
/// Disable buffering for stderr
|
||||||
|
setbuf(stderr, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((!log_path.empty() && is_daemon) || config().has("logger.stdout"))
|
if ((!log_path.empty() && is_daemon) || config().has("logger.stdout"))
|
||||||
@ -633,12 +673,18 @@ void BaseDaemon::initializeTerminationAndSignalProcessing()
|
|||||||
sa.sa_flags = SA_SIGINFO;
|
sa.sa_flags = SA_SIGINFO;
|
||||||
|
|
||||||
{
|
{
|
||||||
|
#if defined(OS_DARWIN)
|
||||||
|
sigemptyset(&sa.sa_mask);
|
||||||
|
for (auto signal : signals)
|
||||||
|
sigaddset(&sa.sa_mask, signal);
|
||||||
|
#else
|
||||||
if (sigemptyset(&sa.sa_mask))
|
if (sigemptyset(&sa.sa_mask))
|
||||||
throw Poco::Exception("Cannot set signal handler.");
|
throw Poco::Exception("Cannot set signal handler.");
|
||||||
|
|
||||||
for (auto signal : signals)
|
for (auto signal : signals)
|
||||||
if (sigaddset(&sa.sa_mask, signal))
|
if (sigaddset(&sa.sa_mask, signal))
|
||||||
throw Poco::Exception("Cannot set signal handler.");
|
throw Poco::Exception("Cannot set signal handler.");
|
||||||
|
#endif
|
||||||
|
|
||||||
for (auto signal : signals)
|
for (auto signal : signals)
|
||||||
if (sigaction(signal, &sa, nullptr))
|
if (sigaction(signal, &sa, nullptr))
|
||||||
@ -652,6 +698,10 @@ void BaseDaemon::initializeTerminationAndSignalProcessing()
|
|||||||
add_signal_handler({SIGHUP, SIGUSR1}, closeLogsSignalHandler);
|
add_signal_handler({SIGHUP, SIGUSR1}, closeLogsSignalHandler);
|
||||||
add_signal_handler({SIGINT, SIGQUIT, SIGTERM}, terminateRequestedSignalHandler);
|
add_signal_handler({SIGINT, SIGQUIT, SIGTERM}, terminateRequestedSignalHandler);
|
||||||
|
|
||||||
|
#if defined(SANITIZER)
|
||||||
|
__sanitizer_set_death_callback(sanitizerDeathCallback);
|
||||||
|
#endif
|
||||||
|
|
||||||
/// Set up Poco ErrorHandler for Poco Threads.
|
/// Set up Poco ErrorHandler for Poco Threads.
|
||||||
static KillingErrorHandler killing_error_handler;
|
static KillingErrorHandler killing_error_handler;
|
||||||
Poco::ErrorHandler::set(&killing_error_handler);
|
Poco::ErrorHandler::set(&killing_error_handler);
|
||||||
@ -665,7 +715,7 @@ void BaseDaemon::initializeTerminationAndSignalProcessing()
|
|||||||
|
|
||||||
void BaseDaemon::logRevision() const
|
void BaseDaemon::logRevision() const
|
||||||
{
|
{
|
||||||
Logger::root().information("Starting " + std::string{VERSION_FULL}
|
Poco::Logger::root().information("Starting " + std::string{VERSION_FULL}
|
||||||
+ " with revision " + std::to_string(ClickHouseRevision::get())
|
+ " with revision " + std::to_string(ClickHouseRevision::get())
|
||||||
+ ", PID " + std::to_string(getpid()));
|
+ ", PID " + std::to_string(getpid()));
|
||||||
}
|
}
|
||||||
@ -682,42 +732,42 @@ void BaseDaemon::handleNotification(Poco::TaskFailedNotification *_tfn)
|
|||||||
{
|
{
|
||||||
task_failed = true;
|
task_failed = true;
|
||||||
Poco::AutoPtr<Poco::TaskFailedNotification> fn(_tfn);
|
Poco::AutoPtr<Poco::TaskFailedNotification> fn(_tfn);
|
||||||
Logger *lg = &(logger());
|
Poco::Logger * lg = &(logger());
|
||||||
LOG_ERROR(lg, "Task '" << fn->task()->name() << "' failed. Daemon is shutting down. Reason - " << fn->reason().displayText());
|
LOG_ERROR(lg, "Task '{}' failed. Daemon is shutting down. Reason - {}", fn->task()->name(), fn->reason().displayText());
|
||||||
ServerApplication::terminate();
|
ServerApplication::terminate();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BaseDaemon::defineOptions(Poco::Util::OptionSet& _options)
|
void BaseDaemon::defineOptions(Poco::Util::OptionSet & new_options)
|
||||||
{
|
{
|
||||||
Poco::Util::ServerApplication::defineOptions (_options);
|
new_options.addOption(
|
||||||
|
|
||||||
_options.addOption(
|
|
||||||
Poco::Util::Option("config-file", "C", "load configuration from a given file")
|
Poco::Util::Option("config-file", "C", "load configuration from a given file")
|
||||||
.required(false)
|
.required(false)
|
||||||
.repeatable(false)
|
.repeatable(false)
|
||||||
.argument("<file>")
|
.argument("<file>")
|
||||||
.binding("config-file"));
|
.binding("config-file"));
|
||||||
|
|
||||||
_options.addOption(
|
new_options.addOption(
|
||||||
Poco::Util::Option("log-file", "L", "use given log file")
|
Poco::Util::Option("log-file", "L", "use given log file")
|
||||||
.required(false)
|
.required(false)
|
||||||
.repeatable(false)
|
.repeatable(false)
|
||||||
.argument("<file>")
|
.argument("<file>")
|
||||||
.binding("logger.log"));
|
.binding("logger.log"));
|
||||||
|
|
||||||
_options.addOption(
|
new_options.addOption(
|
||||||
Poco::Util::Option("errorlog-file", "E", "use given log file for errors only")
|
Poco::Util::Option("errorlog-file", "E", "use given log file for errors only")
|
||||||
.required(false)
|
.required(false)
|
||||||
.repeatable(false)
|
.repeatable(false)
|
||||||
.argument("<file>")
|
.argument("<file>")
|
||||||
.binding("logger.errorlog"));
|
.binding("logger.errorlog"));
|
||||||
|
|
||||||
_options.addOption(
|
new_options.addOption(
|
||||||
Poco::Util::Option("pid-file", "P", "use given pidfile")
|
Poco::Util::Option("pid-file", "P", "use given pidfile")
|
||||||
.required(false)
|
.required(false)
|
||||||
.repeatable(false)
|
.repeatable(false)
|
||||||
.argument("<file>")
|
.argument("<file>")
|
||||||
.binding("pid"));
|
.binding("pid"));
|
||||||
|
|
||||||
|
Poco::Util::ServerApplication::defineOptions(new_options);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isPidRunning(pid_t pid)
|
bool isPidRunning(pid_t pid)
|
||||||
@ -799,7 +849,7 @@ void BaseDaemon::handleSignal(int signal_id)
|
|||||||
void BaseDaemon::onInterruptSignals(int signal_id)
|
void BaseDaemon::onInterruptSignals(int signal_id)
|
||||||
{
|
{
|
||||||
is_cancelled = true;
|
is_cancelled = true;
|
||||||
LOG_INFO(&logger(), "Received termination signal (" << strsignal(signal_id) << ")");
|
LOG_INFO(&logger(), "Received termination signal ({})", strsignal(signal_id));
|
||||||
|
|
||||||
if (sigint_signals_counter >= 2)
|
if (sigint_signals_counter >= 2)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -58,7 +58,7 @@ public:
|
|||||||
void reloadConfiguration();
|
void reloadConfiguration();
|
||||||
|
|
||||||
/// Определяет параметр командной строки
|
/// Определяет параметр командной строки
|
||||||
void defineOptions(Poco::Util::OptionSet & _options) override;
|
void defineOptions(Poco::Util::OptionSet & new_options) override;
|
||||||
|
|
||||||
/// Заставляет демон завершаться, если хотя бы одна задача завершилась неудачно
|
/// Заставляет демон завершаться, если хотя бы одна задача завершилась неудачно
|
||||||
void exitOnTaskError();
|
void exitOnTaskError();
|
||||||
|
|||||||
@ -4,4 +4,4 @@ add_library (daemon
|
|||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories (daemon PUBLIC ..)
|
target_include_directories (daemon PUBLIC ..)
|
||||||
target_link_libraries (daemon PUBLIC loggers PRIVATE clickhouse_common_io clickhouse_common_config common ${Poco_Net_LIBRARY} ${Poco_Util_LIBRARY} ${EXECINFO_LIBRARIES})
|
target_link_libraries (daemon PUBLIC loggers PRIVATE clickhouse_common_io clickhouse_common_config common ${EXECINFO_LIBRARIES})
|
||||||
|
|||||||
@ -52,8 +52,7 @@ private:
|
|||||||
}
|
}
|
||||||
catch (const Poco::Exception & e)
|
catch (const Poco::Exception & e)
|
||||||
{
|
{
|
||||||
LOG_WARNING(&Poco::Util::Application::instance().logger(),
|
LOG_WARNING(&Poco::Util::Application::instance().logger(), "Fail to write to Graphite {}:{}. e.what() = {}, e.message() = {}", host, port, e.what(), e.message());
|
||||||
"Fail to write to Graphite " << host << ":" << port << ". e.what() = " << e.what() << ", e.message() = " << e.message());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,7 @@
|
|||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
#include <sstream>
|
||||||
|
|
||||||
|
|
||||||
namespace ext
|
namespace ext
|
||||||
|
|||||||
@ -1,42 +1,62 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <type_traits>
|
|
||||||
#include <boost/range/counting_range.hpp>
|
#include <boost/range/counting_range.hpp>
|
||||||
#include <boost/range/adaptor/transformed.hpp>
|
#include <boost/range/adaptor/transformed.hpp>
|
||||||
|
#include <type_traits>
|
||||||
|
|
||||||
|
|
||||||
namespace ext
|
namespace ext
|
||||||
{
|
{
|
||||||
/// For loop adaptor which is used to iterate through a half-closed interval [begin, end).
|
namespace internal
|
||||||
template <typename BeginType, typename EndType>
|
{
|
||||||
inline auto range(BeginType begin, EndType end)
|
template <typename ResultType, typename CountingType, typename BeginType, typename EndType>
|
||||||
|
auto rangeImpl(BeginType begin, EndType end)
|
||||||
{
|
{
|
||||||
using CommonType = typename std::common_type<BeginType, EndType>::type;
|
if constexpr (std::is_same_v<ResultType, CountingType>)
|
||||||
return boost::counting_range<CommonType>(begin, end);
|
return boost::counting_range<CountingType>(static_cast<CountingType>(begin), static_cast<CountingType>(end));
|
||||||
}
|
|
||||||
|
|
||||||
template <typename Type>
|
|
||||||
inline auto range(Type end)
|
|
||||||
{
|
|
||||||
return range<Type, Type>(static_cast<Type>(0), end);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The same as range(), but every value is casted statically to a specified `ValueType`.
|
|
||||||
/// This is useful to iterate through all constants of a enum.
|
|
||||||
template <typename ValueType, typename BeginType, typename EndType>
|
|
||||||
inline auto range_with_static_cast(BeginType begin, EndType end)
|
|
||||||
{
|
|
||||||
using CommonType = typename std::common_type<BeginType, EndType>::type;
|
|
||||||
if constexpr (std::is_same_v<ValueType, CommonType>)
|
|
||||||
return boost::counting_range<CommonType>(begin, end);
|
|
||||||
else
|
else
|
||||||
return boost::counting_range<CommonType>(begin, end)
|
return boost::counting_range<CountingType>(static_cast<CountingType>(begin), static_cast<CountingType>(end))
|
||||||
| boost::adaptors::transformed([](CommonType x) -> ValueType { return static_cast<ValueType>(x); });
|
| boost::adaptors::transformed([](CountingType x) { return static_cast<ResultType>(x); });
|
||||||
}
|
|
||||||
|
|
||||||
template <typename ValueType, typename EndType>
|
|
||||||
inline auto range_with_static_cast(EndType end)
|
|
||||||
{
|
|
||||||
return range_with_static_cast<ValueType, EndType, EndType>(static_cast<EndType>(0), end);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// For loop adaptor which is used to iterate through a half-closed interval [begin, end).
|
||||||
|
/// The parameters `begin` and `end` can have any integral or enum types.
|
||||||
|
template <typename BeginType,
|
||||||
|
typename EndType,
|
||||||
|
typename = std::enable_if_t<
|
||||||
|
(std::is_integral_v<BeginType> || std::is_enum_v<BeginType>) &&
|
||||||
|
(std::is_integral_v<EndType> || std::is_enum_v<EndType>) &&
|
||||||
|
(!std::is_enum_v<BeginType> || !std::is_enum_v<EndType> || std::is_same_v<BeginType, EndType>), void>>
|
||||||
|
inline auto range(BeginType begin, EndType end)
|
||||||
|
{
|
||||||
|
if constexpr (std::is_integral_v<BeginType> && std::is_integral_v<EndType>)
|
||||||
|
{
|
||||||
|
using CommonType = std::common_type_t<BeginType, EndType>;
|
||||||
|
return internal::rangeImpl<CommonType, CommonType>(begin, end);
|
||||||
|
}
|
||||||
|
else if constexpr (std::is_enum_v<BeginType>)
|
||||||
|
{
|
||||||
|
return internal::rangeImpl<BeginType, std::underlying_type_t<BeginType>>(begin, end);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return internal::rangeImpl<EndType, std::underlying_type_t<EndType>>(begin, end);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// For loop adaptor which is used to iterate through a half-closed interval [0, end).
|
||||||
|
/// The parameter `end` can have any integral or enum type.
|
||||||
|
/// The same as range(0, end).
|
||||||
|
template <typename Type,
|
||||||
|
typename = std::enable_if_t<std::is_integral_v<Type> || std::is_enum_v<Type>, void>>
|
||||||
|
inline auto range(Type end)
|
||||||
|
{
|
||||||
|
if constexpr (std::is_integral_v<Type>)
|
||||||
|
return internal::rangeImpl<Type, Type>(0, end);
|
||||||
|
else
|
||||||
|
return internal::rangeImpl<Type, std::underlying_type_t<Type>>(0, end);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
|
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
|
||||||
add_headers_and_sources(loggers .)
|
add_headers_and_sources(loggers .)
|
||||||
add_library(loggers ${loggers_sources} ${loggers_headers})
|
add_library(loggers ${loggers_sources} ${loggers_headers})
|
||||||
target_link_libraries(loggers PRIVATE dbms clickhouse_common_io ${Poco_Foundation_LIBRARY})
|
target_link_libraries(loggers PRIVATE dbms clickhouse_common_io)
|
||||||
target_include_directories(loggers PUBLIC ..)
|
target_include_directories(loggers PUBLIC ..)
|
||||||
|
|||||||
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
namespace DB
|
namespace DB
|
||||||
{
|
{
|
||||||
|
|
||||||
void OwnFormattingChannel::logExtended(const ExtendedLogMessage & msg)
|
void OwnFormattingChannel::logExtended(const ExtendedLogMessage & msg)
|
||||||
{
|
{
|
||||||
if (pChannel && priority >= msg.base.getPriority())
|
if (pChannel && priority >= msg.base.getPriority())
|
||||||
@ -28,5 +29,4 @@ void OwnFormattingChannel::log(const Poco::Message & msg)
|
|||||||
|
|
||||||
OwnFormattingChannel::~OwnFormattingChannel() = default;
|
OwnFormattingChannel::~OwnFormattingChannel() = default;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -69,7 +69,6 @@ void OwnSplitChannel::logSplit(const Poco::Message & msg)
|
|||||||
logs_queue->emplace(std::move(columns));
|
logs_queue->emplace(std::move(columns));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Also log to system.text_log table, if message is not too noisy
|
/// Also log to system.text_log table, if message is not too noisy
|
||||||
auto text_log_max_priority_loaded = text_log_max_priority.load(std::memory_order_relaxed);
|
auto text_log_max_priority_loaded = text_log_max_priority.load(std::memory_order_relaxed);
|
||||||
if (text_log_max_priority_loaded && msg.getPriority() <= text_log_max_priority_loaded)
|
if (text_log_max_priority_loaded && msg.getPriority() <= text_log_max_priority_loaded)
|
||||||
|
|||||||
@ -32,10 +32,18 @@ else ()
|
|||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
target_link_libraries(mysqlxx PUBLIC common ${Poco_Util_LIBRARY} ${Poco_Foundation_LIBRARY} PRIVATE ${MYSQLCLIENT_LIBRARIES} PUBLIC ${Boost_SYSTEM_LIBRARY} PRIVATE ${ZLIB_LIBRARIES})
|
target_link_libraries (mysqlxx
|
||||||
|
PUBLIC
|
||||||
|
common
|
||||||
|
PRIVATE
|
||||||
|
${MYSQLCLIENT_LIBRARIES}
|
||||||
|
${ZLIB_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
if(OPENSSL_LIBRARIES)
|
if(OPENSSL_LIBRARIES)
|
||||||
target_link_libraries(mysqlxx PRIVATE ${OPENSSL_LIBRARIES})
|
target_link_libraries(mysqlxx PRIVATE ${OPENSSL_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(mysqlxx PRIVATE ${PLATFORM_LIBRARIES})
|
target_link_libraries(mysqlxx PRIVATE ${PLATFORM_LIBRARIES})
|
||||||
|
|
||||||
if (NOT USE_INTERNAL_MYSQL_LIBRARY AND OPENSSL_INCLUDE_DIR)
|
if (NOT USE_INTERNAL_MYSQL_LIBRARY AND OPENSSL_INCLUDE_DIR)
|
||||||
|
|||||||
@ -18,8 +18,6 @@ std::string errorMessage(MYSQL * driver)
|
|||||||
return res.str();
|
return res.str();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Для внутренних нужд библиотеки.
|
|
||||||
void checkError(MYSQL * driver)
|
void checkError(MYSQL * driver)
|
||||||
{
|
{
|
||||||
unsigned num = mysql_errno(driver);
|
unsigned num = mysql_errno(driver);
|
||||||
@ -28,8 +26,6 @@ void checkError(MYSQL * driver)
|
|||||||
throw Exception(errorMessage(driver), num);
|
throw Exception(errorMessage(driver), num);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Для внутренних нужд библиотеки.
|
|
||||||
void onError(MYSQL * driver)
|
void onError(MYSQL * driver)
|
||||||
{
|
{
|
||||||
throw Exception(errorMessage(driver), mysql_errno(driver));
|
throw Exception(errorMessage(driver), mysql_errno(driver));
|
||||||
|
|||||||
@ -48,6 +48,6 @@ std::string errorMessage(MYSQL * driver);
|
|||||||
|
|
||||||
/// For internal need of library.
|
/// For internal need of library.
|
||||||
void checkError(MYSQL * driver);
|
void checkError(MYSQL * driver);
|
||||||
void onError(MYSQL * driver);
|
[[noreturn]] void onError(MYSQL * driver);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -27,7 +27,7 @@ public:
|
|||||||
Null() : is_null(true) {}
|
Null() : is_null(true) {}
|
||||||
Null(const Null<T> &) = default;
|
Null(const Null<T> &) = default;
|
||||||
Null(Null<T> &&) noexcept = default;
|
Null(Null<T> &&) noexcept = default;
|
||||||
Null(NullType data) : is_null(true) {}
|
Null(NullType) : is_null(true) {}
|
||||||
explicit Null(const T & data_) : data(data_), is_null(false) {}
|
explicit Null(const T & data_) : data(data_), is_null(false) {}
|
||||||
|
|
||||||
operator T & ()
|
operator T & ()
|
||||||
@ -47,7 +47,7 @@ public:
|
|||||||
Null<T> & operator= (Null<T> &&) noexcept = default;
|
Null<T> & operator= (Null<T> &&) noexcept = default;
|
||||||
Null<T> & operator= (const Null<T> &) = default;
|
Null<T> & operator= (const Null<T> &) = default;
|
||||||
Null<T> & operator= (const T & data_) { is_null = false; data = data_; return *this; }
|
Null<T> & operator= (const T & data_) { is_null = false; data = data_; return *this; }
|
||||||
Null<T> & operator= (const NullType other) { is_null = true; data = T(); return *this; }
|
Null<T> & operator= (const NullType) { is_null = true; data = T(); return *this; }
|
||||||
|
|
||||||
bool isNull() const { return is_null; }
|
bool isNull() const { return is_null; }
|
||||||
|
|
||||||
@ -57,7 +57,7 @@ public:
|
|||||||
|| (is_null == other.is_null && data < other.data);
|
|| (is_null == other.is_null && data < other.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator< (const NullType other) const { return false; }
|
bool operator< (const NullType) const { return false; }
|
||||||
|
|
||||||
bool operator== (const Null<T> & other) const
|
bool operator== (const Null<T> & other) const
|
||||||
{
|
{
|
||||||
@ -69,14 +69,14 @@ public:
|
|||||||
return !is_null && data == other;
|
return !is_null && data == other;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator== (const NullType other) const { return is_null; }
|
bool operator== (const NullType) const { return is_null; }
|
||||||
|
|
||||||
bool operator!= (const Null<T> & other) const
|
bool operator!= (const Null<T> & other) const
|
||||||
{
|
{
|
||||||
return !(*this == other);
|
return !(*this == other);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator!= (const NullType other) const { return !is_null; }
|
bool operator!= (const NullType) const { return !is_null; }
|
||||||
|
|
||||||
bool operator!= (const T & other) const
|
bool operator!= (const T & other) const
|
||||||
{
|
{
|
||||||
|
|||||||
@ -10,46 +10,47 @@ static bool startsWith(const std::string & s, const char * prefix)
|
|||||||
|
|
||||||
using namespace mysqlxx;
|
using namespace mysqlxx;
|
||||||
|
|
||||||
PoolWithFailover::PoolWithFailover(const Poco::Util::AbstractConfiguration & config,
|
PoolWithFailover::PoolWithFailover(const Poco::Util::AbstractConfiguration & config_,
|
||||||
const std::string & config_name, const unsigned default_connections,
|
const std::string & config_name_, const unsigned default_connections_,
|
||||||
const unsigned max_connections, const size_t max_tries)
|
const unsigned max_connections_, const size_t max_tries_)
|
||||||
: max_tries(max_tries)
|
: max_tries(max_tries_)
|
||||||
{
|
{
|
||||||
shareable = config.getBool(config_name + ".share_connection", false);
|
shareable = config_.getBool(config_name_ + ".share_connection", false);
|
||||||
if (config.has(config_name + ".replica"))
|
if (config_.has(config_name_ + ".replica"))
|
||||||
{
|
{
|
||||||
Poco::Util::AbstractConfiguration::Keys replica_keys;
|
Poco::Util::AbstractConfiguration::Keys replica_keys;
|
||||||
config.keys(config_name, replica_keys);
|
config_.keys(config_name_, replica_keys);
|
||||||
for (const auto & replica_config_key : replica_keys)
|
for (const auto & replica_config_key : replica_keys)
|
||||||
{
|
{
|
||||||
/// There could be another elements in the same level in configuration file, like "password", "port"...
|
/// There could be another elements in the same level in configuration file, like "password", "port"...
|
||||||
if (startsWith(replica_config_key, "replica"))
|
if (startsWith(replica_config_key, "replica"))
|
||||||
{
|
{
|
||||||
std::string replica_name = config_name + "." + replica_config_key;
|
std::string replica_name = config_name_ + "." + replica_config_key;
|
||||||
|
|
||||||
int priority = config.getInt(replica_name + ".priority", 0);
|
int priority = config_.getInt(replica_name + ".priority", 0);
|
||||||
|
|
||||||
replicas_by_priority[priority].emplace_back(
|
replicas_by_priority[priority].emplace_back(
|
||||||
std::make_shared<Pool>(config, replica_name, default_connections, max_connections, config_name.c_str()));
|
std::make_shared<Pool>(config_, replica_name, default_connections_, max_connections_, config_name_.c_str()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
replicas_by_priority[0].emplace_back(
|
replicas_by_priority[0].emplace_back(
|
||||||
std::make_shared<Pool>(config, config_name, default_connections, max_connections));
|
std::make_shared<Pool>(config_, config_name_, default_connections_, max_connections_));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
PoolWithFailover::PoolWithFailover(const std::string & config_name, const unsigned default_connections,
|
PoolWithFailover::PoolWithFailover(const std::string & config_name_, const unsigned default_connections_,
|
||||||
const unsigned max_connections, const size_t max_tries)
|
const unsigned max_connections_, const size_t max_tries_)
|
||||||
: PoolWithFailover{
|
: PoolWithFailover{
|
||||||
Poco::Util::Application::instance().config(), config_name,
|
Poco::Util::Application::instance().config(), config_name_,
|
||||||
default_connections, max_connections, max_tries}
|
default_connections_, max_connections_, max_tries_}
|
||||||
{}
|
{
|
||||||
|
}
|
||||||
|
|
||||||
PoolWithFailover::PoolWithFailover(const PoolWithFailover & other)
|
PoolWithFailover::PoolWithFailover(const PoolWithFailover & other)
|
||||||
: max_tries{other.max_tries}, config_name{other.config_name}, shareable{other.shareable}
|
: max_tries{other.max_tries}, shareable{other.shareable}
|
||||||
{
|
{
|
||||||
if (shareable)
|
if (shareable)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -77,7 +77,6 @@ namespace mysqlxx
|
|||||||
size_t max_tries;
|
size_t max_tries;
|
||||||
/// Mutex for set of replicas.
|
/// Mutex for set of replicas.
|
||||||
std::mutex mutex;
|
std::mutex mutex;
|
||||||
std::string config_name;
|
|
||||||
|
|
||||||
/// Can the Pool be shared
|
/// Can the Pool be shared
|
||||||
bool shareable;
|
bool shareable;
|
||||||
@ -91,16 +90,16 @@ namespace mysqlxx
|
|||||||
* max_connections Maximum number of connections in pool to each replica.
|
* max_connections Maximum number of connections in pool to each replica.
|
||||||
* max_tries_ Max number of connection tries.
|
* max_tries_ Max number of connection tries.
|
||||||
*/
|
*/
|
||||||
PoolWithFailover(const std::string & config_name,
|
PoolWithFailover(const std::string & config_name_,
|
||||||
unsigned default_connections = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
|
unsigned default_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
|
||||||
unsigned max_connections = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_CONNECTIONS,
|
unsigned max_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_CONNECTIONS,
|
||||||
size_t max_tries = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
|
size_t max_tries_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
|
||||||
|
|
||||||
PoolWithFailover(const Poco::Util::AbstractConfiguration & config,
|
PoolWithFailover(const Poco::Util::AbstractConfiguration & config_,
|
||||||
const std::string & config_name,
|
const std::string & config_name_,
|
||||||
unsigned default_connections = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
|
unsigned default_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
|
||||||
unsigned max_connections = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_CONNECTIONS,
|
unsigned max_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_CONNECTIONS,
|
||||||
size_t max_tries = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
|
size_t max_tries_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
|
||||||
|
|
||||||
PoolWithFailover(const PoolWithFailover & other);
|
PoolWithFailover(const PoolWithFailover & other);
|
||||||
|
|
||||||
|
|||||||
@ -11,29 +11,23 @@
|
|||||||
namespace mysqlxx
|
namespace mysqlxx
|
||||||
{
|
{
|
||||||
|
|
||||||
Query::Query(Connection * conn_, const std::string & query_string) : std::ostream(nullptr), conn(conn_)
|
Query::Query(Connection * conn_, const std::string & query_string) : conn(conn_)
|
||||||
{
|
{
|
||||||
/// Важно в случае, если Query используется не из того же потока, что Connection.
|
/// Важно в случае, если Query используется не из того же потока, что Connection.
|
||||||
mysql_thread_init();
|
mysql_thread_init();
|
||||||
|
|
||||||
init(&query_buf);
|
|
||||||
|
|
||||||
if (!query_string.empty())
|
if (!query_string.empty())
|
||||||
{
|
query_buf << query_string;
|
||||||
query_buf.str(query_string);
|
|
||||||
seekp(0, std::ios::end);
|
|
||||||
}
|
|
||||||
|
|
||||||
imbue(std::locale::classic());
|
query_buf.imbue(std::locale::classic());
|
||||||
}
|
}
|
||||||
|
|
||||||
Query::Query(const Query & other) : std::ostream(nullptr), conn(other.conn)
|
Query::Query(const Query & other) : conn(other.conn)
|
||||||
{
|
{
|
||||||
/// Важно в случае, если Query используется не из того же потока, что Connection.
|
/// Важно в случае, если Query используется не из того же потока, что Connection.
|
||||||
mysql_thread_init();
|
mysql_thread_init();
|
||||||
|
|
||||||
init(&query_buf);
|
query_buf.imbue(std::locale::classic());
|
||||||
imbue(std::locale::classic());
|
|
||||||
|
|
||||||
*this << other.str();
|
*this << other.str();
|
||||||
}
|
}
|
||||||
@ -45,9 +39,7 @@ Query & Query::operator= (const Query & other)
|
|||||||
|
|
||||||
conn = other.conn;
|
conn = other.conn;
|
||||||
|
|
||||||
seekp(0);
|
query_buf.str(other.str());
|
||||||
clear();
|
|
||||||
*this << other.str();
|
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
@ -59,9 +51,7 @@ Query::~Query()
|
|||||||
|
|
||||||
void Query::reset()
|
void Query::reset()
|
||||||
{
|
{
|
||||||
seekp(0);
|
query_buf.str({});
|
||||||
clear();
|
|
||||||
query_buf.str("");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Query::executeImpl()
|
void Query::executeImpl()
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <ostream>
|
|
||||||
|
|
||||||
#include <mysqlxx/UseQueryResult.h>
|
#include <mysqlxx/UseQueryResult.h>
|
||||||
#include <mysqlxx/StoreQueryResult.h>
|
#include <mysqlxx/StoreQueryResult.h>
|
||||||
@ -28,7 +27,7 @@ namespace mysqlxx
|
|||||||
*
|
*
|
||||||
* Внимание! Один объект запроса можно использовать только из одного потока.
|
* Внимание! Один объект запроса можно использовать только из одного потока.
|
||||||
*/
|
*/
|
||||||
class Query : public std::ostream
|
class Query
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Query(Connection * conn_, const std::string & query_string = "");
|
Query(Connection * conn_, const std::string & query_string = "");
|
||||||
@ -64,9 +63,21 @@ public:
|
|||||||
return query_buf.str();
|
return query_buf.str();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
auto rdbuf() const
|
||||||
|
{
|
||||||
|
return query_buf.rdbuf();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
inline Query & operator<< (T && x)
|
||||||
|
{
|
||||||
|
query_buf << std::forward<T>(x);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Connection * conn;
|
Connection * conn;
|
||||||
std::stringbuf query_buf;
|
std::ostringstream query_buf;
|
||||||
|
|
||||||
void executeImpl();
|
void executeImpl();
|
||||||
};
|
};
|
||||||
|
|||||||
@ -22,11 +22,11 @@ class ResultBase
|
|||||||
public:
|
public:
|
||||||
ResultBase(MYSQL_RES * res_, Connection * conn_, const Query * query_);
|
ResultBase(MYSQL_RES * res_, Connection * conn_, const Query * query_);
|
||||||
|
|
||||||
Connection * getConnection() { return conn; }
|
Connection * getConnection() { return conn; }
|
||||||
MYSQL_FIELDS getFields() { return fields; }
|
MYSQL_FIELDS getFields() { return fields; }
|
||||||
unsigned getNumFields() { return num_fields; }
|
unsigned getNumFields() { return num_fields; }
|
||||||
MYSQL_RES * getRes() { return res; }
|
MYSQL_RES * getRes() { return res; }
|
||||||
const Query * getQuery() const { return query; }
|
const Query * getQuery() const { return query; }
|
||||||
|
|
||||||
virtual ~ResultBase();
|
virtual ~ResultBase();
|
||||||
|
|
||||||
|
|||||||
@ -14,16 +14,15 @@ namespace mysqlxx
|
|||||||
StoreQueryResult::StoreQueryResult(MYSQL_RES * res_, Connection * conn_, const Query * query_) : ResultBase(res_, conn_, query_)
|
StoreQueryResult::StoreQueryResult(MYSQL_RES * res_, Connection * conn_, const Query * query_) : ResultBase(res_, conn_, query_)
|
||||||
{
|
{
|
||||||
UInt64 rows = mysql_num_rows(res);
|
UInt64 rows = mysql_num_rows(res);
|
||||||
UInt32 fields = getNumFields();
|
|
||||||
reserve(rows);
|
reserve(rows);
|
||||||
lengths.resize(rows * fields);
|
lengths.resize(rows * num_fields);
|
||||||
|
|
||||||
for (UInt64 i = 0; MYSQL_ROW row = mysql_fetch_row(res); ++i)
|
for (UInt64 i = 0; MYSQL_ROW row = mysql_fetch_row(res); ++i)
|
||||||
{
|
{
|
||||||
MYSQL_LENGTHS lengths_for_row = mysql_fetch_lengths(res);
|
MYSQL_LENGTHS lengths_for_row = mysql_fetch_lengths(res);
|
||||||
memcpy(&lengths[i * fields], lengths_for_row, sizeof(lengths[0]) * fields);
|
memcpy(&lengths[i * num_fields], lengths_for_row, sizeof(lengths[0]) * num_fields);
|
||||||
|
|
||||||
push_back(Row(row, this, &lengths[i * fields]));
|
push_back(Row(row, this, &lengths[i * num_fields]));
|
||||||
}
|
}
|
||||||
checkError(conn->getDriver());
|
checkError(conn->getDriver());
|
||||||
}
|
}
|
||||||
|
|||||||
@ -68,10 +68,10 @@ int main(int, char **)
|
|||||||
Queries queries;
|
Queries queries;
|
||||||
queries.push_back(query);
|
queries.push_back(query);
|
||||||
|
|
||||||
for (auto & query : queries)
|
for (auto & q : queries)
|
||||||
{
|
{
|
||||||
std::cerr << query.str() << std::endl;
|
std::cerr << q.str() << std::endl;
|
||||||
std::cerr << query.store().at(0) << std::endl;
|
std::cerr << q.store().at(0) << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,147 +0,0 @@
|
|||||||
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
|
||||||
# file Copyright.txt or https://cmake.org/licensing for details.
|
|
||||||
|
|
||||||
#.rst:
|
|
||||||
# FindMySQL
|
|
||||||
# -------
|
|
||||||
#
|
|
||||||
# Find ODBC Runtime
|
|
||||||
#
|
|
||||||
# This will define the following variables::
|
|
||||||
#
|
|
||||||
# ODBC_FOUND - True if the system has the libraries
|
|
||||||
# ODBC_INCLUDE_DIRS - where to find the headers
|
|
||||||
# ODBC_LIBRARIES - where to find the libraries
|
|
||||||
# ODBC_DEFINITIONS - compile definitons
|
|
||||||
#
|
|
||||||
# Hints:
|
|
||||||
# Set ``ODBC_ROOT_DIR`` to the root directory of an installation.
|
|
||||||
#
|
|
||||||
include(FindPackageHandleStandardArgs)
|
|
||||||
|
|
||||||
find_package(PkgConfig QUIET)
|
|
||||||
pkg_check_modules(PC_ODBC QUIET odbc)
|
|
||||||
|
|
||||||
if(WIN32)
|
|
||||||
get_filename_component(kit_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot]" REALPATH)
|
|
||||||
get_filename_component(kit81_dir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot81]" REALPATH)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_path(ODBC_INCLUDE_DIR
|
|
||||||
NAMES sql.h
|
|
||||||
HINTS
|
|
||||||
${ODBC_ROOT_DIR}/include
|
|
||||||
${ODBC_ROOT_INCLUDE_DIRS}
|
|
||||||
PATHS
|
|
||||||
${PC_ODBC_INCLUDE_DIRS}
|
|
||||||
/usr/include
|
|
||||||
/usr/local/include
|
|
||||||
/usr/local/odbc/include
|
|
||||||
/usr/local/iodbc/include
|
|
||||||
"C:/Program Files/ODBC/include"
|
|
||||||
"C:/Program Files/Microsoft SDKs/Windows/v7.0/include"
|
|
||||||
"C:/Program Files/Microsoft SDKs/Windows/v6.0a/include"
|
|
||||||
"C:/ODBC/include"
|
|
||||||
"${kit_dir}/Include/um"
|
|
||||||
"${kit81_dir}/Include/um"
|
|
||||||
PATH_SUFFIXES
|
|
||||||
odbc
|
|
||||||
iodbc
|
|
||||||
DOC "Specify the directory containing sql.h."
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT ODBC_INCLUDE_DIR AND WIN32)
|
|
||||||
set(ODBC_INCLUDE_DIR "")
|
|
||||||
else()
|
|
||||||
set(REQUIRED_INCLUDE_DIR ODBC_INCLUDE_DIR)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
||||||
set(WIN_ARCH x64)
|
|
||||||
elseif(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
|
|
||||||
set(WIN_ARCH x86)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_library(ODBC_LIBRARY
|
|
||||||
NAMES unixodbc iodbc odbc odbc32
|
|
||||||
HINTS
|
|
||||||
${ODBC_ROOT_DIR}/lib
|
|
||||||
${ODBC_ROOT_LIBRARY_DIRS}
|
|
||||||
PATHS
|
|
||||||
${PC_ODBC_LIBRARY_DIRS}
|
|
||||||
/usr/lib
|
|
||||||
/usr/local/lib
|
|
||||||
/usr/local/odbc/lib
|
|
||||||
/usr/local/iodbc/lib
|
|
||||||
"C:/Program Files/ODBC/lib"
|
|
||||||
"C:/ODBC/lib/debug"
|
|
||||||
"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib"
|
|
||||||
"${kit81_dir}/Lib/winv6.3/um"
|
|
||||||
"${kit_dir}/Lib/win8/um"
|
|
||||||
PATH_SUFIXES
|
|
||||||
odbc
|
|
||||||
${WIN_ARCH}
|
|
||||||
DOC "Specify the ODBC driver manager library here."
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT ODBC_LIBRARY AND WIN32)
|
|
||||||
# List names of ODBC libraries on Windows
|
|
||||||
set(ODBC_LIBRARY odbc32.lib)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# List additional libraries required to use ODBC library
|
|
||||||
if(WIN32 AND MSVC OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
|
|
||||||
set(_odbc_required_libs_names odbccp32;ws2_32)
|
|
||||||
endif()
|
|
||||||
foreach(_lib_name IN LISTS _odbc_required_libs_names)
|
|
||||||
find_library(_lib_path
|
|
||||||
NAMES ${_lib_name}
|
|
||||||
HINTS
|
|
||||||
${ODBC_ROOT_DIR}/lib
|
|
||||||
${ODBC_ROOT_LIBRARY_DIRS}
|
|
||||||
PATHS
|
|
||||||
${PC_ODBC_LIBRARY_DIRS}
|
|
||||||
/usr/lib
|
|
||||||
/usr/local/lib
|
|
||||||
/usr/local/odbc/lib
|
|
||||||
/usr/local/iodbc/lib
|
|
||||||
"C:/Program Files/ODBC/lib"
|
|
||||||
"C:/ODBC/lib/debug"
|
|
||||||
"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib"
|
|
||||||
PATH_SUFFIXES
|
|
||||||
odbc
|
|
||||||
)
|
|
||||||
if (_lib_path)
|
|
||||||
list(APPEND _odbc_required_libs_paths ${_lib_path})
|
|
||||||
endif()
|
|
||||||
unset(_lib_path CACHE)
|
|
||||||
endforeach()
|
|
||||||
unset(_odbc_lib_paths)
|
|
||||||
unset(_odbc_required_libs_names)
|
|
||||||
|
|
||||||
|
|
||||||
find_package_handle_standard_args(ODBC
|
|
||||||
FOUND_VAR ODBC_FOUND
|
|
||||||
REQUIRED_VARS
|
|
||||||
ODBC_LIBRARY
|
|
||||||
${REQUIRED_INCLUDE_DIR}
|
|
||||||
VERSION_VAR ODBC_VERSION
|
|
||||||
)
|
|
||||||
|
|
||||||
if(ODBC_FOUND)
|
|
||||||
set(ODBC_LIBRARIES ${ODBC_LIBRARY} ${_odbc_required_libs_paths} ${LTDL_LIBRARY})
|
|
||||||
set(ODBC_INCLUDE_DIRS ${ODBC_INCLUDE_DIR})
|
|
||||||
set(ODBC_DEFINITIONS ${PC_ODBC_CFLAGS_OTHER})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(ODBC_FOUND AND NOT TARGET ODBC::ODBC)
|
|
||||||
add_library(ODBC::ODBC UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(ODBC::ODBC PROPERTIES
|
|
||||||
IMPORTED_LOCATION "${ODBC_LIBRARY}"
|
|
||||||
INTERFACE_LINK_LIBRARIES "${_odbc_required_libs_paths}"
|
|
||||||
INTERFACE_COMPILE_OPTIONS "${PC_ODBC_CFLAGS_OTHER}"
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${ODBC_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
mark_as_advanced(ODBC_LIBRARY ODBC_INCLUDE_DIR)
|
|
||||||
55
cmake/Modules/FindOpenLDAP.cmake
Normal file
55
cmake/Modules/FindOpenLDAP.cmake
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
# Find OpenLDAP libraries.
|
||||||
|
#
|
||||||
|
# Can be configured with:
|
||||||
|
# OPENLDAP_ROOT_DIR - path to the OpenLDAP installation prefix
|
||||||
|
# OPENLDAP_USE_STATIC_LIBS - look for static version of the libraries
|
||||||
|
# OPENLDAP_USE_REENTRANT_LIBS - look for thread-safe version of the libraries
|
||||||
|
#
|
||||||
|
# Sets values of:
|
||||||
|
# OPENLDAP_FOUND - TRUE if found
|
||||||
|
# OPENLDAP_INCLUDE_DIR - path to the include directory
|
||||||
|
# OPENLDAP_LIBRARIES - paths to the libldap and liblber libraries
|
||||||
|
# OPENLDAP_LDAP_LIBRARY - paths to the libldap library
|
||||||
|
# OPENLDAP_LBER_LIBRARY - paths to the liblber library
|
||||||
|
#
|
||||||
|
|
||||||
|
if(OPENLDAP_USE_STATIC_LIBS)
|
||||||
|
set(_orig_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||||
|
if(WIN32)
|
||||||
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a" ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||||
|
else()
|
||||||
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(_r_suffix)
|
||||||
|
if(OPENLDAP_USE_REENTRANT_LIBS)
|
||||||
|
set(_r_suffix "_r")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(OPENLDAP_ROOT_DIR)
|
||||||
|
find_path(OPENLDAP_INCLUDE_DIR NAMES "ldap.h" "lber.h" PATHS "${OPENLDAP_ROOT_DIR}" PATH_SUFFIXES "include" NO_DEFAULT_PATH)
|
||||||
|
find_library(OPENLDAP_LDAP_LIBRARY NAMES "ldap${_r_suffix}" PATHS "${OPENLDAP_ROOT_DIR}" PATH_SUFFIXES "lib" NO_DEFAULT_PATH)
|
||||||
|
find_library(OPENLDAP_LBER_LIBRARY NAMES "lber" PATHS "${OPENLDAP_ROOT_DIR}" PATH_SUFFIXES "lib" NO_DEFAULT_PATH)
|
||||||
|
else()
|
||||||
|
find_path(OPENLDAP_INCLUDE_DIR NAMES "ldap.h" "lber.h")
|
||||||
|
find_library(OPENLDAP_LDAP_LIBRARY NAMES "ldap${_r_suffix}")
|
||||||
|
find_library(OPENLDAP_LBER_LIBRARY NAMES "lber")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
unset(_r_suffix)
|
||||||
|
|
||||||
|
set(OPENLDAP_LIBRARIES ${OPENLDAP_LDAP_LIBRARY} ${OPENLDAP_LBER_LIBRARY})
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
find_package_handle_standard_args(
|
||||||
|
OpenLDAP DEFAULT_MSG
|
||||||
|
OPENLDAP_INCLUDE_DIR OPENLDAP_LDAP_LIBRARY OPENLDAP_LBER_LIBRARY
|
||||||
|
)
|
||||||
|
|
||||||
|
mark_as_advanced(OPENLDAP_INCLUDE_DIR OPENLDAP_LIBRARIES OPENLDAP_LDAP_LIBRARY OPENLDAP_LBER_LIBRARY)
|
||||||
|
|
||||||
|
if(OPENLDAP_USE_STATIC_LIBS)
|
||||||
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_orig_CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||||
|
unset(_orig_CMAKE_FIND_LIBRARY_SUFFIXES)
|
||||||
|
endif()
|
||||||
@ -1,247 +0,0 @@
|
|||||||
# https://github.com/astahl/poco-cmake/blob/master/cmake/FindPoco.cmake
|
|
||||||
|
|
||||||
# - finds the Poco C++ libraries
|
|
||||||
# This module finds the Applied Informatics Poco libraries.
|
|
||||||
# It supports the following components:
|
|
||||||
#
|
|
||||||
# Util (loaded by default)
|
|
||||||
# Foundation (loaded by default)
|
|
||||||
# XML
|
|
||||||
# Zip
|
|
||||||
# Crypto
|
|
||||||
# Data
|
|
||||||
# Net
|
|
||||||
# NetSSL
|
|
||||||
# OSP
|
|
||||||
#
|
|
||||||
# Usage:
|
|
||||||
# set(ENV{Poco_DIR} path/to/poco/sdk)
|
|
||||||
# find_package(Poco REQUIRED OSP Data Crypto)
|
|
||||||
#
|
|
||||||
# On completion, the script defines the following variables:
|
|
||||||
#
|
|
||||||
# - Compound variables:
|
|
||||||
# Poco_FOUND
|
|
||||||
# - true if all requested components were found.
|
|
||||||
# Poco_LIBRARIES
|
|
||||||
# - contains release (and debug if available) libraries for all requested components.
|
|
||||||
# It has the form "optimized LIB1 debug LIBd1 optimized LIB2 ...", ready for use with the target_link_libraries command.
|
|
||||||
# Poco_INCLUDE_DIRS
|
|
||||||
# - Contains include directories for all requested components.
|
|
||||||
#
|
|
||||||
# - Component variables:
|
|
||||||
# Poco_Xxx_FOUND
|
|
||||||
# - Where Xxx is the properly cased component name (eg. 'Util', 'OSP').
|
|
||||||
# True if a component's library or debug library was found successfully.
|
|
||||||
# Poco_Xxx_LIBRARY
|
|
||||||
# - Library for component Xxx.
|
|
||||||
# Poco_Xxx_LIBRARY_DEBUG
|
|
||||||
# - debug library for component Xxx
|
|
||||||
# Poco_Xxx_INCLUDE_DIR
|
|
||||||
# - include directory for component Xxx
|
|
||||||
#
|
|
||||||
# - OSP BundleCreator variables: (i.e. bundle.exe on windows, bundle on unix-likes)
|
|
||||||
# (is only discovered if OSP is a requested component)
|
|
||||||
# Poco_OSP_Bundle_EXECUTABLE_FOUND
|
|
||||||
# - true if the bundle-creator executable was found.
|
|
||||||
# Poco_OSP_Bundle_EXECUTABLE
|
|
||||||
# - the path to the bundle-creator executable.
|
|
||||||
#
|
|
||||||
# Author: Andreas Stahl andreas.stahl@tu-dresden.de
|
|
||||||
|
|
||||||
set(Poco_HINTS
|
|
||||||
/usr/local
|
|
||||||
/usr/local/include/Poco
|
|
||||||
C:/AppliedInformatics
|
|
||||||
${Poco_DIR}
|
|
||||||
$ENV{Poco_DIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT Poco_ROOT_DIR)
|
|
||||||
# look for the root directory, first for the source-tree variant
|
|
||||||
find_path(Poco_ROOT_DIR
|
|
||||||
NAMES Foundation/include/Poco/Poco.h
|
|
||||||
HINTS ${Poco_HINTS}
|
|
||||||
)
|
|
||||||
if(NOT Poco_ROOT_DIR)
|
|
||||||
# this means poco may have a different directory structure, maybe it was installed, let's check for that
|
|
||||||
message(STATUS "Looking for Poco install directory structure.")
|
|
||||||
find_path(Poco_ROOT_DIR
|
|
||||||
NAMES include/Poco/Poco.h
|
|
||||||
HINTS ${Poco_HINTS}
|
|
||||||
)
|
|
||||||
if(NOT Poco_ROOT_DIR)
|
|
||||||
# poco was still not found -> Fail
|
|
||||||
if(Poco_FIND_REQUIRED)
|
|
||||||
message(FATAL_ERROR "Poco: Could not find Poco install directory")
|
|
||||||
endif()
|
|
||||||
if(NOT Poco_FIND_QUIETLY)
|
|
||||||
message(STATUS "Poco: Could not find Poco install directory")
|
|
||||||
endif()
|
|
||||||
return()
|
|
||||||
else()
|
|
||||||
# poco was found with the make install directory structure
|
|
||||||
message(STATUS "Assuming Poco install directory structure at ${Poco_ROOT_DIR}.")
|
|
||||||
set(Poco_INSTALLED true)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# add dynamic library directory
|
|
||||||
if(WIN32)
|
|
||||||
find_path(Poco_RUNTIME_LIBRARY_DIRS
|
|
||||||
NAMES PocoFoundation.dll
|
|
||||||
HINTS ${Poco_ROOT_DIR}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
bin
|
|
||||||
lib
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# if installed directory structure, set full include dir
|
|
||||||
if(Poco_INSTALLED)
|
|
||||||
set(Poco_INCLUDE_DIRS ${Poco_ROOT_DIR}/include/ CACHE PATH "The global include path for Poco")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# append the default minimum components to the list to find
|
|
||||||
list(APPEND components
|
|
||||||
${Poco_FIND_COMPONENTS}
|
|
||||||
# default components:
|
|
||||||
"Util"
|
|
||||||
"Foundation"
|
|
||||||
)
|
|
||||||
list(REMOVE_DUPLICATES components) # remove duplicate defaults
|
|
||||||
|
|
||||||
foreach( component ${components} )
|
|
||||||
#if(NOT Poco_${component}_FOUND)
|
|
||||||
|
|
||||||
# include directory for the component
|
|
||||||
if(NOT Poco_${component}_INCLUDE_DIR)
|
|
||||||
set (component_alt "${component}")
|
|
||||||
set (component_root "${component}")
|
|
||||||
if (${component} STREQUAL "DataODBC")
|
|
||||||
set (component_top "Data")
|
|
||||||
set (component_in "ODBC")
|
|
||||||
set (component_root "Data/ODBC")
|
|
||||||
endif ()
|
|
||||||
if (${component} STREQUAL "SQLODBC")
|
|
||||||
set (component_top "SQL")
|
|
||||||
set (component_in "ODBC")
|
|
||||||
set (component_root "SQL/ODBC")
|
|
||||||
endif ()
|
|
||||||
if (${component} STREQUAL "NetSSL")
|
|
||||||
set (component_alt "Net")
|
|
||||||
set (component_root "NetSSL_OpenSSL")
|
|
||||||
endif ()
|
|
||||||
find_path(Poco_${component}_INCLUDE_DIR
|
|
||||||
NAMES
|
|
||||||
Poco/${component}.h # e.g. Foundation.h
|
|
||||||
Poco/${component}/${component}.h # e.g. OSP/OSP.h Util/Util.h
|
|
||||||
Poco/${component_alt}/${component}.h # e.g. Net/NetSSL.h
|
|
||||||
Poco/${component_top}/${component_in}/${component_in}.h # e.g. Data/ODBC/ODBC.h
|
|
||||||
HINTS
|
|
||||||
${Poco_ROOT_DIR}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
include
|
|
||||||
${component_root}/include
|
|
||||||
)
|
|
||||||
# message(STATUS "poco include debug: {component}: ${Poco_${component}_INCLUDE_DIR}")
|
|
||||||
endif()
|
|
||||||
if(NOT Poco_${component}_INCLUDE_DIR)
|
|
||||||
message(WARNING "Poco_${component}_INCLUDE_DIR NOT FOUND")
|
|
||||||
else()
|
|
||||||
list(APPEND Poco_INCLUDE_DIRS ${Poco_${component}_INCLUDE_DIR})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# release library
|
|
||||||
if(NOT Poco_${component}_LIBRARY)
|
|
||||||
find_library(
|
|
||||||
Poco_${component}_LIBRARY
|
|
||||||
NAMES Poco${component}
|
|
||||||
HINTS ${Poco_ROOT_DIR}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
lib
|
|
||||||
bin
|
|
||||||
)
|
|
||||||
if(Poco_${component}_LIBRARY)
|
|
||||||
message(STATUS "Found Poco ${component}: ${Poco_${component}_LIBRARY}")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
if(Poco_${component}_LIBRARY)
|
|
||||||
list(APPEND Poco_LIBRARIES "optimized" ${Poco_${component}_LIBRARY} )
|
|
||||||
mark_as_advanced(Poco_${component}_LIBRARY)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# debug library
|
|
||||||
if(NOT Poco_${component}_LIBRARY_DEBUG)
|
|
||||||
find_library(
|
|
||||||
Poco_${component}_LIBRARY_DEBUG
|
|
||||||
Names Poco${component}d
|
|
||||||
HINTS ${Poco_ROOT_DIR}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
lib
|
|
||||||
bin
|
|
||||||
)
|
|
||||||
if(Poco_${component}_LIBRARY_DEBUG)
|
|
||||||
message(STATUS "Found Poco ${component} (debug): ${Poco_${component}_LIBRARY_DEBUG}")
|
|
||||||
endif()
|
|
||||||
endif(NOT Poco_${component}_LIBRARY_DEBUG)
|
|
||||||
if(Poco_${component}_LIBRARY_DEBUG)
|
|
||||||
list(APPEND Poco_LIBRARIES "debug" ${Poco_${component}_LIBRARY_DEBUG})
|
|
||||||
mark_as_advanced(Poco_${component}_LIBRARY_DEBUG)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# mark component as found or handle not finding it
|
|
||||||
if(Poco_${component}_LIBRARY_DEBUG OR Poco_${component}_LIBRARY)
|
|
||||||
set(Poco_${component}_FOUND TRUE)
|
|
||||||
elseif(NOT Poco_FIND_QUIETLY)
|
|
||||||
message(WARNING "Could not find Poco component ${component}!")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# message(STATUS "Poco component ${component}: Poco_${component}_LIBRARY : Poco_${component}_INCLUDE_DIR")
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
if(Poco_DataODBC_LIBRARY)
|
|
||||||
list(APPEND Poco_DataODBC_LIBRARY ${ODBC_LIBRARIES} ${LTDL_LIBRARY})
|
|
||||||
list(APPEND Poco_INCLUDE_DIRS ${ODBC_INCLUDE_DIRS})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(Poco_SQLODBC_LIBRARY)
|
|
||||||
list(APPEND Poco_SQLODBC_LIBRARY ${ODBC_LIBRARIES} ${LTDL_LIBRARY})
|
|
||||||
list(APPEND Poco_INCLUDE_DIRS ${ODBC_INCLUDE_DIRS})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(Poco_NetSSL_LIBRARY)
|
|
||||||
list(APPEND Poco_NetSSL_LIBRARY ${OPENSSL_LIBRARIES})
|
|
||||||
list(APPEND Poco_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(DEFINED Poco_LIBRARIES)
|
|
||||||
set(Poco_FOUND true)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(${Poco_OSP_FOUND})
|
|
||||||
# find the osp bundle program
|
|
||||||
find_program(
|
|
||||||
Poco_OSP_Bundle_EXECUTABLE
|
|
||||||
NAMES bundle
|
|
||||||
HINTS
|
|
||||||
${Poco_RUNTIME_LIBRARY_DIRS}
|
|
||||||
${Poco_ROOT_DIR}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
bin
|
|
||||||
OSP/BundleCreator/bin/Darwin/x86_64
|
|
||||||
OSP/BundleCreator/bin/Darwin/i386
|
|
||||||
DOC "The executable that bundles OSP packages according to a .bndlspec specification."
|
|
||||||
)
|
|
||||||
if(Poco_OSP_Bundle_EXECUTABLE)
|
|
||||||
set(Poco_OSP_Bundle_EXECUTABLE_FOUND true)
|
|
||||||
endif()
|
|
||||||
# include bundle script file
|
|
||||||
find_file(Poco_OSP_Bundles_file NAMES PocoBundles.cmake HINTS ${CMAKE_MODULE_PATH})
|
|
||||||
if(${Poco_OSP_Bundles_file})
|
|
||||||
include(${Poco_OSP_Bundles_file})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
message(STATUS "Found Poco: ${Poco_LIBRARIES}")
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
# - Try to find metrohash headers and libraries.
|
|
||||||
#
|
|
||||||
# Usage of this module as follows:
|
|
||||||
#
|
|
||||||
# find_package(metrohash)
|
|
||||||
#
|
|
||||||
# Variables used by this module, they can change the default behaviour and need
|
|
||||||
# to be set before calling find_package:
|
|
||||||
#
|
|
||||||
# METROHASH_ROOT_DIR Set this variable to the root installation of
|
|
||||||
# metrohash if the module has problems finding
|
|
||||||
# the proper installation path.
|
|
||||||
#
|
|
||||||
# Variables defined by this module:
|
|
||||||
#
|
|
||||||
# METROHASH_FOUND System has metrohash libs/headers
|
|
||||||
# METROHASH_LIBRARIES The metrohash library/libraries
|
|
||||||
# METROHASH_INCLUDE_DIR The location of metrohash headers
|
|
||||||
|
|
||||||
find_path(METROHASH_ROOT_DIR
|
|
||||||
NAMES include/metrohash.h
|
|
||||||
)
|
|
||||||
|
|
||||||
find_library(METROHASH_LIBRARIES
|
|
||||||
NAMES metrohash
|
|
||||||
PATHS ${METROHASH_ROOT_DIR}/lib ${METROHASH_LIBRARIES_PATHS}
|
|
||||||
)
|
|
||||||
|
|
||||||
find_path(METROHASH_INCLUDE_DIR
|
|
||||||
NAMES metrohash.h
|
|
||||||
PATHS ${METROHASH_ROOT_DIR}/include PATH_SUFFIXES metrohash ${METROHASH_INCLUDE_PATHS}
|
|
||||||
)
|
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
|
||||||
find_package_handle_standard_args(metrohash DEFAULT_MSG
|
|
||||||
METROHASH_LIBRARIES
|
|
||||||
METROHASH_INCLUDE_DIR
|
|
||||||
)
|
|
||||||
|
|
||||||
mark_as_advanced(
|
|
||||||
METROHASH_ROOT_DIR
|
|
||||||
METROHASH_LIBRARIES
|
|
||||||
METROHASH_INCLUDE_DIR
|
|
||||||
)
|
|
||||||
9
cmake/autogenerated_versions.txt
Normal file
9
cmake/autogenerated_versions.txt
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# This strings autochanged from release_lib.sh:
|
||||||
|
SET(VERSION_REVISION 54435)
|
||||||
|
SET(VERSION_MAJOR 20)
|
||||||
|
SET(VERSION_MINOR 5)
|
||||||
|
SET(VERSION_PATCH 1)
|
||||||
|
SET(VERSION_GITHASH 91df18a906dcffdbee6816e5389df6c65f86e35f)
|
||||||
|
SET(VERSION_DESCRIBE v20.5.1.1-prestable)
|
||||||
|
SET(VERSION_STRING 20.5.1.1)
|
||||||
|
# end of autochange
|
||||||
@ -1,52 +0,0 @@
|
|||||||
option (USE_INTERNAL_BOOST_LIBRARY "Set to FALSE to use system boost library instead of bundled" ${NOT_UNBUNDLED})
|
|
||||||
|
|
||||||
# Test random file existing in all package variants
|
|
||||||
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/boost/libs/system/src/error_code.cpp")
|
|
||||||
if(USE_INTERNAL_BOOST_LIBRARY)
|
|
||||||
message(WARNING "submodules in contrib/boost is missing. to fix try run: \n git submodule update --init --recursive")
|
|
||||||
endif()
|
|
||||||
set (USE_INTERNAL_BOOST_LIBRARY 0)
|
|
||||||
set (MISSING_INTERNAL_BOOST_LIBRARY 1)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (NOT USE_INTERNAL_BOOST_LIBRARY)
|
|
||||||
set (Boost_USE_STATIC_LIBS ${USE_STATIC_LIBRARIES})
|
|
||||||
set (BOOST_ROOT "/usr/local")
|
|
||||||
find_package (Boost 1.60 COMPONENTS program_options system filesystem thread regex)
|
|
||||||
# incomplete, no include search, who use it?
|
|
||||||
if (NOT Boost_FOUND)
|
|
||||||
# # Try to find manually.
|
|
||||||
# set (BOOST_PATHS "")
|
|
||||||
# find_library (Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options PATHS ${BOOST_PATHS})
|
|
||||||
# find_library (Boost_SYSTEM_LIBRARY boost_system PATHS ${BOOST_PATHS})
|
|
||||||
# find_library (Boost_FILESYSTEM_LIBRARY boost_filesystem PATHS ${BOOST_PATHS})
|
|
||||||
# maybe found but incorrect version.
|
|
||||||
set (Boost_INCLUDE_DIRS "")
|
|
||||||
set (Boost_SYSTEM_LIBRARY "")
|
|
||||||
endif ()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (NOT Boost_SYSTEM_LIBRARY AND NOT MISSING_INTERNAL_BOOST_LIBRARY)
|
|
||||||
set (USE_INTERNAL_BOOST_LIBRARY 1)
|
|
||||||
set (Boost_SYSTEM_LIBRARY boost_system_internal)
|
|
||||||
set (Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options_internal)
|
|
||||||
set (Boost_FILESYSTEM_LIBRARY boost_filesystem_internal ${Boost_SYSTEM_LIBRARY})
|
|
||||||
set (Boost_IOSTREAMS_LIBRARY boost_iostreams_internal)
|
|
||||||
set (Boost_REGEX_LIBRARY boost_regex_internal)
|
|
||||||
|
|
||||||
set (Boost_INCLUDE_DIRS)
|
|
||||||
|
|
||||||
set (BOOST_ROOT "${ClickHouse_SOURCE_DIR}/contrib/boost")
|
|
||||||
|
|
||||||
# For boost from github:
|
|
||||||
file (GLOB Boost_INCLUDE_DIRS_ "${ClickHouse_SOURCE_DIR}/contrib/boost/libs/*/include")
|
|
||||||
list (APPEND Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIRS_})
|
|
||||||
# numeric has additional level
|
|
||||||
file (GLOB Boost_INCLUDE_DIRS_ "${ClickHouse_SOURCE_DIR}/contrib/boost/libs/numeric/*/include")
|
|
||||||
list (APPEND Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIRS_})
|
|
||||||
|
|
||||||
# For packaged version:
|
|
||||||
list (APPEND Boost_INCLUDE_DIRS "${ClickHouse_SOURCE_DIR}/contrib/boost")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
message (STATUS "Using Boost: ${Boost_INCLUDE_DIRS} : ${Boost_PROGRAM_OPTIONS_LIBRARY},${Boost_SYSTEM_LIBRARY},${Boost_FILESYSTEM_LIBRARY},${Boost_IOSTREAMS_LIBRARY},${Boost_REGEX_LIBRARY}")
|
|
||||||
26
cmake/find/cassandra.cmake
Normal file
26
cmake/find/cassandra.cmake
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
option(ENABLE_CASSANDRA "Enable Cassandra" ${ENABLE_LIBRARIES})
|
||||||
|
|
||||||
|
if (ENABLE_CASSANDRA)
|
||||||
|
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libuv")
|
||||||
|
message (ERROR "submodule contrib/libuv is missing. to fix try run: \n git submodule update --init --recursive")
|
||||||
|
elseif (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
|
||||||
|
message (ERROR "submodule contrib/cassandra is missing. to fix try run: \n git submodule update --init --recursive")
|
||||||
|
else()
|
||||||
|
set (LIBUV_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libuv")
|
||||||
|
set (CASSANDRA_INCLUDE_DIR
|
||||||
|
"${ClickHouse_SOURCE_DIR}/contrib/cassandra/include/")
|
||||||
|
if (USE_STATIC_LIBRARIES)
|
||||||
|
set (LIBUV_LIBRARY uv_a)
|
||||||
|
set (CASSANDRA_LIBRARY cassandra_static)
|
||||||
|
else()
|
||||||
|
set (LIBUV_LIBRARY uv)
|
||||||
|
set (CASSANDRA_LIBRARY cassandra)
|
||||||
|
endif()
|
||||||
|
set (USE_CASSANDRA 1)
|
||||||
|
set (CASS_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
|
||||||
|
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
message (STATUS "Using cassandra=${USE_CASSANDRA}: ${CASSANDRA_INCLUDE_DIR} : ${CASSANDRA_LIBRARY}")
|
||||||
|
message (STATUS "Using libuv: ${LIBUV_ROOT_DIR} : ${LIBUV_LIBRARY}")
|
||||||
@ -1,32 +0,0 @@
|
|||||||
# ARM: Cannot cpuid_get_raw_data: CPUID instruction is not supported
|
|
||||||
if (NOT ARCH_ARM)
|
|
||||||
option (USE_INTERNAL_CPUID_LIBRARY "Set to FALSE to use system cpuid library instead of bundled" ${NOT_UNBUNDLED})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (USE_INTERNAL_CPUID_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libcpuid/CMakeLists.txt")
|
|
||||||
message (WARNING "submodule contrib/libcpuid is missing. to fix try run: \n git submodule update --init --recursive")
|
|
||||||
set (USE_INTERNAL_CPUID_LIBRARY 0)
|
|
||||||
set (MISSING_INTERNAL_CPUID_LIBRARY 1)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (NOT USE_INTERNAL_CPUID_LIBRARY)
|
|
||||||
find_library (CPUID_LIBRARY cpuid)
|
|
||||||
find_path (CPUID_INCLUDE_DIR NAMES libcpuid/libcpuid.h PATHS ${CPUID_INCLUDE_PATHS})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (CPUID_LIBRARY AND CPUID_INCLUDE_DIR)
|
|
||||||
if (OS_FREEBSD)
|
|
||||||
# need in /usr/local/include/libcpuid/libcpuid_types.h
|
|
||||||
# Freebsd: /usr/local/include/libcpuid/libcpuid_types.h:61:29: error: conflicting declaration 'typedef long long int int64_t'
|
|
||||||
add_definitions(-DHAVE_STDINT_H)
|
|
||||||
# TODO: make virtual target cpuid:cpuid with COMPILE_DEFINITIONS property
|
|
||||||
endif ()
|
|
||||||
set (USE_CPUID 1)
|
|
||||||
elseif (NOT ARCH_ARM AND NOT MISSING_INTERNAL_CPUID_LIBRARY)
|
|
||||||
set (CPUID_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libcpuid/include)
|
|
||||||
set (USE_INTERNAL_CPUID_LIBRARY 1)
|
|
||||||
set (CPUID_LIBRARY cpuid)
|
|
||||||
set (USE_CPUID 1)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
message (STATUS "Using cpuid=${USE_CPUID}: ${CPUID_INCLUDE_DIR} : ${CPUID_LIBRARY}")
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
option(USE_INTERNAL_CPUINFO_LIBRARY "Set to FALSE to use system cpuinfo library instead of bundled" ${NOT_UNBUNDLED})
|
|
||||||
|
|
||||||
# Now we have no contrib/libcpuinfo, use from system.
|
|
||||||
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libcpuinfo/include")
|
|
||||||
#message (WARNING "submodule contrib/libcpuinfo is missing. to fix try run: \n git submodule update --init --recursive")
|
|
||||||
set (USE_INTERNAL_CPUINFO_LIBRARY 0)
|
|
||||||
set (MISSING_INTERNAL_CPUINFO_LIBRARY 1)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if(NOT USE_INTERNAL_CPUINFO_LIBRARY)
|
|
||||||
find_library(CPUINFO_LIBRARY cpuinfo)
|
|
||||||
find_path(CPUINFO_INCLUDE_DIR NAMES cpuinfo.h PATHS ${CPUINFO_INCLUDE_PATHS})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CPUINFO_LIBRARY AND CPUINFO_INCLUDE_DIR)
|
|
||||||
set(USE_CPUINFO 1)
|
|
||||||
elseif(NOT MISSING_INTERNAL_CPUINFO_LIBRARY)
|
|
||||||
set(CPUINFO_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libcpuinfo/include)
|
|
||||||
set(USE_INTERNAL_CPUINFO_LIBRARY 1)
|
|
||||||
set(CPUINFO_LIBRARY cpuinfo)
|
|
||||||
set(USE_CPUINFO 1)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
message(STATUS "Using cpuinfo=${USE_CPUINFO}: ${CPUINFO_INCLUDE_DIR} : ${CPUINFO_LIBRARY}")
|
|
||||||
@ -1,57 +1,26 @@
|
|||||||
set(_PROTOBUF_PROTOC $<TARGET_FILE:protoc>)
|
option (ENABLE_GRPC "Use gRPC" ${ENABLE_LIBRARIES})
|
||||||
set(_GRPC_CPP_PLUGIN_EXECUTABLE $<TARGET_FILE:grpc_cpp_plugin>)
|
|
||||||
|
|
||||||
function(PROTOBUF_GENERATE_GRPC_CPP SRCS HDRS)
|
if (ENABLE_GRPC)
|
||||||
if(NOT ARGN)
|
option (USE_INTERNAL_GRPC_LIBRARY "Set to FALSE to use system gRPC library instead of bundled" ${NOT_UNBUNDLED})
|
||||||
message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(PROTOBUF_GENERATE_CPP_APPEND_PATH)
|
if (USE_INTERNAL_GRPC_LIBRARY)
|
||||||
foreach(FIL ${ARGN})
|
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/grpc/include/grpc++/grpc++.h")
|
||||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
message(WARNING "submodule contrib/grpc is missing. To fix try run: \n git submodule update --init --recursive")
|
||||||
get_filename_component(ABS_PATH ${ABS_FIL} PATH)
|
set (USE_INTERNAL_GRPC_LIBRARY OFF)
|
||||||
list(FIND _protobuf_include_path ${ABS_PATH} _contains_already)
|
elif (NOT USE_PROTOBUF)
|
||||||
if(${_contains_already} EQUAL -1)
|
message(WARNING "gRPC requires protobuf which is disabled")
|
||||||
list(APPEND _protobuf_include_path -I ${ABS_PATH})
|
set (USE_INTERNAL_GRPC_LIBRARY OFF)
|
||||||
endif()
|
else()
|
||||||
endforeach()
|
set (GRPC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/grpc/include")
|
||||||
else()
|
set (GRPC_LIBRARY "libgrpc++")
|
||||||
set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
|
set (USE_GRPC ON)
|
||||||
endif()
|
endif()
|
||||||
|
else()
|
||||||
|
find_package(grpc)
|
||||||
|
if (GRPC_INCLUDE_DIR AND GRPC_LIBRARY)
|
||||||
|
set (USE_GRPC ON)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
if(DEFINED PROTOBUF_IMPORT_DIRS)
|
message(STATUS "Using gRPC=${USE_GRPC}: ${GRPC_INCLUDE_DIR} : ${GRPC_LIBRARY}")
|
||||||
foreach(DIR ${Protobuf_IMPORT_DIRS})
|
|
||||||
get_filename_component(ABS_PATH ${DIR} ABSOLUTE)
|
|
||||||
list(FIND _protobuf_include_path ${ABS_PATH} _contains_already)
|
|
||||||
if(${_contains_already} EQUAL -1)
|
|
||||||
list(APPEND _protobuf_include_path -I ${ABS_PATH})
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(${SRCS})
|
|
||||||
set(${HDRS})
|
|
||||||
foreach(FIL ${ARGN})
|
|
||||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
|
||||||
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
|
||||||
|
|
||||||
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.grpc.pb.cc")
|
|
||||||
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.grpc.pb.h")
|
|
||||||
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.grpc.pb.cc"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.grpc.pb.h"
|
|
||||||
COMMAND ${_PROTOBUF_PROTOC}
|
|
||||||
ARGS --grpc_out=${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
--plugin=protoc-gen-grpc=${_GRPC_CPP_PLUGIN_EXECUTABLE}
|
|
||||||
${_protobuf_include_path} ${ABS_FIL}
|
|
||||||
DEPENDS ${ABS_FIL}
|
|
||||||
COMMENT "Running gRPC C++ protocol buffer compiler on ${FIL}"
|
|
||||||
VERBATIM)
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
|
|
||||||
set(${SRCS} ${${SRCS}} PARENT_SCOPE)
|
|
||||||
set(${HDRS} ${${HDRS}} PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|||||||
@ -1,33 +0,0 @@
|
|||||||
if (HAVE_SSSE3)
|
|
||||||
option (ENABLE_HYPERSCAN "Enable hyperscan" ${ENABLE_LIBRARIES})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (ENABLE_HYPERSCAN)
|
|
||||||
|
|
||||||
option (USE_INTERNAL_HYPERSCAN_LIBRARY "Set to FALSE to use system hyperscan instead of the bundled" ${NOT_UNBUNDLED})
|
|
||||||
|
|
||||||
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/hyperscan/CMakeLists.txt")
|
|
||||||
if (USE_INTERNAL_HYPERSCAN_LIBRARY)
|
|
||||||
message (WARNING "submodule contrib/hyperscan is missing. to fix try run: \n git submodule update --init --recursive")
|
|
||||||
endif ()
|
|
||||||
set (MISSING_INTERNAL_HYPERSCAN_LIBRARY 1)
|
|
||||||
set (USE_INTERNAL_HYPERSCAN_LIBRARY 0)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (NOT USE_INTERNAL_HYPERSCAN_LIBRARY)
|
|
||||||
find_library (HYPERSCAN_LIBRARY hs)
|
|
||||||
find_path (HYPERSCAN_INCLUDE_DIR NAMES hs/hs.h hs.h PATHS ${HYPERSCAN_INCLUDE_PATHS})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (HYPERSCAN_LIBRARY AND HYPERSCAN_INCLUDE_DIR)
|
|
||||||
set (USE_HYPERSCAN 1)
|
|
||||||
elseif (NOT MISSING_INTERNAL_HYPERSCAN_LIBRARY)
|
|
||||||
set (HYPERSCAN_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/hyperscan/src)
|
|
||||||
set (HYPERSCAN_LIBRARY hs)
|
|
||||||
set (USE_HYPERSCAN 1)
|
|
||||||
set (USE_INTERNAL_HYPERSCAN_LIBRARY 1)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
message (STATUS "Using hyperscan=${USE_HYPERSCAN}: ${HYPERSCAN_INCLUDE_DIR} : ${HYPERSCAN_LIBRARY}")
|
|
||||||
|
|
||||||
endif ()
|
|
||||||
76
cmake/find/ldap.cmake
Normal file
76
cmake/find/ldap.cmake
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
option (ENABLE_LDAP "Enable LDAP" ${ENABLE_LIBRARIES})
|
||||||
|
|
||||||
|
if (ENABLE_LDAP)
|
||||||
|
option (USE_INTERNAL_LDAP_LIBRARY "Set to FALSE to use system *LDAP library instead of bundled" ${NOT_UNBUNDLED})
|
||||||
|
|
||||||
|
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/openldap/README")
|
||||||
|
if (USE_INTERNAL_LDAP_LIBRARY)
|
||||||
|
message (WARNING "Submodule contrib/openldap is missing. To fix try running:\n git submodule update --init --recursive")
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
set (USE_INTERNAL_LDAP_LIBRARY 0)
|
||||||
|
set (MISSING_INTERNAL_LDAP_LIBRARY 1)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
set (OPENLDAP_USE_STATIC_LIBS ${USE_STATIC_LIBRARIES})
|
||||||
|
set (OPENLDAP_USE_REENTRANT_LIBS 1)
|
||||||
|
|
||||||
|
if (NOT USE_INTERNAL_LDAP_LIBRARY)
|
||||||
|
if (APPLE AND NOT OPENLDAP_ROOT_DIR)
|
||||||
|
set (OPENLDAP_ROOT_DIR "/usr/local/opt/openldap")
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
find_package (OpenLDAP)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
if (NOT OPENLDAP_FOUND AND NOT MISSING_INTERNAL_LDAP_LIBRARY)
|
||||||
|
string (TOLOWER "${CMAKE_SYSTEM_NAME}" _system_name)
|
||||||
|
string (TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _system_processor)
|
||||||
|
|
||||||
|
if (
|
||||||
|
"${_system_processor}" STREQUAL "amd64" OR
|
||||||
|
"${_system_processor}" STREQUAL "x64"
|
||||||
|
)
|
||||||
|
set (_system_processor "x86_64")
|
||||||
|
elseif (
|
||||||
|
"${_system_processor}" STREQUAL "arm64"
|
||||||
|
)
|
||||||
|
set (_system_processor "aarch64")
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
if (
|
||||||
|
( "${_system_name}" STREQUAL "linux" AND "${_system_processor}" STREQUAL "x86_64" ) OR
|
||||||
|
( "${_system_name}" STREQUAL "linux" AND "${_system_processor}" STREQUAL "aarch64" ) OR
|
||||||
|
( "${_system_name}" STREQUAL "freebsd" AND "${_system_processor}" STREQUAL "x86_64" ) OR
|
||||||
|
( "${_system_name}" STREQUAL "darwin" AND "${_system_processor}" STREQUAL "x86_64" )
|
||||||
|
)
|
||||||
|
set (_ldap_supported_platform TRUE)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
if (NOT _ldap_supported_platform)
|
||||||
|
message (WARNING "LDAP support using the bundled library is not implemented for ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR} platform.")
|
||||||
|
elseif (NOT USE_SSL)
|
||||||
|
message (WARNING "LDAP support using the bundled library is not possible if SSL is not used.")
|
||||||
|
else ()
|
||||||
|
set (USE_INTERNAL_LDAP_LIBRARY 1)
|
||||||
|
set (OPENLDAP_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/openldap")
|
||||||
|
set (OPENLDAP_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/openldap/include")
|
||||||
|
# Below, 'ldap'/'ldap_r' and 'lber' will be resolved to
|
||||||
|
# the targets defined in contrib/openldap-cmake/CMakeLists.txt
|
||||||
|
if (OPENLDAP_USE_REENTRANT_LIBS)
|
||||||
|
set (OPENLDAP_LDAP_LIBRARY "ldap_r")
|
||||||
|
else ()
|
||||||
|
set (OPENLDAP_LDAP_LIBRARY "ldap")
|
||||||
|
endif()
|
||||||
|
set (OPENLDAP_LBER_LIBRARY "lber")
|
||||||
|
set (OPENLDAP_LIBRARIES ${OPENLDAP_LDAP_LIBRARY} ${OPENLDAP_LBER_LIBRARY})
|
||||||
|
set (OPENLDAP_FOUND 1)
|
||||||
|
endif ()
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
if (OPENLDAP_FOUND)
|
||||||
|
set (USE_LDAP 1)
|
||||||
|
endif ()
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
message (STATUS "Using ldap=${USE_LDAP}: ${OPENLDAP_INCLUDE_DIR} : ${OPENLDAP_LIBRARIES}")
|
||||||
@ -1,23 +0,0 @@
|
|||||||
option (USE_INTERNAL_LZ4_LIBRARY "Set to FALSE to use system lz4 library instead of bundled" ${NOT_UNBUNDLED})
|
|
||||||
|
|
||||||
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/lz4/lib/lz4.h")
|
|
||||||
if (USE_INTERNAL_LZ4_LIBRARY)
|
|
||||||
message (WARNING "submodule contrib/lz4 is missing. to fix try run: \n git submodule update --init --recursive")
|
|
||||||
set (USE_INTERNAL_LZ4_LIBRARY 0)
|
|
||||||
endif ()
|
|
||||||
set (MISSING_INTERNAL_LZ4_LIBRARY 1)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (NOT USE_INTERNAL_LZ4_LIBRARY)
|
|
||||||
find_library (LZ4_LIBRARY lz4)
|
|
||||||
find_path (LZ4_INCLUDE_DIR NAMES lz4.h PATHS ${LZ4_INCLUDE_PATHS})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (LZ4_LIBRARY AND LZ4_INCLUDE_DIR)
|
|
||||||
elseif (NOT MISSING_INTERNAL_LZ4_LIBRARY)
|
|
||||||
set (LZ4_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/lz4/lib)
|
|
||||||
set (USE_INTERNAL_LZ4_LIBRARY 1)
|
|
||||||
set (LZ4_LIBRARY lz4)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
message (STATUS "Using lz4: ${LZ4_INCLUDE_DIR} : ${LZ4_LIBRARY}")
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
# This file copied from contrib/poco/cmake/FindODBC.cmake to allow build without submodules
|
|
||||||
|
|
||||||
if(OS_LINUX)
|
|
||||||
option (ENABLE_ODBC "Enable ODBC" ${ENABLE_LIBRARIES})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(ENABLE_ODBC)
|
|
||||||
if (OS_LINUX)
|
|
||||||
option(USE_INTERNAL_ODBC_LIBRARY "Set to FALSE to use system odbc library instead of bundled" ${NOT_UNBUNDLED})
|
|
||||||
else ()
|
|
||||||
option(USE_INTERNAL_ODBC_LIBRARY "Set to FALSE to use system odbc library instead of bundled" OFF)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(USE_INTERNAL_ODBC_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/unixodbc/README")
|
|
||||||
message(WARNING "submodule contrib/unixodbc is missing. to fix try run: \n git submodule update --init --recursive")
|
|
||||||
set(USE_INTERNAL_ODBC_LIBRARY 0)
|
|
||||||
set(MISSING_INTERNAL_ODBC_LIBRARY 1)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(ODBC_INCLUDE_DIRS ) # Include directories will be either used automatically by target_include_directories or set later.
|
|
||||||
if(USE_INTERNAL_ODBC_LIBRARY AND NOT MISSING_INTERNAL_ODBC_LIBRARY)
|
|
||||||
set(ODBC_LIBRARY unixodbc)
|
|
||||||
set(ODBC_LIBRARIES ${ODBC_LIBRARY})
|
|
||||||
set(ODBC_INCLUDE_DIRS "${ClickHouse_SOURCE_DIR}/contrib/unixodbc/include")
|
|
||||||
set(ODBC_FOUND 1)
|
|
||||||
else()
|
|
||||||
find_package(ODBC)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if(ODBC_FOUND)
|
|
||||||
set(USE_ODBC 1)
|
|
||||||
set(ODBC_INCLUDE_DIRECTORIES ${ODBC_INCLUDE_DIRS}) # for old poco
|
|
||||||
set(ODBC_INCLUDE_DIR ${ODBC_INCLUDE_DIRS}) # for old poco
|
|
||||||
endif()
|
|
||||||
|
|
||||||
message(STATUS "Using odbc=${USE_ODBC}: ${ODBC_INCLUDE_DIRS} : ${ODBC_LIBRARIES}")
|
|
||||||
endif()
|
|
||||||
23
cmake/find/opencl.cmake
Normal file
23
cmake/find/opencl.cmake
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
# TODO: enable by default
|
||||||
|
if(0)
|
||||||
|
option(ENABLE_OPENCL "Enable OpenCL support" ${ENABLE_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_OPENCL)
|
||||||
|
|
||||||
|
# Intel OpenCl driver: sudo apt install intel-opencl-icd
|
||||||
|
# @sa https://github.com/intel/compute-runtime/releases
|
||||||
|
|
||||||
|
# OpenCL applications should link wiht ICD loader
|
||||||
|
# sudo apt install opencl-headers ocl-icd-libopencl1
|
||||||
|
# sudo ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so
|
||||||
|
# TODO: add https://github.com/OCL-dev/ocl-icd as submodule instead
|
||||||
|
|
||||||
|
find_package(OpenCL)
|
||||||
|
if(OpenCL_FOUND)
|
||||||
|
set(USE_OPENCL 1)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
endif()
|
||||||
|
|
||||||
|
message(STATUS "Using opencl=${USE_OPENCL}: ${OpenCL_INCLUDE_DIRS} : ${OpenCL_LIBRARIES}")
|
||||||
@ -63,13 +63,14 @@ elseif(NOT MISSING_INTERNAL_PARQUET_LIBRARY AND NOT OS_FREEBSD)
|
|||||||
set(ARROW_LIBRARY arrow_shared)
|
set(ARROW_LIBRARY arrow_shared)
|
||||||
set(PARQUET_LIBRARY parquet_shared)
|
set(PARQUET_LIBRARY parquet_shared)
|
||||||
if(USE_INTERNAL_PARQUET_LIBRARY_NATIVE_CMAKE)
|
if(USE_INTERNAL_PARQUET_LIBRARY_NATIVE_CMAKE)
|
||||||
list(APPEND PARQUET_LIBRARY ${Boost_REGEX_LIBRARY})
|
list(APPEND PARQUET_LIBRARY boost::regex)
|
||||||
endif()
|
endif()
|
||||||
set(THRIFT_LIBRARY thrift)
|
set(THRIFT_LIBRARY thrift)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(USE_PARQUET 1)
|
set(USE_PARQUET 1)
|
||||||
set(USE_ORC 1)
|
set(USE_ORC 1)
|
||||||
|
set(USE_ARROW 1)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
@ -1,178 +0,0 @@
|
|||||||
option (USE_INTERNAL_POCO_LIBRARY "Set to FALSE to use system poco library instead of bundled" ${NOT_UNBUNDLED})
|
|
||||||
|
|
||||||
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/poco/CMakeLists.txt")
|
|
||||||
if (USE_INTERNAL_POCO_LIBRARY)
|
|
||||||
message (WARNING "submodule contrib/poco is missing. to fix try run: \n git submodule update --init --recursive")
|
|
||||||
endif ()
|
|
||||||
set (USE_INTERNAL_POCO_LIBRARY 0)
|
|
||||||
set (MISSING_INTERNAL_POCO_LIBRARY 1)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (NOT ENABLE_LIBRARIES)
|
|
||||||
set (ENABLE_POCO_NETSSL ${ENABLE_LIBRARIES} CACHE BOOL "")
|
|
||||||
set (ENABLE_POCO_MONGODB ${ENABLE_LIBRARIES} CACHE BOOL "")
|
|
||||||
set (ENABLE_POCO_REDIS ${ENABLE_LIBRARIES} CACHE BOOL "")
|
|
||||||
set (ENABLE_POCO_ODBC ${ENABLE_LIBRARIES} CACHE BOOL "")
|
|
||||||
set (ENABLE_POCO_SQL ${ENABLE_LIBRARIES} CACHE BOOL "")
|
|
||||||
set (ENABLE_POCO_JSON ${ENABLE_LIBRARIES} CACHE BOOL "")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
set (POCO_COMPONENTS Net XML SQL Data)
|
|
||||||
if (NOT DEFINED ENABLE_POCO_NETSSL OR ENABLE_POCO_NETSSL)
|
|
||||||
list (APPEND POCO_COMPONENTS Crypto NetSSL)
|
|
||||||
endif ()
|
|
||||||
if (NOT DEFINED ENABLE_POCO_MONGODB OR ENABLE_POCO_MONGODB)
|
|
||||||
set(ENABLE_POCO_MONGODB 1 CACHE BOOL "")
|
|
||||||
list (APPEND POCO_COMPONENTS MongoDB)
|
|
||||||
else ()
|
|
||||||
set(ENABLE_POCO_MONGODB 0 CACHE BOOL "")
|
|
||||||
endif ()
|
|
||||||
if (NOT DEFINED ENABLE_POCO_REDIS OR ENABLE_POCO_REDIS)
|
|
||||||
list (APPEND POCO_COMPONENTS Redis)
|
|
||||||
endif ()
|
|
||||||
# TODO: after new poco release with SQL library rename ENABLE_POCO_ODBC -> ENABLE_POCO_SQLODBC
|
|
||||||
if (NOT DEFINED ENABLE_POCO_ODBC OR ENABLE_POCO_ODBC)
|
|
||||||
list (APPEND POCO_COMPONENTS DataODBC)
|
|
||||||
list (APPEND POCO_COMPONENTS SQLODBC)
|
|
||||||
endif ()
|
|
||||||
if (NOT DEFINED ENABLE_POCO_JSON OR ENABLE_POCO_JSON)
|
|
||||||
list (APPEND POCO_COMPONENTS JSON)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (NOT USE_INTERNAL_POCO_LIBRARY)
|
|
||||||
find_package (Poco COMPONENTS ${POCO_COMPONENTS})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (Poco_INCLUDE_DIRS AND Poco_Foundation_LIBRARY)
|
|
||||||
elseif (NOT MISSING_INTERNAL_POCO_LIBRARY)
|
|
||||||
set (USE_INTERNAL_POCO_LIBRARY 1)
|
|
||||||
|
|
||||||
set (ENABLE_ZIP 0 CACHE BOOL "")
|
|
||||||
set (ENABLE_PAGECOMPILER 0 CACHE BOOL "")
|
|
||||||
set (ENABLE_PAGECOMPILER_FILE2PAGE 0 CACHE BOOL "")
|
|
||||||
set (ENABLE_DATA_SQLITE 0 CACHE BOOL "")
|
|
||||||
set (ENABLE_DATA_MYSQL 0 CACHE BOOL "")
|
|
||||||
set (ENABLE_DATA_POSTGRESQL 0 CACHE BOOL "")
|
|
||||||
set (ENABLE_ENCODINGS 0 CACHE BOOL "")
|
|
||||||
set (ENABLE_MONGODB ${ENABLE_POCO_MONGODB} CACHE BOOL "" FORCE)
|
|
||||||
|
|
||||||
# new after 2.0.0:
|
|
||||||
set (POCO_ENABLE_ZIP 0 CACHE BOOL "")
|
|
||||||
set (POCO_ENABLE_PAGECOMPILER 0 CACHE BOOL "")
|
|
||||||
set (POCO_ENABLE_PAGECOMPILER_FILE2PAGE 0 CACHE BOOL "")
|
|
||||||
set (POCO_ENABLE_SQL_SQLITE 0 CACHE BOOL "")
|
|
||||||
set (POCO_ENABLE_SQL_MYSQL 0 CACHE BOOL "")
|
|
||||||
set (POCO_ENABLE_SQL_POSTGRESQL 0 CACHE BOOL "")
|
|
||||||
|
|
||||||
set (POCO_UNBUNDLED 1 CACHE BOOL "")
|
|
||||||
set (POCO_UNBUNDLED_PCRE 0 CACHE BOOL "")
|
|
||||||
set (POCO_UNBUNDLED_EXPAT 0 CACHE BOOL "")
|
|
||||||
set (POCO_STATIC ${MAKE_STATIC_LIBRARIES} CACHE BOOL "")
|
|
||||||
set (POCO_VERBOSE_MESSAGES 1 CACHE BOOL "")
|
|
||||||
|
|
||||||
|
|
||||||
# used in internal compiler
|
|
||||||
list (APPEND Poco_INCLUDE_DIRS
|
|
||||||
"${ClickHouse_SOURCE_DIR}/contrib/poco/Foundation/include/"
|
|
||||||
"${ClickHouse_SOURCE_DIR}/contrib/poco/Util/include/"
|
|
||||||
)
|
|
||||||
|
|
||||||
if (ENABLE_POCO_MONGODB)
|
|
||||||
set (Poco_MongoDB_LIBRARY PocoMongoDB)
|
|
||||||
set (Poco_MongoDB_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/poco/MongoDB/include/")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (NOT DEFINED ENABLE_POCO_REDIS OR ENABLE_POCO_REDIS)
|
|
||||||
set (Poco_Redis_LIBRARY PocoRedis)
|
|
||||||
set (Poco_Redis_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/poco/Redis/include/")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (EXISTS "${ClickHouse_SOURCE_DIR}/contrib/poco/SQL/ODBC/include/")
|
|
||||||
set (Poco_SQL_FOUND 1)
|
|
||||||
set (Poco_SQL_LIBRARY PocoSQL)
|
|
||||||
set (Poco_SQL_INCLUDE_DIR
|
|
||||||
"${ClickHouse_SOURCE_DIR}/contrib/poco/SQL/include"
|
|
||||||
"${ClickHouse_SOURCE_DIR}/contrib/poco/Data/include"
|
|
||||||
)
|
|
||||||
if ((NOT DEFINED POCO_ENABLE_SQL_ODBC OR POCO_ENABLE_SQL_ODBC) AND ODBC_FOUND)
|
|
||||||
set (Poco_SQLODBC_INCLUDE_DIR
|
|
||||||
"${ClickHouse_SOURCE_DIR}/contrib/poco/SQL/ODBC/include/"
|
|
||||||
"${ClickHouse_SOURCE_DIR}/contrib/poco/Data/ODBC/include/"
|
|
||||||
${ODBC_INCLUDE_DIRS}
|
|
||||||
)
|
|
||||||
set (Poco_SQLODBC_LIBRARY PocoSQLODBC ${ODBC_LIBRARIES} ${LTDL_LIBRARY})
|
|
||||||
endif ()
|
|
||||||
else ()
|
|
||||||
set (Poco_Data_FOUND 1)
|
|
||||||
set (Poco_Data_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/poco/Data/include")
|
|
||||||
set (Poco_Data_LIBRARY PocoData)
|
|
||||||
if ((NOT DEFINED ENABLE_DATA_ODBC OR ENABLE_DATA_ODBC) AND ODBC_FOUND)
|
|
||||||
set (USE_POCO_DATAODBC 1)
|
|
||||||
set (Poco_DataODBC_INCLUDE_DIR
|
|
||||||
"${ClickHouse_SOURCE_DIR}/contrib/poco/Data/ODBC/include/"
|
|
||||||
${ODBC_INCLUDE_DIRS}
|
|
||||||
)
|
|
||||||
set (Poco_DataODBC_LIBRARY PocoDataODBC ${ODBC_LIBRARIES} ${LTDL_LIBRARY})
|
|
||||||
endif ()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (NOT DEFINED ENABLE_POCO_JSON OR ENABLE_POCO_JSON)
|
|
||||||
set (Poco_JSON_LIBRARY PocoJSON)
|
|
||||||
set (Poco_JSON_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/poco/JSON/include/")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (OPENSSL_FOUND AND (NOT DEFINED ENABLE_POCO_NETSSL OR ENABLE_POCO_NETSSL))
|
|
||||||
set (Poco_NetSSL_LIBRARY PocoNetSSL ${OPENSSL_LIBRARIES})
|
|
||||||
set (Poco_Crypto_LIBRARY PocoCrypto ${OPENSSL_LIBRARIES})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (USE_STATIC_LIBRARIES AND USE_INTERNAL_ZLIB_LIBRARY)
|
|
||||||
list (APPEND Poco_INCLUDE_DIRS
|
|
||||||
"${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}/"
|
|
||||||
"${ClickHouse_BINARY_DIR}/contrib/${INTERNAL_ZLIB_NAME}/"
|
|
||||||
)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
set (Poco_Foundation_LIBRARY PocoFoundation)
|
|
||||||
set (Poco_Util_LIBRARY PocoUtil)
|
|
||||||
set (Poco_Net_LIBRARY PocoNet)
|
|
||||||
set (Poco_XML_LIBRARY PocoXML)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (Poco_NetSSL_LIBRARY AND Poco_Crypto_LIBRARY)
|
|
||||||
set (USE_POCO_NETSSL 1)
|
|
||||||
endif ()
|
|
||||||
if (Poco_MongoDB_LIBRARY)
|
|
||||||
set (USE_POCO_MONGODB 1)
|
|
||||||
endif ()
|
|
||||||
if (Poco_Redis_LIBRARY)
|
|
||||||
set (USE_POCO_REDIS 1)
|
|
||||||
endif ()
|
|
||||||
if (Poco_DataODBC_LIBRARY AND ODBC_FOUND)
|
|
||||||
set (USE_POCO_DATAODBC 1)
|
|
||||||
endif ()
|
|
||||||
if (Poco_SQLODBC_LIBRARY AND ODBC_FOUND)
|
|
||||||
set (USE_POCO_SQLODBC 1)
|
|
||||||
endif ()
|
|
||||||
if (Poco_JSON_LIBRARY)
|
|
||||||
set (USE_POCO_JSON 1)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
message(STATUS "Using Poco: ${Poco_INCLUDE_DIRS} : ${Poco_Foundation_LIBRARY},${Poco_Util_LIBRARY},${Poco_Net_LIBRARY},${Poco_NetSSL_LIBRARY},${Poco_Crypto_LIBRARY},${Poco_XML_LIBRARY},${Poco_Data_LIBRARY},${Poco_DataODBC_LIBRARY},${Poco_SQL_LIBRARY},${Poco_SQLODBC_LIBRARY},${Poco_MongoDB_LIBRARY},${Poco_Redis_LIBRARY},${Poco_JSON_LIBRARY}; MongoDB=${USE_POCO_MONGODB}, Redis=${USE_POCO_REDIS}, DataODBC=${USE_POCO_DATAODBC}, NetSSL=${USE_POCO_NETSSL}, JSON=${USE_POCO_JSON}")
|
|
||||||
|
|
||||||
# How to make sutable poco:
|
|
||||||
# use branch:
|
|
||||||
# develop OR poco-1.7.9-release + 6a49c94d18c654d7a20b8c8ea47071b1fdd4813b
|
|
||||||
# and merge:
|
|
||||||
# ClickHouse-Extras/clickhouse_unbundled
|
|
||||||
# ClickHouse-Extras/clickhouse_unbundled_zlib
|
|
||||||
# ClickHouse-Extras/clickhouse_task
|
|
||||||
# ClickHouse-Extras/clickhouse_misc
|
|
||||||
# ClickHouse-Extras/clickhouse_anl
|
|
||||||
# ClickHouse-Extras/clickhouse_http_header https://github.com/pocoproject/poco/pull/1574
|
|
||||||
# ClickHouse-Extras/clickhouse_socket
|
|
||||||
# ClickHouse-Extras/clickhouse_warning
|
|
||||||
# ClickHouse-Extras/clickhouse-purge-logs-on-no-space
|
|
||||||
# ClickHouse-Extras/clickhouse_freebsd
|
|
||||||
# ClickHouse-Extras/clikhouse_no_zlib
|
|
||||||
# ClickHouse-Extras/clickhouse-fix-atomic
|
|
||||||
@ -27,69 +27,7 @@ elseif(NOT MISSING_INTERNAL_PROTOBUF_LIBRARY)
|
|||||||
set(Protobuf_PROTOC_LIBRARY libprotoc)
|
set(Protobuf_PROTOC_LIBRARY libprotoc)
|
||||||
set(Protobuf_LITE_LIBRARY libprotobuf-lite)
|
set(Protobuf_LITE_LIBRARY libprotobuf-lite)
|
||||||
|
|
||||||
set(Protobuf_PROTOC_EXECUTABLE ${ClickHouse_BINARY_DIR}/contrib/protobuf/cmake/protoc)
|
set(Protobuf_PROTOC_EXECUTABLE "$<TARGET_FILE:protoc>")
|
||||||
|
|
||||||
if(NOT DEFINED PROTOBUF_GENERATE_CPP_APPEND_PATH)
|
|
||||||
set(PROTOBUF_GENERATE_CPP_APPEND_PATH TRUE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
function(PROTOBUF_GENERATE_CPP SRCS HDRS)
|
|
||||||
if(NOT ARGN)
|
|
||||||
message(SEND_ERROR "Error: PROTOBUF_GENERATE_CPP() called without any proto files")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(PROTOBUF_GENERATE_CPP_APPEND_PATH)
|
|
||||||
# Create an include path for each file specified
|
|
||||||
foreach(FIL ${ARGN})
|
|
||||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
|
||||||
get_filename_component(ABS_PATH ${ABS_FIL} PATH)
|
|
||||||
list(FIND _protobuf_include_path ${ABS_PATH} _contains_already)
|
|
||||||
if(${_contains_already} EQUAL -1)
|
|
||||||
list(APPEND _protobuf_include_path -I ${ABS_PATH})
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
else()
|
|
||||||
set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(DEFINED PROTOBUF_IMPORT_DIRS AND NOT DEFINED Protobuf_IMPORT_DIRS)
|
|
||||||
set(Protobuf_IMPORT_DIRS "${PROTOBUF_IMPORT_DIRS}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(DEFINED Protobuf_IMPORT_DIRS)
|
|
||||||
foreach(DIR ${Protobuf_IMPORT_DIRS})
|
|
||||||
get_filename_component(ABS_PATH ${DIR} ABSOLUTE)
|
|
||||||
list(FIND _protobuf_include_path ${ABS_PATH} _contains_already)
|
|
||||||
if(${_contains_already} EQUAL -1)
|
|
||||||
list(APPEND _protobuf_include_path -I ${ABS_PATH})
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(${SRCS})
|
|
||||||
set(${HDRS})
|
|
||||||
foreach(FIL ${ARGN})
|
|
||||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
|
||||||
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
|
||||||
|
|
||||||
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
|
|
||||||
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
|
|
||||||
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
|
|
||||||
COMMAND ${Protobuf_PROTOC_EXECUTABLE}
|
|
||||||
ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} ${_protobuf_include_path} ${ABS_FIL}
|
|
||||||
DEPENDS ${ABS_FIL} ${Protobuf_PROTOC_EXECUTABLE}
|
|
||||||
COMMENT "Running C++ protocol buffer compiler on ${FIL}"
|
|
||||||
VERBATIM )
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
|
|
||||||
set(${SRCS} ${${SRCS}} PARENT_SCOPE)
|
|
||||||
set(${HDRS} ${${HDRS}} PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(OS_FREEBSD AND SANITIZE STREQUAL "address")
|
if(OS_FREEBSD AND SANITIZE STREQUAL "address")
|
||||||
@ -102,6 +40,7 @@ if(OS_FREEBSD AND SANITIZE STREQUAL "address")
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
include (${ClickHouse_SOURCE_DIR}/cmake/protobuf_generate_cpp.cmake)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message(STATUS "Using protobuf=${USE_PROTOBUF}: ${Protobuf_INCLUDE_DIR} : ${Protobuf_LIBRARY} : ${Protobuf_PROTOC_EXECUTABLE}")
|
message(STATUS "Using protobuf=${USE_PROTOBUF}: ${Protobuf_INCLUDE_DIR} : ${Protobuf_LIBRARY} : ${Protobuf_PROTOC_EXECUTABLE}")
|
||||||
|
|||||||
@ -1,22 +0,0 @@
|
|||||||
option (USE_INTERNAL_XXHASH_LIBRARY "Set to FALSE to use system xxHash library instead of bundled" ${NOT_UNBUNDLED})
|
|
||||||
|
|
||||||
if (USE_INTERNAL_XXHASH_LIBRARY AND NOT USE_INTERNAL_LZ4_LIBRARY)
|
|
||||||
message (WARNING "can not use internal xxhash without internal lz4")
|
|
||||||
set (USE_INTERNAL_XXHASH_LIBRARY 0)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (USE_INTERNAL_XXHASH_LIBRARY)
|
|
||||||
set (XXHASH_LIBRARY lz4)
|
|
||||||
set (XXHASH_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/lz4/lib)
|
|
||||||
else ()
|
|
||||||
find_library (XXHASH_LIBRARY xxhash)
|
|
||||||
find_path (XXHASH_INCLUDE_DIR NAMES xxhash.h PATHS ${XXHASH_INCLUDE_PATHS})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (XXHASH_LIBRARY AND XXHASH_INCLUDE_DIR)
|
|
||||||
set (USE_XXHASH 1)
|
|
||||||
else ()
|
|
||||||
set (USE_XXHASH 0)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
message (STATUS "Using xxhash=${USE_XXHASH}: ${XXHASH_INCLUDE_DIR} : ${XXHASH_LIBRARY}")
|
|
||||||
@ -1,12 +1,15 @@
|
|||||||
set (CMAKE_SYSTEM_NAME "FreeBSD")
|
set (CMAKE_SYSTEM_NAME "FreeBSD")
|
||||||
set (CMAKE_SYSTEM_PROCESSOR "x86_64")
|
set (CMAKE_SYSTEM_PROCESSOR "x86_64")
|
||||||
set (CMAKE_C_COMPILER_TARGET "x86_64-pc-freebsd12.1")
|
set (CMAKE_C_COMPILER_TARGET "x86_64-pc-freebsd11")
|
||||||
set (CMAKE_CXX_COMPILER_TARGET "x86_64-pc-freebsd12.1")
|
set (CMAKE_CXX_COMPILER_TARGET "x86_64-pc-freebsd11")
|
||||||
set (CMAKE_ASM_COMPILER_TARGET "x86_64-pc-freebsd12.1")
|
set (CMAKE_ASM_COMPILER_TARGET "x86_64-pc-freebsd11")
|
||||||
set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../toolchain/freebsd-x86_64")
|
set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../toolchain/freebsd-x86_64")
|
||||||
|
|
||||||
set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) # disable linkage check - it doesn't work in CMake
|
set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) # disable linkage check - it doesn't work in CMake
|
||||||
|
|
||||||
|
set (CMAKE_AR "/usr/bin/ar" CACHE FILEPATH "" FORCE)
|
||||||
|
set (CMAKE_RANLIB "/usr/bin/ranlib" CACHE FILEPATH "" FORCE)
|
||||||
|
|
||||||
set (LINKER_NAME "lld" CACHE STRING "" FORCE)
|
set (LINKER_NAME "lld" CACHE STRING "" FORCE)
|
||||||
|
|
||||||
set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
|
set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
|
||||||
|
|||||||
@ -1,4 +0,0 @@
|
|||||||
set(DIVIDE_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libdivide)
|
|
||||||
set(DBMS_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/src ${ClickHouse_BINARY_DIR}/src)
|
|
||||||
set(DOUBLE_CONVERSION_CONTRIB_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/double-conversion)
|
|
||||||
set(METROHASH_CONTRIB_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libmetrohash/src)
|
|
||||||
@ -21,7 +21,7 @@ set(CMAKE_C_STANDARD_LIBRARIES ${DEFAULT_LIBS})
|
|||||||
# glibc-compatibility library relies to fixed version of libc headers
|
# glibc-compatibility library relies to fixed version of libc headers
|
||||||
# (because minor changes in function attributes between different glibc versions will introduce incompatibilities)
|
# (because minor changes in function attributes between different glibc versions will introduce incompatibilities)
|
||||||
# This is for x86_64. For other architectures we have separate toolchains.
|
# This is for x86_64. For other architectures we have separate toolchains.
|
||||||
if (ARCH_AMD64)
|
if (ARCH_AMD64 AND NOT_UNBUNDLED)
|
||||||
set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES ${ClickHouse_SOURCE_DIR}/contrib/libc-headers/x86_64-linux-gnu ${ClickHouse_SOURCE_DIR}/contrib/libc-headers)
|
set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES ${ClickHouse_SOURCE_DIR}/contrib/libc-headers/x86_64-linux-gnu ${ClickHouse_SOURCE_DIR}/contrib/libc-headers)
|
||||||
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${ClickHouse_SOURCE_DIR}/contrib/libc-headers/x86_64-linux-gnu ${ClickHouse_SOURCE_DIR}/contrib/libc-headers)
|
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${ClickHouse_SOURCE_DIR}/contrib/libc-headers/x86_64-linux-gnu ${ClickHouse_SOURCE_DIR}/contrib/libc-headers)
|
||||||
endif ()
|
endif ()
|
||||||
|
|||||||
@ -21,15 +21,6 @@ if (TARGET double-conversion)
|
|||||||
list(APPEND dirs ${dirs1})
|
list(APPEND dirs ${dirs1})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (TARGET ${Boost_PROGRAM_OPTIONS_LIBRARY})
|
|
||||||
get_property (dirs1 TARGET ${Boost_PROGRAM_OPTIONS_LIBRARY} PROPERTY INCLUDE_DIRECTORIES)
|
|
||||||
list(APPEND dirs ${dirs1})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (USE_INTERNAL_POCO_LIBRARY)
|
|
||||||
list(APPEND dirs "./contrib/poco/Foundation/include")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
list(REMOVE_DUPLICATES dirs)
|
list(REMOVE_DUPLICATES dirs)
|
||||||
file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/include_directories.txt "")
|
file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/include_directories.txt "")
|
||||||
foreach (dir ${dirs})
|
foreach (dir ${dirs})
|
||||||
|
|||||||
172
cmake/protobuf_generate_cpp.cmake
Normal file
172
cmake/protobuf_generate_cpp.cmake
Normal file
@ -0,0 +1,172 @@
|
|||||||
|
# This file declares functions adding custom commands for generating C++ files from *.proto files:
|
||||||
|
# function (protobuf_generate_cpp SRCS HDRS)
|
||||||
|
# function (protobuf_generate_grpc_cpp SRCS HDRS)
|
||||||
|
|
||||||
|
if (NOT USE_PROTOBUF)
|
||||||
|
message (WARNING "Could not use protobuf_generate_cpp() without the protobuf library")
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (NOT DEFINED PROTOBUF_PROTOC_EXECUTABLE)
|
||||||
|
set (PROTOBUF_PROTOC_EXECUTABLE "$<TARGET_FILE:protoc>")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (NOT DEFINED GRPC_CPP_PLUGIN_EXECUTABLE)
|
||||||
|
set (GRPC_CPP_PLUGIN_EXECUTABLE $<TARGET_FILE:grpc_cpp_plugin>)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (NOT DEFINED PROTOBUF_GENERATE_CPP_APPEND_PATH)
|
||||||
|
set (PROTOBUF_GENERATE_CPP_APPEND_PATH TRUE)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
function(protobuf_generate_cpp_impl SRCS HDRS MODES OUTPUT_FILE_EXTS PLUGIN)
|
||||||
|
if(NOT ARGN)
|
||||||
|
message(SEND_ERROR "Error: protobuf_generate_cpp() called without any proto files")
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(PROTOBUF_GENERATE_CPP_APPEND_PATH)
|
||||||
|
# Create an include path for each file specified
|
||||||
|
foreach(FIL ${ARGN})
|
||||||
|
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
||||||
|
get_filename_component(ABS_PATH ${ABS_FIL} PATH)
|
||||||
|
list(FIND protobuf_include_path ${ABS_PATH} _contains_already)
|
||||||
|
if(${_contains_already} EQUAL -1)
|
||||||
|
list(APPEND protobuf_include_path -I ${ABS_PATH})
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
else()
|
||||||
|
set(protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(DEFINED PROTOBUF_IMPORT_DIRS AND NOT DEFINED Protobuf_IMPORT_DIRS)
|
||||||
|
set(Protobuf_IMPORT_DIRS "${PROTOBUF_IMPORT_DIRS}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(DEFINED Protobuf_IMPORT_DIRS)
|
||||||
|
foreach(DIR ${Protobuf_IMPORT_DIRS})
|
||||||
|
get_filename_component(ABS_PATH ${DIR} ABSOLUTE)
|
||||||
|
list(FIND protobuf_include_path ${ABS_PATH} _contains_already)
|
||||||
|
if(${_contains_already} EQUAL -1)
|
||||||
|
list(APPEND protobuf_include_path -I ${ABS_PATH})
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set (intermediate_dir ${CMAKE_CURRENT_BINARY_DIR}/intermediate)
|
||||||
|
file (MAKE_DIRECTORY ${intermediate_dir})
|
||||||
|
|
||||||
|
set (protoc_args)
|
||||||
|
foreach (mode ${MODES})
|
||||||
|
list (APPEND protoc_args "--${mode}_out" ${intermediate_dir})
|
||||||
|
endforeach()
|
||||||
|
if (PLUGIN)
|
||||||
|
list (APPEND protoc_args "--plugin=${PLUGIN}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(srcs)
|
||||||
|
set(hdrs)
|
||||||
|
set(all_intermediate_outputs)
|
||||||
|
|
||||||
|
foreach(input_name ${ARGN})
|
||||||
|
get_filename_component(abs_name ${input_name} ABSOLUTE)
|
||||||
|
get_filename_component(name ${input_name} NAME_WE)
|
||||||
|
|
||||||
|
set (intermediate_outputs)
|
||||||
|
foreach (ext ${OUTPUT_FILE_EXTS})
|
||||||
|
set (filename "${name}${ext}")
|
||||||
|
set (output "${CMAKE_CURRENT_BINARY_DIR}/${filename}")
|
||||||
|
set (intermediate_output "${intermediate_dir}/${filename}")
|
||||||
|
list (APPEND intermediate_outputs "${intermediate_output}")
|
||||||
|
list (APPEND all_intermediate_outputs "${intermediate_output}")
|
||||||
|
|
||||||
|
if (${ext} MATCHES ".*\\.h")
|
||||||
|
list(APPEND hdrs "${output}")
|
||||||
|
else()
|
||||||
|
list(APPEND srcs "${output}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${output}
|
||||||
|
COMMAND ${CMAKE_COMMAND} -DPROTOBUF_GENERATE_CPP_SCRIPT_MODE=1 -DUSE_PROTOBUF=1 -DDIR=${CMAKE_CURRENT_BINARY_DIR} -DFILENAME=${filename} -DCOMPILER_ID=${CMAKE_CXX_COMPILER_ID} -P ${ClickHouse_SOURCE_DIR}/cmake/protobuf_generate_cpp.cmake
|
||||||
|
DEPENDS ${intermediate_output})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${intermediate_outputs}
|
||||||
|
COMMAND ${Protobuf_PROTOC_EXECUTABLE}
|
||||||
|
ARGS ${protobuf_include_path} ${protoc_args} ${abs_name}
|
||||||
|
DEPENDS ${abs_name} ${Protobuf_PROTOC_EXECUTABLE} ${PLUGIN}
|
||||||
|
COMMENT "Running C++ protocol buffer compiler on ${name}"
|
||||||
|
VERBATIM )
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
set_source_files_properties(${srcs} ${hdrs} ${all_intermediate_outputs} PROPERTIES GENERATED TRUE)
|
||||||
|
set(${SRCS} ${srcs} PARENT_SCOPE)
|
||||||
|
set(${HDRS} ${hdrs} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
|
||||||
|
if (PROTOBUF_GENERATE_CPP_SCRIPT_MODE)
|
||||||
|
set (output "${DIR}/${FILENAME}")
|
||||||
|
set (intermediate_dir ${DIR}/intermediate)
|
||||||
|
set (intermediate_output "${intermediate_dir}/${FILENAME}")
|
||||||
|
|
||||||
|
if (COMPILER_ID MATCHES "Clang")
|
||||||
|
set (pragma_push "#pragma clang diagnostic push\n")
|
||||||
|
set (pragma_pop "#pragma clang diagnostic pop\n")
|
||||||
|
set (pragma_disable_warnings "#pragma clang diagnostic ignored \"-Weverything\"\n")
|
||||||
|
elseif (COMPILER_ID MATCHES "GNU")
|
||||||
|
set (pragma_push "#pragma GCC diagnostic push\n")
|
||||||
|
set (pragma_pop "#pragma GCC diagnostic pop\n")
|
||||||
|
set (pragma_disable_warnings "#pragma GCC diagnostic ignored \"-Wall\"\n"
|
||||||
|
"#pragma GCC diagnostic ignored \"-Wextra\"\n"
|
||||||
|
"#pragma GCC diagnostic ignored \"-Warray-bounds\"\n"
|
||||||
|
"#pragma GCC diagnostic ignored \"-Wold-style-cast\"\n"
|
||||||
|
"#pragma GCC diagnostic ignored \"-Wshadow\"\n"
|
||||||
|
"#pragma GCC diagnostic ignored \"-Wsuggest-override\"\n"
|
||||||
|
"#pragma GCC diagnostic ignored \"-Wcast-qual\"\n"
|
||||||
|
"#pragma GCC diagnostic ignored \"-Wunused-parameter\"\n")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (${FILENAME} MATCHES ".*\\.h")
|
||||||
|
file(WRITE "${output}"
|
||||||
|
"#pragma once\n"
|
||||||
|
${pragma_push}
|
||||||
|
${pragma_disable_warnings}
|
||||||
|
"#include \"${intermediate_output}\"\n"
|
||||||
|
${pragma_pop}
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
file(WRITE "${output}"
|
||||||
|
${pragma_disable_warnings}
|
||||||
|
"#include \"${intermediate_output}\"\n"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
function(protobuf_generate_cpp SRCS HDRS)
|
||||||
|
set (modes cpp)
|
||||||
|
set (output_file_exts ".pb.cc" ".pb.h")
|
||||||
|
set (plugin)
|
||||||
|
|
||||||
|
protobuf_generate_cpp_impl(srcs hdrs "${modes}" "${output_file_exts}" "${plugin}" ${ARGN})
|
||||||
|
|
||||||
|
set(${SRCS} ${srcs} PARENT_SCOPE)
|
||||||
|
set(${HDRS} ${hdrs} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
|
||||||
|
function(protobuf_generate_grpc_cpp SRCS HDRS)
|
||||||
|
set (modes cpp grpc)
|
||||||
|
set (output_file_exts ".pb.cc" ".pb.h" ".grpc.pb.cc" ".grpc.pb.h")
|
||||||
|
set (plugin "protoc-gen-grpc=${GRPC_CPP_PLUGIN_EXECUTABLE}")
|
||||||
|
|
||||||
|
protobuf_generate_cpp_impl(srcs hdrs "${modes}" "${output_file_exts}" "${plugin}" ${ARGN})
|
||||||
|
|
||||||
|
set(${SRCS} ${srcs} PARENT_SCOPE)
|
||||||
|
set(${HDRS} ${hdrs} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
@ -36,8 +36,10 @@ if (SANITIZE)
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
elseif (SANITIZE STREQUAL "thread")
|
elseif (SANITIZE STREQUAL "thread")
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} -fsanitize=thread")
|
set (TSAN_FLAGS "-fsanitize=thread -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/tsan_suppressions.txt")
|
||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} -fsanitize=thread")
|
|
||||||
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${TSAN_FLAGS}")
|
||||||
|
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} ${TSAN_FLAGS}")
|
||||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
|
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@ -27,6 +27,7 @@ if (CMAKE_CROSSCOMPILING)
|
|||||||
elseif (OS_FREEBSD)
|
elseif (OS_FREEBSD)
|
||||||
# FIXME: broken dependencies
|
# FIXME: broken dependencies
|
||||||
set (ENABLE_PROTOBUF OFF CACHE INTERNAL "")
|
set (ENABLE_PROTOBUF OFF CACHE INTERNAL "")
|
||||||
|
set (ENABLE_EMBEDDED_COMPILER OFF CACHE INTERNAL "")
|
||||||
else ()
|
else ()
|
||||||
message (FATAL_ERROR "Trying to cross-compile to unsupported system: ${CMAKE_SYSTEM_NAME}!")
|
message (FATAL_ERROR "Trying to cross-compile to unsupported system: ${CMAKE_SYSTEM_NAME}!")
|
||||||
endif ()
|
endif ()
|
||||||
|
|||||||
2
cmake/toolchain/freebsd-x86_64/README.txt
Normal file
2
cmake/toolchain/freebsd-x86_64/README.txt
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
wget https://clickhouse-datasets.s3.yandex.net/toolchains/toolchains/freebsd-11.3-toolchain.tar.xz
|
||||||
|
tar xJf freebsd-11.3-toolchain.tar.xz --strip-components=1
|
||||||
@ -1,6 +1,8 @@
|
|||||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
set (COMPILER_GCC 1)
|
set (COMPILER_GCC 1)
|
||||||
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
|
elseif (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
|
||||||
|
set (COMPILER_CLANG 1) # Safe to treat AppleClang as a regular Clang, in general.
|
||||||
|
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
set (COMPILER_CLANG 1)
|
set (COMPILER_CLANG 1)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
@ -11,10 +13,25 @@ if (COMPILER_GCC)
|
|||||||
message (FATAL_ERROR "GCC version must be at least ${GCC_MINIMUM_VERSION}. For example, if GCC ${GCC_MINIMUM_VERSION} is available under gcc-${GCC_MINIMUM_VERSION}, g++-${GCC_MINIMUM_VERSION} names, do the following: export CC=gcc-${GCC_MINIMUM_VERSION} CXX=g++-${GCC_MINIMUM_VERSION}; rm -rf CMakeCache.txt CMakeFiles; and re run cmake or ./release.")
|
message (FATAL_ERROR "GCC version must be at least ${GCC_MINIMUM_VERSION}. For example, if GCC ${GCC_MINIMUM_VERSION} is available under gcc-${GCC_MINIMUM_VERSION}, g++-${GCC_MINIMUM_VERSION} names, do the following: export CC=gcc-${GCC_MINIMUM_VERSION} CXX=g++-${GCC_MINIMUM_VERSION}; rm -rf CMakeCache.txt CMakeFiles; and re run cmake or ./release.")
|
||||||
endif ()
|
endif ()
|
||||||
elseif (COMPILER_CLANG)
|
elseif (COMPILER_CLANG)
|
||||||
# Require minimum version of clang
|
# Require minimum version of clang/apple-clang
|
||||||
set (CLANG_MINIMUM_VERSION 8)
|
if (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
|
||||||
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${CLANG_MINIMUM_VERSION})
|
# AppleClang 10.0.1 (Xcode 10.2) corresponds to LLVM/Clang upstream version 7.0.0
|
||||||
message (FATAL_ERROR "Clang version must be at least ${CLANG_MINIMUM_VERSION}.")
|
# AppleClang 11.0.0 (Xcode 11.0) corresponds to LLVM/Clang upstream version 8.0.0
|
||||||
|
set (XCODE_MINIMUM_VERSION 10.2)
|
||||||
|
set (APPLE_CLANG_MINIMUM_VERSION 10.0.1)
|
||||||
|
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${APPLE_CLANG_MINIMUM_VERSION})
|
||||||
|
message (FATAL_ERROR "AppleClang compiler version must be at least ${APPLE_CLANG_MINIMUM_VERSION} (Xcode ${XCODE_MINIMUM_VERSION}).")
|
||||||
|
elseif (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.0.0)
|
||||||
|
# char8_t is available staring (upstream vanilla) Clang 7, but prior to Clang 8,
|
||||||
|
# it is not enabled by -std=c++20 and can be enabled with an explicit -fchar8_t.
|
||||||
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fchar8_t")
|
||||||
|
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fchar8_t")
|
||||||
|
endif ()
|
||||||
|
else ()
|
||||||
|
set (CLANG_MINIMUM_VERSION 8)
|
||||||
|
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${CLANG_MINIMUM_VERSION})
|
||||||
|
message (FATAL_ERROR "Clang version must be at least ${CLANG_MINIMUM_VERSION}.")
|
||||||
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
else ()
|
else ()
|
||||||
message (WARNING "You are using an unsupported compiler. Compilation has only been tested with Clang and GCC.")
|
message (WARNING "You are using an unsupported compiler. Compilation has only been tested with Clang and GCC.")
|
||||||
|
|||||||
@ -1,12 +1,4 @@
|
|||||||
# This strings autochanged from release_lib.sh:
|
include(${CMAKE_SOURCE_DIR}/cmake/autogenerated_versions.txt)
|
||||||
set(VERSION_REVISION 54435)
|
|
||||||
set(VERSION_MAJOR 20)
|
|
||||||
set(VERSION_MINOR 5)
|
|
||||||
set(VERSION_PATCH 1)
|
|
||||||
set(VERSION_GITHASH 91df18a906dcffdbee6816e5389df6c65f86e35f)
|
|
||||||
set(VERSION_DESCRIBE v20.5.1.1-prestable)
|
|
||||||
set(VERSION_STRING 20.5.1.1)
|
|
||||||
# end of autochange
|
|
||||||
|
|
||||||
set(VERSION_EXTRA "" CACHE STRING "")
|
set(VERSION_EXTRA "" CACHE STRING "")
|
||||||
set(VERSION_TWEAK "" CACHE STRING "")
|
set(VERSION_TWEAK "" CACHE STRING "")
|
||||||
|
|||||||
171
cmake/warnings.cmake
Normal file
171
cmake/warnings.cmake
Normal file
@ -0,0 +1,171 @@
|
|||||||
|
# Our principle is to enable as many warnings as possible and always do it with "warnings as errors" flag.
|
||||||
|
#
|
||||||
|
# But it comes with some cost:
|
||||||
|
# - we have to disable some warnings in 3rd party libraries (they are located in "contrib" directory)
|
||||||
|
# - we have to include headers of these libraries as -isystem to avoid warnings from headers
|
||||||
|
# (this is the same behaviour as if these libraries were located in /usr/include)
|
||||||
|
# - sometimes warnings from 3rd party libraries may come from macro substitutions in our code
|
||||||
|
# and we have to wrap them with #pragma GCC/clang diagnostic ignored
|
||||||
|
|
||||||
|
if (NOT MSVC)
|
||||||
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
if (USE_DEBUG_HELPERS)
|
||||||
|
set (INCLUDE_DEBUG_HELPERS "-I${ClickHouse_SOURCE_DIR}/base -include ${ClickHouse_SOURCE_DIR}/src/Core/iostream_debug_helpers.h")
|
||||||
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INCLUDE_DEBUG_HELPERS}")
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
# Add some warnings that are not available even with -Wall -Wextra -Wpedantic.
|
||||||
|
|
||||||
|
option (WEVERYTHING "Enables -Weverything option with some exceptions. This is intended for exploration of new compiler warnings that may be found to be useful. Only makes sense for clang." ON)
|
||||||
|
|
||||||
|
if (COMPILER_CLANG)
|
||||||
|
add_warning(pedantic)
|
||||||
|
no_warning(vla-extension)
|
||||||
|
no_warning(zero-length-array)
|
||||||
|
|
||||||
|
add_warning(comma)
|
||||||
|
add_warning(conditional-uninitialized)
|
||||||
|
add_warning(covered-switch-default)
|
||||||
|
add_warning(deprecated)
|
||||||
|
add_warning(embedded-directive)
|
||||||
|
add_warning(empty-init-stmt) # linux-only
|
||||||
|
add_warning(extra-semi-stmt) # linux-only
|
||||||
|
add_warning(extra-semi)
|
||||||
|
add_warning(gnu-case-range)
|
||||||
|
add_warning(inconsistent-missing-destructor-override)
|
||||||
|
add_warning(newline-eof)
|
||||||
|
add_warning(old-style-cast)
|
||||||
|
add_warning(range-loop-analysis)
|
||||||
|
add_warning(redundant-parens)
|
||||||
|
add_warning(reserved-id-macro)
|
||||||
|
add_warning(shadow-field) # clang 8+
|
||||||
|
add_warning(shadow-uncaptured-local)
|
||||||
|
add_warning(shadow)
|
||||||
|
add_warning(string-plus-int) # clang 8+
|
||||||
|
add_warning(undef)
|
||||||
|
add_warning(unreachable-code-return)
|
||||||
|
add_warning(unreachable-code)
|
||||||
|
add_warning(unused-exception-parameter)
|
||||||
|
add_warning(unused-macros)
|
||||||
|
add_warning(unused-member-function)
|
||||||
|
add_warning(zero-as-null-pointer-constant)
|
||||||
|
|
||||||
|
if (WEVERYTHING)
|
||||||
|
add_warning(everything)
|
||||||
|
no_warning(c++98-compat-pedantic)
|
||||||
|
no_warning(c++98-compat)
|
||||||
|
no_warning(c99-extensions)
|
||||||
|
no_warning(conversion)
|
||||||
|
no_warning(ctad-maybe-unsupported) # clang 9+, linux-only
|
||||||
|
no_warning(deprecated-dynamic-exception-spec)
|
||||||
|
no_warning(disabled-macro-expansion)
|
||||||
|
no_warning(documentation-unknown-command)
|
||||||
|
no_warning(double-promotion)
|
||||||
|
no_warning(exit-time-destructors)
|
||||||
|
no_warning(float-equal)
|
||||||
|
no_warning(global-constructors)
|
||||||
|
no_warning(missing-prototypes)
|
||||||
|
no_warning(missing-variable-declarations)
|
||||||
|
no_warning(nested-anon-types)
|
||||||
|
no_warning(packed)
|
||||||
|
no_warning(padded)
|
||||||
|
no_warning(return-std-move-in-c++11) # clang 7+
|
||||||
|
no_warning(shift-sign-overflow)
|
||||||
|
no_warning(sign-conversion)
|
||||||
|
no_warning(switch-enum)
|
||||||
|
no_warning(undefined-func-template)
|
||||||
|
no_warning(unused-template)
|
||||||
|
no_warning(vla)
|
||||||
|
no_warning(weak-template-vtables)
|
||||||
|
no_warning(weak-vtables)
|
||||||
|
|
||||||
|
# TODO Enable conversion, sign-conversion, double-promotion warnings.
|
||||||
|
endif ()
|
||||||
|
elseif (COMPILER_GCC)
|
||||||
|
# Add compiler options only to c++ compiler
|
||||||
|
function(add_cxx_compile_options option)
|
||||||
|
add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:${option}>")
|
||||||
|
endfunction()
|
||||||
|
# Warn about boolean expression compared with an integer value different from true/false
|
||||||
|
add_cxx_compile_options(-Wbool-compare)
|
||||||
|
# Warn whenever a pointer is cast such that the required alignment of the target is increased.
|
||||||
|
add_cxx_compile_options(-Wcast-align)
|
||||||
|
# Warn whenever a pointer is cast so as to remove a type qualifier from the target type.
|
||||||
|
add_cxx_compile_options(-Wcast-qual)
|
||||||
|
# Warn when deleting a pointer to incomplete type, which may cause undefined behavior at runtime
|
||||||
|
add_cxx_compile_options(-Wdelete-incomplete)
|
||||||
|
# Warn if a requested optimization pass is disabled. Code is too big or too complex
|
||||||
|
add_cxx_compile_options(-Wdisabled-optimization)
|
||||||
|
# Warn about duplicated conditions in an if-else-if chain
|
||||||
|
add_cxx_compile_options(-Wduplicated-cond)
|
||||||
|
# Warn about a comparison between values of different enumerated types
|
||||||
|
add_cxx_compile_options(-Wenum-compare)
|
||||||
|
# Warn about uninitialized variables that are initialized with themselves
|
||||||
|
add_cxx_compile_options(-Winit-self)
|
||||||
|
# Warn about logical not used on the left hand side operand of a comparison
|
||||||
|
add_cxx_compile_options(-Wlogical-not-parentheses)
|
||||||
|
# Warn about suspicious uses of logical operators in expressions
|
||||||
|
add_cxx_compile_options(-Wlogical-op)
|
||||||
|
# Warn if there exists a path from the function entry to a use of the variable that is uninitialized.
|
||||||
|
add_cxx_compile_options(-Wmaybe-uninitialized)
|
||||||
|
# Warn when the indentation of the code does not reflect the block structure
|
||||||
|
add_cxx_compile_options(-Wmisleading-indentation)
|
||||||
|
# Warn if a global function is defined without a previous declaration - disabled because of build times
|
||||||
|
# add_cxx_compile_options(-Wmissing-declarations)
|
||||||
|
# Warn if a user-supplied include directory does not exist
|
||||||
|
add_cxx_compile_options(-Wmissing-include-dirs)
|
||||||
|
# Obvious
|
||||||
|
add_cxx_compile_options(-Wnon-virtual-dtor)
|
||||||
|
# Obvious
|
||||||
|
add_cxx_compile_options(-Wno-return-local-addr)
|
||||||
|
# This warning is disabled due to false positives if compiled with libc++: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90037
|
||||||
|
#add_cxx_compile_options(-Wnull-dereference)
|
||||||
|
# Obvious
|
||||||
|
add_cxx_compile_options(-Wodr)
|
||||||
|
# Obvious
|
||||||
|
add_cxx_compile_options(-Wold-style-cast)
|
||||||
|
# Warn when a function declaration hides virtual functions from a base class
|
||||||
|
# add_cxx_compile_options(-Woverloaded-virtual)
|
||||||
|
# Warn about placement new expressions with undefined behavior
|
||||||
|
add_cxx_compile_options(-Wplacement-new=2)
|
||||||
|
# Warn about anything that depends on the “size of” a function type or of void
|
||||||
|
add_cxx_compile_options(-Wpointer-arith)
|
||||||
|
# Warn if anything is declared more than once in the same scope
|
||||||
|
add_cxx_compile_options(-Wredundant-decls)
|
||||||
|
# Member initialization reordering
|
||||||
|
add_cxx_compile_options(-Wreorder)
|
||||||
|
# Obvious
|
||||||
|
add_cxx_compile_options(-Wshadow)
|
||||||
|
# Warn if left shifting a negative value
|
||||||
|
add_cxx_compile_options(-Wshift-negative-value)
|
||||||
|
# Warn about a definition of an unsized deallocation function
|
||||||
|
add_cxx_compile_options(-Wsized-deallocation)
|
||||||
|
# Warn when the sizeof operator is applied to a parameter that is declared as an array in a function definition
|
||||||
|
add_cxx_compile_options(-Wsizeof-array-argument)
|
||||||
|
# Warn for suspicious length parameters to certain string and memory built-in functions if the argument uses sizeof
|
||||||
|
add_cxx_compile_options(-Wsizeof-pointer-memaccess)
|
||||||
|
|
||||||
|
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9)
|
||||||
|
# Warn about overriding virtual functions that are not marked with the override keyword
|
||||||
|
add_cxx_compile_options(-Wsuggest-override)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
# Warn whenever a switch statement has an index of boolean type and the case values are outside the range of a boolean type
|
||||||
|
add_cxx_compile_options(-Wswitch-bool)
|
||||||
|
# Warn if a self-comparison always evaluates to true or false
|
||||||
|
add_cxx_compile_options(-Wtautological-compare)
|
||||||
|
# Warn about trampolines generated for pointers to nested functions
|
||||||
|
add_cxx_compile_options(-Wtrampolines)
|
||||||
|
# Obvious
|
||||||
|
add_cxx_compile_options(-Wunused)
|
||||||
|
# Warn if vector operation is not implemented via SIMD capabilities of the architecture
|
||||||
|
add_cxx_compile_options(-Wvector-operation-performance)
|
||||||
|
|
||||||
|
# XXX: gcc10 stuck with this option while compiling GatherUtils code
|
||||||
|
# (anyway there are builds with clang, that will warn)
|
||||||
|
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
|
||||||
|
add_cxx_compile_options(-Wno-sequence-point)
|
||||||
|
endif()
|
||||||
|
endif ()
|
||||||
25
cmake/yandex/ya.make.versions.inc
Normal file
25
cmake/yandex/ya.make.versions.inc
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
INCLUDE(${ARCADIA_ROOT}/clickhouse/cmake/autogenerated_versions.txt)
|
||||||
|
|
||||||
|
# TODO: not sure if this is customizable per-binary
|
||||||
|
SET(VERSION_NAME "ClickHouse")
|
||||||
|
|
||||||
|
# TODO: not quite sure how to replace dash with space in ya.make
|
||||||
|
SET(VERSION_FULL "${VERSION_NAME}-${VERSION_STRING}")
|
||||||
|
|
||||||
|
CFLAGS (GLOBAL -DDBMS_NAME=\"ClickHouse\")
|
||||||
|
CFLAGS (GLOBAL -DDBMS_VERSION_MAJOR=${VERSION_MAJOR})
|
||||||
|
CFLAGS (GLOBAL -DDBMS_VERSION_MINOR=${VERSION_MINOR})
|
||||||
|
CFLAGS (GLOBAL -DDBMS_VERSION_PATCH=${VERSION_PATCH})
|
||||||
|
CFLAGS (GLOBAL -DVERSION_FULL=\"\\\"${VERSION_FULL}\\\"\")
|
||||||
|
CFLAGS (GLOBAL -DVERSION_MAJOR=${VERSION_MAJOR})
|
||||||
|
CFLAGS (GLOBAL -DVERSION_MINOR=${VERSION_MINOR})
|
||||||
|
CFLAGS (GLOBAL -DVERSION_PATCH=${VERSION_PATCH})
|
||||||
|
|
||||||
|
# TODO: not supported yet, not sure if ya.make supports arithmetics.
|
||||||
|
CFLAGS (GLOBAL -DVERSION_INTEGER=0)
|
||||||
|
|
||||||
|
CFLAGS (GLOBAL -DVERSION_NAME=\"\\\"${VERSION_NAME}\\\"\")
|
||||||
|
CFLAGS (GLOBAL -DVERSION_OFFICIAL=\"-arcadia\")
|
||||||
|
CFLAGS (GLOBAL -DVERSION_REVISION=${VERSION_REVISION})
|
||||||
|
CFLAGS (GLOBAL -DVERSION_STRING=\"\\\"${VERSION_STRING}\\\"\")
|
||||||
|
|
||||||
149
contrib/CMakeLists.txt
vendored
149
contrib/CMakeLists.txt
vendored
@ -1,17 +1,42 @@
|
|||||||
# Third-party libraries may have substandard code.
|
# Third-party libraries may have substandard code.
|
||||||
|
|
||||||
|
# Put all targets defined here and in added subfolders under "contrib/" folder in GUI-based IDEs by default.
|
||||||
|
# Some of third-party projects may override CMAKE_FOLDER or FOLDER property of their targets, so they will
|
||||||
|
# appear not in "contrib/" as originally planned here.
|
||||||
|
get_filename_component (_current_dir_name "${CMAKE_CURRENT_LIST_DIR}" NAME)
|
||||||
|
if (CMAKE_FOLDER)
|
||||||
|
set (CMAKE_FOLDER "${CMAKE_FOLDER}/${_current_dir_name}")
|
||||||
|
else ()
|
||||||
|
set (CMAKE_FOLDER "${_current_dir_name}")
|
||||||
|
endif ()
|
||||||
|
unset (_current_dir_name)
|
||||||
|
|
||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
|
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
|
||||||
|
|
||||||
set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1)
|
set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1)
|
||||||
|
|
||||||
if (USE_INTERNAL_BOOST_LIBRARY)
|
add_subdirectory (boost-cmake)
|
||||||
add_subdirectory (boost-cmake)
|
add_subdirectory (cctz-cmake)
|
||||||
endif ()
|
add_subdirectory (consistent-hashing-sumbur)
|
||||||
|
add_subdirectory (consistent-hashing)
|
||||||
|
add_subdirectory (croaring)
|
||||||
|
add_subdirectory (FastMemcpy)
|
||||||
|
add_subdirectory (hyperscan-cmake)
|
||||||
|
add_subdirectory (jemalloc-cmake)
|
||||||
|
add_subdirectory (libcpuid-cmake)
|
||||||
|
add_subdirectory (libdivide)
|
||||||
|
add_subdirectory (libmetrohash)
|
||||||
|
add_subdirectory (lz4-cmake)
|
||||||
|
add_subdirectory (murmurhash)
|
||||||
|
add_subdirectory (replxx-cmake)
|
||||||
|
add_subdirectory (ryu-cmake)
|
||||||
|
add_subdirectory (unixodbc-cmake)
|
||||||
|
|
||||||
if (USE_INTERNAL_LZ4_LIBRARY)
|
add_subdirectory (poco-cmake)
|
||||||
add_subdirectory (lz4-cmake)
|
|
||||||
endif ()
|
|
||||||
|
# TODO: refactor the contrib libraries below this comment.
|
||||||
|
|
||||||
if (USE_INTERNAL_ZSTD_LIBRARY)
|
if (USE_INTERNAL_ZSTD_LIBRARY)
|
||||||
add_subdirectory (zstd-cmake)
|
add_subdirectory (zstd-cmake)
|
||||||
@ -27,8 +52,6 @@ if (USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY)
|
|||||||
add_subdirectory (double-conversion-cmake)
|
add_subdirectory (double-conversion-cmake)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
add_subdirectory (ryu-cmake)
|
|
||||||
|
|
||||||
if (USE_INTERNAL_CITYHASH_LIBRARY)
|
if (USE_INTERNAL_CITYHASH_LIBRARY)
|
||||||
add_subdirectory (cityhash102)
|
add_subdirectory (cityhash102)
|
||||||
endif ()
|
endif ()
|
||||||
@ -37,13 +60,6 @@ if (USE_INTERNAL_FARMHASH_LIBRARY)
|
|||||||
add_subdirectory (libfarmhash)
|
add_subdirectory (libfarmhash)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (USE_INTERNAL_METROHASH_LIBRARY)
|
|
||||||
add_subdirectory (libmetrohash)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
add_subdirectory (murmurhash)
|
|
||||||
add_subdirectory (croaring)
|
|
||||||
|
|
||||||
if (USE_INTERNAL_BTRIE_LIBRARY)
|
if (USE_INTERNAL_BTRIE_LIBRARY)
|
||||||
add_subdirectory (libbtrie)
|
add_subdirectory (libbtrie)
|
||||||
endif ()
|
endif ()
|
||||||
@ -75,14 +91,6 @@ if (USE_INTERNAL_ZLIB_LIBRARY)
|
|||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
add_subdirectory (cctz-cmake)
|
|
||||||
|
|
||||||
add_subdirectory (jemalloc-cmake)
|
|
||||||
|
|
||||||
if (USE_INTERNAL_CPUID_LIBRARY)
|
|
||||||
add_subdirectory (libcpuid)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (USE_INTERNAL_H3_LIBRARY)
|
if (USE_INTERNAL_H3_LIBRARY)
|
||||||
add_subdirectory(h3-cmake)
|
add_subdirectory(h3-cmake)
|
||||||
endif ()
|
endif ()
|
||||||
@ -90,12 +98,14 @@ endif ()
|
|||||||
if (USE_INTERNAL_SSL_LIBRARY)
|
if (USE_INTERNAL_SSL_LIBRARY)
|
||||||
add_subdirectory (openssl-cmake)
|
add_subdirectory (openssl-cmake)
|
||||||
|
|
||||||
# This is for Poco library
|
|
||||||
set (POCO_SKIP_OPENSSL_FIND 1)
|
|
||||||
add_library(OpenSSL::Crypto ALIAS ${OPENSSL_CRYPTO_LIBRARY})
|
add_library(OpenSSL::Crypto ALIAS ${OPENSSL_CRYPTO_LIBRARY})
|
||||||
add_library(OpenSSL::SSL ALIAS ${OPENSSL_SSL_LIBRARY})
|
add_library(OpenSSL::SSL ALIAS ${OPENSSL_SSL_LIBRARY})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
if (ENABLE_LDAP AND USE_INTERNAL_LDAP_LIBRARY)
|
||||||
|
add_subdirectory (openldap-cmake)
|
||||||
|
endif ()
|
||||||
|
|
||||||
function(mysql_support)
|
function(mysql_support)
|
||||||
set(CLIENT_PLUGIN_CACHING_SHA2_PASSWORD STATIC)
|
set(CLIENT_PLUGIN_CACHING_SHA2_PASSWORD STATIC)
|
||||||
set(CLIENT_PLUGIN_SHA256_PASSWORD STATIC)
|
set(CLIENT_PLUGIN_SHA256_PASSWORD STATIC)
|
||||||
@ -131,11 +141,6 @@ if (USE_RDKAFKA)
|
|||||||
add_subdirectory (cppkafka-cmake)
|
add_subdirectory (cppkafka-cmake)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ENABLE_ODBC AND USE_INTERNAL_ODBC_LIBRARY)
|
|
||||||
add_subdirectory (unixodbc-cmake)
|
|
||||||
add_library(ODBC::ODBC ALIAS ${ODBC_LIBRARIES})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (ENABLE_ICU AND USE_INTERNAL_ICU_LIBRARY)
|
if (ENABLE_ICU AND USE_INTERNAL_ICU_LIBRARY)
|
||||||
add_subdirectory (icu-cmake)
|
add_subdirectory (icu-cmake)
|
||||||
endif ()
|
endif ()
|
||||||
@ -174,24 +179,27 @@ if (USE_INTERNAL_PARQUET_LIBRARY_NATIVE_CMAKE)
|
|||||||
set (PARQUET_ARROW_LINKAGE "static" CACHE INTERNAL "")
|
set (PARQUET_ARROW_LINKAGE "static" CACHE INTERNAL "")
|
||||||
set (ARROW_TEST_LINKAGE "static" CACHE INTERNAL "")
|
set (ARROW_TEST_LINKAGE "static" CACHE INTERNAL "")
|
||||||
set (ARROW_BUILD_STATIC ${MAKE_STATIC_LIBRARIES} CACHE INTERNAL "")
|
set (ARROW_BUILD_STATIC ${MAKE_STATIC_LIBRARIES} CACHE INTERNAL "")
|
||||||
else()
|
else ()
|
||||||
set (PARQUET_ARROW_LINKAGE "shared" CACHE INTERNAL "")
|
set (PARQUET_ARROW_LINKAGE "shared" CACHE INTERNAL "")
|
||||||
set (ARROW_TEST_LINKAGE "shared" CACHE INTERNAL "")
|
set (ARROW_TEST_LINKAGE "shared" CACHE INTERNAL "")
|
||||||
endif()
|
endif ()
|
||||||
|
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
|
if (CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO")
|
||||||
set(_save_build_type ${CMAKE_BUILD_TYPE})
|
set (_save_build_type ${CMAKE_BUILD_TYPE})
|
||||||
set(CMAKE_BUILD_TYPE RELEASE)
|
set (CMAKE_BUILD_TYPE Release)
|
||||||
endif()
|
string (TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC)
|
||||||
|
endif ()
|
||||||
|
|
||||||
# Because Arrow uses CMAKE_SOURCE_DIR as a project path
|
# Because Arrow uses CMAKE_SOURCE_DIR as a project path
|
||||||
# Hopefully will be fixed in https://github.com/apache/arrow/pull/2676
|
# Hopefully will be fixed in https://github.com/apache/arrow/pull/2676
|
||||||
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/cmake_modules")
|
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/cmake_modules")
|
||||||
add_subdirectory (arrow/cpp)
|
add_subdirectory (arrow/cpp)
|
||||||
|
|
||||||
if(_save_build_type)
|
if (_save_build_type)
|
||||||
set(CMAKE_BUILD_TYPE ${_save_build_type})
|
set (CMAKE_BUILD_TYPE ${_save_build_type})
|
||||||
endif()
|
unset (_save_build_type)
|
||||||
|
string (TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC)
|
||||||
|
endif ()
|
||||||
|
|
||||||
else()
|
else()
|
||||||
add_subdirectory(arrow-cmake)
|
add_subdirectory(arrow-cmake)
|
||||||
@ -207,29 +215,6 @@ if (USE_INTERNAL_AVRO_LIBRARY)
|
|||||||
add_subdirectory(avro-cmake)
|
add_subdirectory(avro-cmake)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (USE_INTERNAL_POCO_LIBRARY)
|
|
||||||
set (POCO_VERBOSE_MESSAGES 0 CACHE INTERNAL "")
|
|
||||||
set (save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
|
||||||
set (save_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
|
|
||||||
set (_save ${ENABLE_TESTS})
|
|
||||||
set (ENABLE_TESTS 0)
|
|
||||||
set (POCO_ENABLE_TESTS 0)
|
|
||||||
set (CMAKE_DISABLE_FIND_PACKAGE_ZLIB 1)
|
|
||||||
if (MSVC OR NOT USE_POCO_DATAODBC)
|
|
||||||
set (ENABLE_DATA_ODBC 0 CACHE INTERNAL "") # TODO (build fail)
|
|
||||||
endif ()
|
|
||||||
add_subdirectory (poco)
|
|
||||||
unset (CMAKE_DISABLE_FIND_PACKAGE_ZLIB)
|
|
||||||
set (ENABLE_TESTS ${_save})
|
|
||||||
set (CMAKE_CXX_FLAGS ${save_CMAKE_CXX_FLAGS})
|
|
||||||
set (CMAKE_C_FLAGS ${save_CMAKE_C_FLAGS})
|
|
||||||
|
|
||||||
if (OPENSSL_FOUND AND TARGET Crypto AND (NOT DEFINED ENABLE_POCO_NETSSL OR ENABLE_POCO_NETSSL))
|
|
||||||
# Bug in poco https://github.com/pocoproject/poco/pull/2100 found on macos
|
|
||||||
target_include_directories(Crypto SYSTEM PUBLIC ${OPENSSL_INCLUDE_DIR})
|
|
||||||
endif ()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if(USE_INTERNAL_GTEST_LIBRARY)
|
if(USE_INTERNAL_GTEST_LIBRARY)
|
||||||
# Google Test from sources
|
# Google Test from sources
|
||||||
add_subdirectory(${ClickHouse_SOURCE_DIR}/contrib/googletest/googletest ${CMAKE_CURRENT_BINARY_DIR}/googletest)
|
add_subdirectory(${ClickHouse_SOURCE_DIR}/contrib/googletest/googletest ${CMAKE_CURRENT_BINARY_DIR}/googletest)
|
||||||
@ -267,20 +252,17 @@ if (USE_INTERNAL_BROTLI_LIBRARY)
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (USE_INTERNAL_PROTOBUF_LIBRARY)
|
if (USE_INTERNAL_PROTOBUF_LIBRARY)
|
||||||
if (MAKE_STATIC_LIBRARIES)
|
add_subdirectory(protobuf-cmake)
|
||||||
set(protobuf_BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
|
|
||||||
else ()
|
|
||||||
set(protobuf_BUILD_SHARED_LIBS ON CACHE INTERNAL "" FORCE)
|
|
||||||
endif ()
|
|
||||||
set(protobuf_WITH_ZLIB 0 CACHE INTERNAL "" FORCE) # actually will use zlib, but skip find
|
|
||||||
set(protobuf_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
|
|
||||||
add_subdirectory(protobuf/cmake)
|
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (USE_INTERNAL_HDFS3_LIBRARY)
|
if (USE_INTERNAL_HDFS3_LIBRARY)
|
||||||
add_subdirectory(libhdfs3-cmake)
|
add_subdirectory(libhdfs3-cmake)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
if (USE_INTERNAL_GRPC_LIBRARY)
|
||||||
|
add_subdirectory(grpc-cmake)
|
||||||
|
endif ()
|
||||||
|
|
||||||
if (USE_INTERNAL_AWS_S3_LIBRARY)
|
if (USE_INTERNAL_AWS_S3_LIBRARY)
|
||||||
set (save_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
|
set (save_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
|
||||||
set (save_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
|
set (save_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
|
||||||
@ -305,33 +287,18 @@ if (USE_BASE64)
|
|||||||
add_subdirectory (base64-cmake)
|
add_subdirectory (base64-cmake)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (USE_INTERNAL_HYPERSCAN_LIBRARY)
|
|
||||||
# The library is large - avoid bloat.
|
|
||||||
if (USE_STATIC_LIBRARIES)
|
|
||||||
add_subdirectory (hyperscan)
|
|
||||||
target_compile_options (hs PRIVATE -g0)
|
|
||||||
else ()
|
|
||||||
set(BUILD_SHARED_LIBS 1 CACHE INTERNAL "")
|
|
||||||
add_subdirectory (hyperscan)
|
|
||||||
target_compile_options (hs_shared PRIVATE -g0)
|
|
||||||
endif ()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (USE_SIMDJSON)
|
if (USE_SIMDJSON)
|
||||||
add_subdirectory (simdjson-cmake)
|
add_subdirectory (simdjson-cmake)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (USE_MIMALLOC)
|
|
||||||
add_subdirectory (mimalloc)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (USE_FASTOPS)
|
if (USE_FASTOPS)
|
||||||
add_subdirectory (fastops-cmake)
|
add_subdirectory (fastops-cmake)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(grpc-cmake)
|
if (USE_CASSANDRA)
|
||||||
|
add_subdirectory (libuv)
|
||||||
|
add_subdirectory (cassandra)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_subdirectory (fmtlib-cmake)
|
||||||
|
|
||||||
add_subdirectory(replxx-cmake)
|
|
||||||
add_subdirectory(FastMemcpy)
|
|
||||||
add_subdirectory(consistent-hashing)
|
|
||||||
add_subdirectory(consistent-hashing-sumbur)
|
|
||||||
|
|||||||
@ -47,7 +47,8 @@ set(thriftcpp_threads_SOURCES
|
|||||||
)
|
)
|
||||||
add_library(${THRIFT_LIBRARY} ${thriftcpp_SOURCES} ${thriftcpp_threads_SOURCES})
|
add_library(${THRIFT_LIBRARY} ${thriftcpp_SOURCES} ${thriftcpp_threads_SOURCES})
|
||||||
set_target_properties(${THRIFT_LIBRARY} PROPERTIES CXX_STANDARD 14) # REMOVE after https://github.com/apache/thrift/pull/1641
|
set_target_properties(${THRIFT_LIBRARY} PROPERTIES CXX_STANDARD 14) # REMOVE after https://github.com/apache/thrift/pull/1641
|
||||||
target_include_directories(${THRIFT_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/thrift/lib/cpp/src PRIVATE ${Boost_INCLUDE_DIRS})
|
target_include_directories(${THRIFT_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/thrift/lib/cpp/src)
|
||||||
|
target_link_libraries (${THRIFT_LIBRARY} PRIVATE boost::headers_only)
|
||||||
|
|
||||||
|
|
||||||
# === orc
|
# === orc
|
||||||
@ -83,7 +84,7 @@ add_custom_command(OUTPUT orc_proto.pb.h orc_proto.pb.cc
|
|||||||
set(FLATBUFFERS_SRC_DIR ${ClickHouse_SOURCE_DIR}/contrib/flatbuffers)
|
set(FLATBUFFERS_SRC_DIR ${ClickHouse_SOURCE_DIR}/contrib/flatbuffers)
|
||||||
set(FLATBUFFERS_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/flatbuffers)
|
set(FLATBUFFERS_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/flatbuffers)
|
||||||
set(FLATBUFFERS_INCLUDE_DIR ${FLATBUFFERS_SRC_DIR}/include)
|
set(FLATBUFFERS_INCLUDE_DIR ${FLATBUFFERS_SRC_DIR}/include)
|
||||||
set(FLATBUFFERS_COMPILER "${FLATBUFFERS_BINARY_DIR}/flatc")
|
set(FLATBUFFERS_COMPILER "$<TARGET_FILE:flatc>")
|
||||||
|
|
||||||
# set flatbuffers CMake options
|
# set flatbuffers CMake options
|
||||||
if (${USE_STATIC_LIBRARIES})
|
if (${USE_STATIC_LIBRARIES})
|
||||||
@ -286,10 +287,6 @@ set(ARROW_SRCS ${ARROW_SRCS}
|
|||||||
${LIBRARY_DIR}/compute/kernels/util_internal.cc
|
${LIBRARY_DIR}/compute/kernels/util_internal.cc
|
||||||
)
|
)
|
||||||
|
|
||||||
if (LZ4_INCLUDE_DIR AND LZ4_LIBRARY)
|
|
||||||
set(ARROW_WITH_LZ4 1)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARY)
|
if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARY)
|
||||||
set(ARROW_WITH_SNAPPY 1)
|
set(ARROW_WITH_SNAPPY 1)
|
||||||
endif ()
|
endif ()
|
||||||
@ -302,10 +299,8 @@ if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY)
|
|||||||
set(ARROW_WITH_ZSTD 1)
|
set(ARROW_WITH_ZSTD 1)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (ARROW_WITH_LZ4)
|
add_definitions(-DARROW_WITH_LZ4)
|
||||||
add_definitions(-DARROW_WITH_LZ4)
|
SET(ARROW_SRCS ${LIBRARY_DIR}/util/compression_lz4.cc ${ARROW_SRCS})
|
||||||
SET(ARROW_SRCS ${LIBRARY_DIR}/util/compression_lz4.cc ${ARROW_SRCS})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (ARROW_WITH_SNAPPY)
|
if (ARROW_WITH_SNAPPY)
|
||||||
add_definitions(-DARROW_WITH_SNAPPY)
|
add_definitions(-DARROW_WITH_SNAPPY)
|
||||||
@ -328,18 +323,15 @@ add_library(${ARROW_LIBRARY} ${ARROW_SRCS})
|
|||||||
# Arrow dependencies
|
# Arrow dependencies
|
||||||
add_dependencies(${ARROW_LIBRARY} ${FLATBUFFERS_LIBRARY} metadata_fbs)
|
add_dependencies(${ARROW_LIBRARY} ${FLATBUFFERS_LIBRARY} metadata_fbs)
|
||||||
|
|
||||||
target_link_libraries(${ARROW_LIBRARY} PRIVATE boost_system_internal boost_filesystem_internal boost_regex_internal)
|
target_link_libraries(${ARROW_LIBRARY} PRIVATE ${FLATBUFFERS_LIBRARY} boost::filesystem)
|
||||||
target_link_libraries(${ARROW_LIBRARY} PRIVATE ${FLATBUFFERS_LIBRARY})
|
|
||||||
|
|
||||||
if (USE_INTERNAL_PROTOBUF_LIBRARY)
|
if (USE_INTERNAL_PROTOBUF_LIBRARY)
|
||||||
add_dependencies(${ARROW_LIBRARY} protoc)
|
add_dependencies(${ARROW_LIBRARY} protoc)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
target_include_directories(${ARROW_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src ${Boost_INCLUDE_DIRS})
|
target_include_directories(${ARROW_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src)
|
||||||
target_link_libraries(${ARROW_LIBRARY} PRIVATE ${DOUBLE_CONVERSION_LIBRARIES} ${Protobuf_LIBRARY})
|
target_link_libraries(${ARROW_LIBRARY} PRIVATE ${DOUBLE_CONVERSION_LIBRARIES} ${Protobuf_LIBRARY})
|
||||||
if (ARROW_WITH_LZ4)
|
target_link_libraries(${ARROW_LIBRARY} PRIVATE lz4)
|
||||||
target_link_libraries(${ARROW_LIBRARY} PRIVATE ${LZ4_LIBRARY})
|
|
||||||
endif ()
|
|
||||||
if (ARROW_WITH_SNAPPY)
|
if (ARROW_WITH_SNAPPY)
|
||||||
target_link_libraries(${ARROW_LIBRARY} PRIVATE ${SNAPPY_LIBRARY})
|
target_link_libraries(${ARROW_LIBRARY} PRIVATE ${SNAPPY_LIBRARY})
|
||||||
endif ()
|
endif ()
|
||||||
@ -396,8 +388,7 @@ list(APPEND PARQUET_SRCS
|
|||||||
add_library(${PARQUET_LIBRARY} ${PARQUET_SRCS})
|
add_library(${PARQUET_LIBRARY} ${PARQUET_SRCS})
|
||||||
target_include_directories(${PARQUET_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src)
|
target_include_directories(${PARQUET_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src)
|
||||||
include(${ClickHouse_SOURCE_DIR}/contrib/thrift/build/cmake/ConfigureChecks.cmake) # makes config.h
|
include(${ClickHouse_SOURCE_DIR}/contrib/thrift/build/cmake/ConfigureChecks.cmake) # makes config.h
|
||||||
target_link_libraries(${PARQUET_LIBRARY} PUBLIC ${ARROW_LIBRARY} PRIVATE ${THRIFT_LIBRARY} ${Boost_REGEX_LIBRARY})
|
target_link_libraries(${PARQUET_LIBRARY} PUBLIC ${ARROW_LIBRARY} PRIVATE ${THRIFT_LIBRARY} boost::headers_only boost::regex)
|
||||||
target_include_directories(${PARQUET_LIBRARY} PRIVATE ${Boost_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
if (SANITIZE STREQUAL "undefined")
|
if (SANITIZE STREQUAL "undefined")
|
||||||
target_compile_options(${PARQUET_LIBRARY} PRIVATE -fno-sanitize=undefined)
|
target_compile_options(${PARQUET_LIBRARY} PRIVATE -fno-sanitize=undefined)
|
||||||
|
|||||||
@ -45,13 +45,12 @@ set_target_properties (avrocpp PROPERTIES VERSION ${AVRO_VERSION_MAJOR}.${AVRO_V
|
|||||||
|
|
||||||
target_include_directories(avrocpp SYSTEM PUBLIC ${AVROCPP_INCLUDE_DIR})
|
target_include_directories(avrocpp SYSTEM PUBLIC ${AVROCPP_INCLUDE_DIR})
|
||||||
|
|
||||||
target_include_directories(avrocpp SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
|
target_link_libraries (avrocpp PRIVATE boost::headers_only boost::iostreams)
|
||||||
target_link_libraries (avrocpp ${Boost_IOSTREAMS_LIBRARY})
|
|
||||||
|
|
||||||
if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARY)
|
if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARY)
|
||||||
target_compile_definitions (avrocpp PUBLIC SNAPPY_CODEC_AVAILABLE)
|
target_compile_definitions (avrocpp PUBLIC SNAPPY_CODEC_AVAILABLE)
|
||||||
target_include_directories (avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
|
target_include_directories (avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
|
||||||
target_link_libraries (avrocpp ${SNAPPY_LIBRARY})
|
target_link_libraries (avrocpp PRIVATE ${SNAPPY_LIBRARY})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (COMPILER_GCC)
|
if (COMPILER_GCC)
|
||||||
|
|||||||
2
contrib/aws
vendored
2
contrib/aws
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 45dd8552d3c492defca79d2720bcc809e35654da
|
Subproject commit 17e10c0fc77f22afe890fa6d1b283760e5edaa56
|
||||||
@ -83,7 +83,7 @@ set(S3_INCLUDES
|
|||||||
|
|
||||||
add_library(aws_s3_checksums ${AWS_CHECKSUMS_SOURCES})
|
add_library(aws_s3_checksums ${AWS_CHECKSUMS_SOURCES})
|
||||||
target_include_directories(aws_s3_checksums PUBLIC "${AWS_CHECKSUMS_LIBRARY_DIR}/include/")
|
target_include_directories(aws_s3_checksums PUBLIC "${AWS_CHECKSUMS_LIBRARY_DIR}/include/")
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL "" OR CMAKE_BUILD_TYPE STREQUAL "Debug")
|
if(CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
|
||||||
target_compile_definitions(aws_s3_checksums PRIVATE "-DDEBUG_BUILD")
|
target_compile_definitions(aws_s3_checksums PRIVATE "-DDEBUG_BUILD")
|
||||||
endif()
|
endif()
|
||||||
set_target_properties(aws_s3_checksums PROPERTIES LINKER_LANGUAGE C)
|
set_target_properties(aws_s3_checksums PROPERTIES LINKER_LANGUAGE C)
|
||||||
|
|||||||
@ -31,3 +31,13 @@ else ()
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
target_include_directories(base64 SYSTEM PUBLIC ${LIBRARY_DIR})
|
target_include_directories(base64 SYSTEM PUBLIC ${LIBRARY_DIR})
|
||||||
|
|
||||||
|
if (XCODE OR XCODE_VERSION)
|
||||||
|
# https://gitlab.kitware.com/cmake/cmake/issues/17457
|
||||||
|
# Some native build systems may not like targets that have only object files, so consider adding at least one real source file
|
||||||
|
# This applies to Xcode.
|
||||||
|
if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
|
||||||
|
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c" "")
|
||||||
|
endif ()
|
||||||
|
target_sources(base64 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
|
||||||
|
endif ()
|
||||||
|
|||||||
2
contrib/boost
vendored
2
contrib/boost
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 86be2aef20bee2356b744e5569eed6eaded85dbe
|
Subproject commit a04e72c0464f0c31d3384f18f0c0db36a05538e0
|
||||||
@ -1,45 +1,133 @@
|
|||||||
# Supported contrib/boost source variants:
|
option (USE_INTERNAL_BOOST_LIBRARY "Use internal Boost library" ${NOT_UNBUNDLED})
|
||||||
# 1. Default - Minimized vrsion from release archive : https://github.com/ClickHouse-Extras/boost
|
|
||||||
# 2. Release archive unpacked to contrib/boost
|
|
||||||
# 3. Full boost https://github.com/boostorg/boost
|
|
||||||
|
|
||||||
# if boostorg/boost connected as submodule: Update all boost internal submodules to tag:
|
if (USE_INTERNAL_BOOST_LIBRARY)
|
||||||
# git submodule foreach "git fetch --all && git checkout boost-1.66.0 || true"
|
set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/boost)
|
||||||
|
|
||||||
#
|
# filesystem
|
||||||
# Important boost patch: 094c18b
|
|
||||||
#
|
|
||||||
|
|
||||||
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
|
set (SRCS_FILESYSTEM
|
||||||
|
${LIBRARY_DIR}/libs/filesystem/src/codecvt_error_category.cpp
|
||||||
|
${LIBRARY_DIR}/libs/filesystem/src/operations.cpp
|
||||||
|
${LIBRARY_DIR}/libs/filesystem/src/path_traits.cpp
|
||||||
|
${LIBRARY_DIR}/libs/filesystem/src/path.cpp
|
||||||
|
${LIBRARY_DIR}/libs/filesystem/src/portability.cpp
|
||||||
|
${LIBRARY_DIR}/libs/filesystem/src/unique_path.cpp
|
||||||
|
${LIBRARY_DIR}/libs/filesystem/src/utf8_codecvt_facet.cpp
|
||||||
|
${LIBRARY_DIR}/libs/filesystem/src/windows_file_codecvt.cpp
|
||||||
|
)
|
||||||
|
|
||||||
set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/boost)
|
add_library (_boost_filesystem ${SRCS_FILESYSTEM})
|
||||||
|
add_library (boost::filesystem ALIAS _boost_filesystem)
|
||||||
|
target_include_directories (_boost_filesystem SYSTEM BEFORE PUBLIC ${LIBRARY_DIR})
|
||||||
|
|
||||||
if(NOT MSVC)
|
# headers-only
|
||||||
add_definitions(-Wno-unused-variable -Wno-deprecated-declarations)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
macro(add_boost_lib lib_name)
|
add_library (_boost_headers_only INTERFACE)
|
||||||
add_headers_and_sources(boost_${lib_name} ${LIBRARY_DIR}/libs/${lib_name}/src)
|
add_library (boost::headers_only ALIAS _boost_headers_only)
|
||||||
add_library(boost_${lib_name}_internal ${boost_${lib_name}_sources})
|
target_include_directories (_boost_headers_only SYSTEM BEFORE INTERFACE ${LIBRARY_DIR})
|
||||||
target_include_directories(boost_${lib_name}_internal SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
|
|
||||||
target_compile_definitions(boost_${lib_name}_internal PUBLIC BOOST_SYSTEM_NO_DEPRECATED)
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
add_boost_lib(system)
|
# iostreams
|
||||||
|
|
||||||
add_boost_lib(program_options)
|
set (SRCS_IOSTREAMS
|
||||||
|
${LIBRARY_DIR}/libs/iostreams/src/file_descriptor.cpp
|
||||||
|
${LIBRARY_DIR}/libs/iostreams/src/gzip.cpp
|
||||||
|
${LIBRARY_DIR}/libs/iostreams/src/mapped_file.cpp
|
||||||
|
${LIBRARY_DIR}/libs/iostreams/src/zlib.cpp
|
||||||
|
)
|
||||||
|
|
||||||
add_boost_lib(filesystem)
|
add_library (_boost_iostreams ${SRCS_IOSTREAMS})
|
||||||
target_link_libraries(boost_filesystem_internal PRIVATE boost_system_internal)
|
add_library (boost::iostreams ALIAS _boost_iostreams)
|
||||||
|
target_include_directories (_boost_iostreams PRIVATE ${LIBRARY_DIR})
|
||||||
|
target_link_libraries (_boost_iostreams PRIVATE zlib)
|
||||||
|
|
||||||
#add_boost_lib(random)
|
# program_options
|
||||||
|
|
||||||
if (USE_INTERNAL_PARQUET_LIBRARY)
|
set (SRCS_PROGRAM_OPTIONS
|
||||||
add_boost_lib(regex)
|
${LIBRARY_DIR}/libs/program_options/src/cmdline.cpp
|
||||||
endif()
|
${LIBRARY_DIR}/libs/program_options/src/config_file.cpp
|
||||||
|
${LIBRARY_DIR}/libs/program_options/src/convert.cpp
|
||||||
|
${LIBRARY_DIR}/libs/program_options/src/options_description.cpp
|
||||||
|
${LIBRARY_DIR}/libs/program_options/src/parsers.cpp
|
||||||
|
${LIBRARY_DIR}/libs/program_options/src/positional_options.cpp
|
||||||
|
${LIBRARY_DIR}/libs/program_options/src/split.cpp
|
||||||
|
${LIBRARY_DIR}/libs/program_options/src/utf8_codecvt_facet.cpp
|
||||||
|
${LIBRARY_DIR}/libs/program_options/src/value_semantic.cpp
|
||||||
|
${LIBRARY_DIR}/libs/program_options/src/variables_map.cpp
|
||||||
|
${LIBRARY_DIR}/libs/program_options/src/winmain.cpp
|
||||||
|
)
|
||||||
|
|
||||||
if (USE_INTERNAL_AVRO_LIBRARY)
|
add_library (_boost_program_options ${SRCS_PROGRAM_OPTIONS})
|
||||||
add_boost_lib(iostreams)
|
add_library (boost::program_options ALIAS _boost_program_options)
|
||||||
target_link_libraries(boost_iostreams_internal PUBLIC ${ZLIB_LIBRARIES})
|
target_include_directories (_boost_program_options SYSTEM BEFORE PUBLIC ${LIBRARY_DIR})
|
||||||
target_include_directories(boost_iostreams_internal SYSTEM BEFORE PRIVATE ${ZLIB_INCLUDE_DIR})
|
|
||||||
endif()
|
# regex
|
||||||
|
|
||||||
|
set (SRCS_REGEX
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/c_regex_traits.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/cpp_regex_traits.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/cregex.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/fileiter.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/icu.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/instances.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/internals.hpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/posix_api.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/regex_debug.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/regex_raw_buffer.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/regex_traits_defaults.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/regex.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/static_mutex.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/usinstances.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/w32_regex_traits.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/wc_regex_traits.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/wide_posix_api.cpp
|
||||||
|
${LIBRARY_DIR}/libs/regex/src/winstances.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
add_library (_boost_regex ${SRCS_REGEX})
|
||||||
|
add_library (boost::regex ALIAS _boost_regex)
|
||||||
|
target_include_directories (_boost_regex PRIVATE ${LIBRARY_DIR})
|
||||||
|
|
||||||
|
# system
|
||||||
|
|
||||||
|
set (SRCS_SYSTEM
|
||||||
|
${LIBRARY_DIR}/libs/system/src/error_code.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
add_library (_boost_system ${SRCS_SYSTEM})
|
||||||
|
add_library (boost::system ALIAS _boost_system)
|
||||||
|
target_include_directories (_boost_system PRIVATE ${LIBRARY_DIR})
|
||||||
|
else ()
|
||||||
|
# 1.70 like in contrib/boost
|
||||||
|
# 1.67 on CI
|
||||||
|
set(BOOST_VERSION 1.67)
|
||||||
|
|
||||||
|
find_package(Boost ${BOOST_VERSION} COMPONENTS
|
||||||
|
system
|
||||||
|
filesystem
|
||||||
|
iostreams
|
||||||
|
program_options
|
||||||
|
regex
|
||||||
|
REQUIRED)
|
||||||
|
|
||||||
|
add_library (_boost_headers_only INTERFACE)
|
||||||
|
add_library (boost::headers_only ALIAS _boost_headers_only)
|
||||||
|
target_include_directories (_boost_headers_only SYSTEM BEFORE INTERFACE ${Boost_INCLUDE_DIR})
|
||||||
|
|
||||||
|
add_library (_boost_filesystem INTERFACE)
|
||||||
|
add_library (_boost_iostreams INTERFACE)
|
||||||
|
add_library (_boost_program_options INTERFACE)
|
||||||
|
add_library (_boost_regex INTERFACE)
|
||||||
|
add_library (_boost_system INTERFACE)
|
||||||
|
|
||||||
|
target_link_libraries (_boost_filesystem INTERFACE ${Boost_FILESYSTEM_LIBRARY})
|
||||||
|
target_link_libraries (_boost_iostreams INTERFACE ${Boost_IOSTREAMS_LIBRARY})
|
||||||
|
target_link_libraries (_boost_program_options INTERFACE ${Boost_PROGRAM_OPTIONS_LIBRARY})
|
||||||
|
target_link_libraries (_boost_regex INTERFACE ${Boost_REGEX_LIBRARY})
|
||||||
|
target_link_libraries (_boost_system INTERFACE ${Boost_SYSTEM_LIBRARY})
|
||||||
|
|
||||||
|
add_library (boost::filesystem ALIAS _boost_filesystem)
|
||||||
|
add_library (boost::iostreams ALIAS _boost_iostreams)
|
||||||
|
add_library (boost::program_options ALIAS _boost_program_options)
|
||||||
|
add_library (boost::regex ALIAS _boost_regex)
|
||||||
|
add_library (boost::system ALIAS _boost_system)
|
||||||
|
endif ()
|
||||||
|
|||||||
1
contrib/cassandra
vendored
Submodule
1
contrib/cassandra
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit a49b4e0e2696a4b8ef286a5b9538d1cbe8490509
|
||||||
@ -26,11 +26,15 @@ if (USE_INTERNAL_CCTZ)
|
|||||||
|
|
||||||
# Build a libray with embedded tzdata
|
# Build a libray with embedded tzdata
|
||||||
|
|
||||||
# We invoke 'ld' and 'objcopy' directly because lld linker has no option to generate object file with binary data.
|
|
||||||
# Note: we can invoke specific ld from toolchain and relax condition on ARCH_AMD64.
|
|
||||||
|
|
||||||
if (OS_LINUX AND ARCH_AMD64)
|
if (OS_LINUX AND ARCH_AMD64)
|
||||||
|
|
||||||
|
find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-10" "llvm-objcopy-9" "llvm-objcopy-8" "objcopy")
|
||||||
|
if (OBJCOPY_PATH)
|
||||||
|
message(STATUS "Using objcopy: ${OBJCOPY_PATH}.")
|
||||||
|
else ()
|
||||||
|
message(FATAL_ERROR "Cannot find objcopy.")
|
||||||
|
endif ()
|
||||||
|
|
||||||
set (TIMEZONES
|
set (TIMEZONES
|
||||||
Africa/Abidjan
|
Africa/Abidjan
|
||||||
Africa/Accra
|
Africa/Accra
|
||||||
@ -605,8 +609,8 @@ if (USE_INTERNAL_CCTZ)
|
|||||||
|
|
||||||
# https://stackoverflow.com/questions/14776463/compile-and-add-an-object-file-from-a-binary-with-cmake
|
# https://stackoverflow.com/questions/14776463/compile-and-add-an-object-file-from-a-binary-with-cmake
|
||||||
add_custom_command(OUTPUT ${TZ_OBJ}
|
add_custom_command(OUTPUT ${TZ_OBJ}
|
||||||
COMMAND cd ${TZDIR} && ld -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/${TZ_OBJ} ${TIMEZONE}
|
COMMAND cd ${TZDIR} && ${OBJCOPY_PATH} -I binary -O elf64-x86-64 -B i386 ${TIMEZONE} ${CMAKE_CURRENT_BINARY_DIR}/${TZ_OBJ}
|
||||||
COMMAND objcopy --rename-section .data=.rodata,alloc,load,readonly,data,contents
|
COMMAND ${OBJCOPY_PATH} --rename-section .data=.rodata,alloc,load,readonly,data,contents
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/${TZ_OBJ} ${CMAKE_CURRENT_BINARY_DIR}/${TZ_OBJ})
|
${CMAKE_CURRENT_BINARY_DIR}/${TZ_OBJ} ${CMAKE_CURRENT_BINARY_DIR}/${TZ_OBJ})
|
||||||
|
|
||||||
set_source_files_properties(${TZ_OBJ} PROPERTIES EXTERNAL_OBJECT true GENERATED true)
|
set_source_files_properties(${TZ_OBJ} PROPERTIES EXTERNAL_OBJECT true GENERATED true)
|
||||||
@ -614,7 +618,12 @@ if (USE_INTERNAL_CCTZ)
|
|||||||
|
|
||||||
add_library(tzdata STATIC ${TZ_OBJS})
|
add_library(tzdata STATIC ${TZ_OBJS})
|
||||||
set_target_properties(tzdata PROPERTIES LINKER_LANGUAGE C)
|
set_target_properties(tzdata PROPERTIES LINKER_LANGUAGE C)
|
||||||
target_link_libraries(cctz -Wl,--whole-archive tzdata -Wl,--no-whole-archive) # whole-archive prevents symbols from being discarded
|
# whole-archive prevents symbols from being discarded for unknown reason
|
||||||
|
# CMake can shuffle each of target_link_libraries arguments with other
|
||||||
|
# libraries in linker command. To avoid this we hardcode whole-archive
|
||||||
|
# library into single string.
|
||||||
|
add_dependencies(cctz tzdata)
|
||||||
|
target_link_libraries(cctz INTERFACE "-Wl,--whole-archive $<TARGET_FILE:tzdata> -Wl,--no-whole-archive")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
else ()
|
else ()
|
||||||
|
|||||||
2
contrib/cppkafka
vendored
2
contrib/cppkafka
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 9b184d881c15cc50784b28688c7c99d3d764db24
|
Subproject commit f555ee36aaa74d17ca0dab3ce472070a610b2966
|
||||||
@ -1,31 +1,33 @@
|
|||||||
set(CPPKAFKA_DIR ${ClickHouse_SOURCE_DIR}/contrib/cppkafka)
|
set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/cppkafka)
|
||||||
|
|
||||||
set(SRCS
|
set(SRCS
|
||||||
${CPPKAFKA_DIR}/src/configuration.cpp
|
${LIBRARY_DIR}/src/buffer.cpp
|
||||||
${CPPKAFKA_DIR}/src/topic_configuration.cpp
|
${LIBRARY_DIR}/src/configuration_option.cpp
|
||||||
${CPPKAFKA_DIR}/src/configuration_option.cpp
|
${LIBRARY_DIR}/src/configuration.cpp
|
||||||
${CPPKAFKA_DIR}/src/exceptions.cpp
|
${LIBRARY_DIR}/src/consumer.cpp
|
||||||
${CPPKAFKA_DIR}/src/topic.cpp
|
${LIBRARY_DIR}/src/error.cpp
|
||||||
${CPPKAFKA_DIR}/src/buffer.cpp
|
${LIBRARY_DIR}/src/event.cpp
|
||||||
${CPPKAFKA_DIR}/src/queue.cpp
|
${LIBRARY_DIR}/src/exceptions.cpp
|
||||||
${CPPKAFKA_DIR}/src/message.cpp
|
${LIBRARY_DIR}/src/group_information.cpp
|
||||||
${CPPKAFKA_DIR}/src/message_timestamp.cpp
|
${LIBRARY_DIR}/src/kafka_handle_base.cpp
|
||||||
${CPPKAFKA_DIR}/src/message_internal.cpp
|
${LIBRARY_DIR}/src/message_internal.cpp
|
||||||
${CPPKAFKA_DIR}/src/topic_partition.cpp
|
${LIBRARY_DIR}/src/message_timestamp.cpp
|
||||||
${CPPKAFKA_DIR}/src/topic_partition_list.cpp
|
${LIBRARY_DIR}/src/message.cpp
|
||||||
${CPPKAFKA_DIR}/src/metadata.cpp
|
${LIBRARY_DIR}/src/metadata.cpp
|
||||||
${CPPKAFKA_DIR}/src/group_information.cpp
|
${LIBRARY_DIR}/src/producer.cpp
|
||||||
${CPPKAFKA_DIR}/src/error.cpp
|
${LIBRARY_DIR}/src/queue.cpp
|
||||||
${CPPKAFKA_DIR}/src/event.cpp
|
${LIBRARY_DIR}/src/topic_configuration.cpp
|
||||||
|
${LIBRARY_DIR}/src/topic_partition_list.cpp
|
||||||
${CPPKAFKA_DIR}/src/kafka_handle_base.cpp
|
${LIBRARY_DIR}/src/topic_partition.cpp
|
||||||
${CPPKAFKA_DIR}/src/producer.cpp
|
${LIBRARY_DIR}/src/topic.cpp
|
||||||
${CPPKAFKA_DIR}/src/consumer.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(cppkafka ${SRCS})
|
add_library(cppkafka ${SRCS})
|
||||||
|
|
||||||
target_link_libraries(cppkafka PRIVATE ${RDKAFKA_LIBRARY})
|
target_link_libraries(cppkafka
|
||||||
target_include_directories(cppkafka PRIVATE ${CPPKAFKA_DIR}/include/cppkafka)
|
PRIVATE
|
||||||
target_include_directories(cppkafka PRIVATE ${Boost_INCLUDE_DIRS})
|
${RDKAFKA_LIBRARY}
|
||||||
target_include_directories(cppkafka SYSTEM PUBLIC ${CPPKAFKA_DIR}/include)
|
boost::headers_only
|
||||||
|
)
|
||||||
|
target_include_directories(cppkafka PRIVATE ${LIBRARY_DIR}/include/cppkafka)
|
||||||
|
target_include_directories(cppkafka SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}/include)
|
||||||
|
|||||||
1
contrib/fmtlib
vendored
Submodule
1
contrib/fmtlib
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 297c3b2ed551a4989826fc8c4780bf533e964bd9
|
||||||
20
contrib/fmtlib-cmake/CMakeLists.txt
Normal file
20
contrib/fmtlib-cmake/CMakeLists.txt
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
set (SRCS
|
||||||
|
../fmtlib/src/format.cc
|
||||||
|
../fmtlib/src/os.cc
|
||||||
|
|
||||||
|
../fmtlib/include/fmt/chrono.h
|
||||||
|
../fmtlib/include/fmt/color.h
|
||||||
|
../fmtlib/include/fmt/compile.h
|
||||||
|
../fmtlib/include/fmt/core.h
|
||||||
|
../fmtlib/include/fmt/format.h
|
||||||
|
../fmtlib/include/fmt/format-inl.h
|
||||||
|
../fmtlib/include/fmt/locale.h
|
||||||
|
../fmtlib/include/fmt/os.h
|
||||||
|
../fmtlib/include/fmt/ostream.h
|
||||||
|
../fmtlib/include/fmt/posix.h
|
||||||
|
../fmtlib/include/fmt/printf.h
|
||||||
|
../fmtlib/include/fmt/ranges.h
|
||||||
|
)
|
||||||
|
|
||||||
|
add_library(fmt ${SRCS})
|
||||||
|
target_include_directories(fmt SYSTEM PUBLIC ../fmtlib/include)
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user