Alexey Milovidov
701a9a8143
Fixed "unbundled" build
2019-12-18 22:50:12 +03:00
Alexey Milovidov
3a02b1093e
Fixed error
2019-12-18 19:15:03 +03:00
Alexey Milovidov
1d0854c7af
Using less number of LLVM libraries
2019-12-18 19:08:11 +03:00
Alexey Milovidov
2f17bf2833
Fixed aarch64 build in CI
2019-12-18 18:36:44 +03:00
Alexey Milovidov
823c120776
Fixed "splitted" build in CI
2019-12-18 18:34:02 +03:00
Alexey Milovidov
a7ef9e911a
Fixed UBSan check in CI
2019-12-18 18:30:23 +03:00
Alexey Milovidov
cdc3a78e2f
Fixed PVS Studio CI check
2019-12-18 18:26:27 +03:00
Alexey Milovidov
0896450230
Updated LLVM search script
2019-12-18 03:13:45 +03:00
Alexey Milovidov
c8e19f8bc8
Enable ICU for build with Memory Sanitizer
2019-12-15 20:53:16 +03:00
Alexey Milovidov
f97a542132
Fixed bug in README files for cross build
2019-12-15 09:36:43 +03:00
Alexey Milovidov
47d9209ebb
Merge branch 'master' into libressl-to-openssl
2019-12-15 08:19:56 +03:00
Alexey Milovidov
7bba07d5f4
Added AARCH64 build for OpenSSL
2019-12-15 08:14:50 +03:00
Alexey Milovidov
09a0223f81
Preparation to build ICU from sources
2019-12-15 06:00:53 +03:00
Alexey Milovidov
c7cd1e8c20
Fixed CMakeLists
2019-12-15 01:43:08 +03:00
Alexey Milovidov
974d6f3bb0
Replaced libressl with openssl
2019-12-14 05:28:12 +03:00
alexey-milovidov
575208c6e2
Merge pull request #8182 from ClickHouse/aku/msan-exception
...
Suppress an msan false positive in exception handling.
2019-12-13 02:41:28 +03:00
Alexander Kuzmenkov
f0ed2bd233
Suppress an msan false positive in exception handling.
...
See https://github.com/google/sanitizers/issues/1155
2019-12-12 21:28:58 +03:00
alexey-milovidov
51ed10ed78
Merge pull request #8011 from Jokser/aws-s3-sdk-integration
...
AWS SDK S3 integration
2019-12-12 20:43:16 +03:00
Vladimir Chebotarev
a3fd3bfd15
Fixed linker searching logic.
2019-12-11 13:20:45 +03:00
Vladimir Chebotarev
3c053ec36a
Fixed a typo
2019-12-11 07:56:33 +03:00
alexey-milovidov
bbce99dd4c
Merge pull request #8115 from excitoon-favorites/enable_ld
...
Better linking
2019-12-10 23:15:20 +03:00
alexey-milovidov
c181fdc6a9
Update tools.cmake
2019-12-10 23:14:57 +03:00
alexey-milovidov
319428ca68
Merge pull request #7737 from amosbird/modernclient
...
Favor tinfo or bundled ncurses
2019-12-10 22:29:50 +03:00
Vladimir Chebotarev
d7b276551c
Better linking in both GCC and Clang.
2019-12-10 17:05:48 +03:00
Vladimir Chebotarev
f9fbf70c69
Enabled ld
for GCC.
2019-12-10 11:37:06 +03:00
alesapin
eb676b3c5d
Fix search for lld
2019-12-09 12:29:59 +03:00
Pavel Kovalenko
a9dfefd37f
AWS SDK integration rework.
2019-12-06 17:37:21 +03:00
Pavel Kovalenko
a9e2327ec0
AWS S3 SDK integration.
2019-12-03 19:23:24 +03:00
Amos Bird
dc390be385
Favor tinfo or bundled ncurses
2019-11-12 22:37:33 +08:00
alexey-milovidov
15c4a19bb1
Merge pull request #7585 from ernestp/macos_catalina_2019_11_01
...
Fixed compile errors on macOS Catalina
2019-11-02 15:46:17 +03:00
proller
6a573b4092
Allow to use mysql format without ssl - try2 with mysql interface split ( #7524 )
...
* Allow use mysql format without ssl
* fix
* fix
* fix
* Also disable poco's optional libraries
* clean
* fix
* fix
* Requested changes
* clean
* Requested fixes
* Update MySQLHandler.cpp
2019-11-02 13:20:46 +03:00
alexey-milovidov
fd104a1f9a
Merge pull request #7570 from ClickHouse/fix-cross-arm
...
Fix cross-arm build
2019-11-02 00:55:19 +03:00
Ernest Poletaev
de1e5d0e53
Fixed compile errors on macOS Catalina
2019-11-01 23:33:43 +07:00
Ivan Lezhankin
ad76cd74e6
Cache AR and RANLIB paths
2019-11-01 18:18:57 +03:00
Ivan
be75b8d16e
Update toolchain for ASM language
2019-11-01 16:14:15 +03:00
Ivan Lezhankin
473a60f741
Fix toolchain file
2019-11-01 14:28:39 +03:00
proller
0006f2a370
Fix build without submodules ( #7295 )
...
* Build fixes
* fix
* Fix
* fix
* Fix install(export..
* Freebsd fixes
* Freebsd fixes
* Fix warning
* fix
* More PRIVATE linking
* Fix review
* Timmy
* Timmy
* fix
* Try fix jemalloc link
* style
2019-10-30 23:34:06 +03:00
Ivan
4f2f5cca84
Add support for cross-compiling to the CPU architecture AARCH64 ( #7370 )
2019-10-30 10:01:53 +03:00
Amos Bird
82d0dfa629
Better add_globs
2019-10-22 15:09:49 +08:00
Amos Bird
b0d4baccc8
Enable musl and jemalloc for arm.
...
Can generate better arm packages.
2019-10-14 00:06:54 +08:00
proller
594c535bd4
Build fixes ( #7063 )
...
* Build fixes
* fix
* Fix
* fix
* Fix install(export..
* Freebsd fixes
* Freebsd fixes
* Fix warning
* fix
* More PRIVATE linking
* Fix review
* Timmy
* fix
* fix
2019-10-05 22:25:31 +03:00
Ivan
381947509a
Fix build for Darwin ( #7149 )
...
* Disable some contribs for cross-compilation
* Fix clang-8-darwin build
* Also fix docs
* Add diagnostics
* Check cross-compilation in each file individually.
* Disable warning for clang < 9
2019-10-02 17:35:07 +03:00
Amos Bird
dbc352fdf9
glibc 2.29 compatibility
2019-09-30 12:28:50 +08:00
Ivan
8bce0fa9cb
Disable some contribs for cross-compilation ( #7101 )
2019-09-25 21:51:09 +03:00
Alexey Milovidov
ff07ffbbae
Merge branch 'merging_redis' of https://github.com/CurtizJ/ClickHouse into CurtizJ-merging_redis
2019-09-25 02:27:05 +03:00
Alexander Kuzmenkov
6e32553e01
Add a comment about MemorySanitizer options.
2019-09-24 22:00:47 +03:00
Alexey Milovidov
981e3e6ef7
Fixed build with CMake 3.10.
2019-09-24 03:22:05 +03:00
alexey-milovidov
2f195ddb03
Merge pull request #7028 from abyss7/issue-6459
...
Implement cross-compilation support Linux → Darwin
2019-09-24 02:20:17 +03:00
Alexander Kuzmenkov
8ca6d6ed5d
Prepare for MemorySanitizer build in CI.
...
This is a preparatory commit just to get the msan build running in some
shape. It disables many external libraries that are not yet tested.
2019-09-23 21:11:28 +03:00
Ivan Lezhankin
ce2fb6d3d1
Fix build
2019-09-23 17:46:01 +03:00
Ivan Lezhankin
4b143c3e0f
Merge remote-tracking branch 'upstream/master' into issue-6459
2019-09-23 16:07:19 +03:00
alexey-milovidov
b0dd36db7c
Update sanitize.cmake
2019-09-23 00:22:22 +03:00
alexey-milovidov
c5f9b4ad0a
Update sanitize.cmake
2019-09-23 00:21:41 +03:00
Eldar Zaitov
b174833bdf
Initial fuzzing support with libfuzzer
2019-09-22 13:34:09 +03:00
Ivan Lezhankin
9e46118edd
Merge remote-tracking branch 'upstream/master' into issue-6459
2019-09-20 21:25:55 +03:00
CurtizJ
79a08ef8ea
Merge remote-tracking branch 'upstream/master' into merging_redis
2019-09-18 12:58:22 +03:00
Azat Khuzhin
780341060f
Replace libsparsehash with sparsehash-c11
...
- use sparsehash-c11 over libsparsehash
- fix typos in find_sparsehash and users of the vars (s/SPARCE/SPARSE/)
- drop libsparsehash-dev from docker images (but keep for unbunlded build)
- use ::google over GOOGLE_NAMESPACE
2019-09-18 00:08:20 +03:00
Ivan Lezhankin
8c356a3830
WIP
2019-09-15 18:20:31 +03:00
Ivan Lezhankin
01fdb802d4
Useful changes
2019-09-15 13:35:12 +03:00
Ivan Lezhankin
5b60053ef7
[WIP]
2019-09-13 17:56:27 +03:00
Ivan Lezhankin
e692a88196
CMake now works
...
Example: -DCMAKE_SYSTEM_NAME=Darwin -DSDK_PATH=${HOME}/stuff/MacOSX10.12.sdk -DLINKER_NAME=${HOME}/.local/bin/ld64
2019-09-13 17:56:27 +03:00
Ivan Lezhankin
f01706ad11
Refactor some cmake files
2019-09-13 17:56:26 +03:00
Ivan Lezhankin
ac47427b76
cmake/test_cpu → cmake/cpu_features
2019-09-13 17:54:22 +03:00
Ivan Lezhankin
393bf8a804
cmake/find_* → cmake/find/*
2019-09-13 17:54:22 +03:00
Amos Bird
bf799fef92
Build fix
2019-09-11 10:53:56 +08:00
proller
54a5b801b7
Build fixes (Orc, ...) ( #6835 )
...
* Fix build
* cmake: fix cpuinfo
* Fix includes after processors merge
Conflicts:
dbms/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
dbms/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
dbms/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
dbms/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp
* Fix build in gcc8
* fix test link
* fix test link
* Fix test link
* link fix
* Fix includes after processors merge 2
Conflicts:
dbms/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
* Fix includes after processors merge 3
* link fix
* Fix likely/unlikely conflict with cython
* Fix conflict with protobuf/stubs/atomicops.h
* remove unlikely.h
* Fix macos build (do not use timer_t)
* wip
* Fix build (orc, ...)
* Missing files
* Try fix
* fix hdfs
* Fix llvm 7.1 find
2019-09-10 00:40:40 +03:00
CurtizJ
3b3657ff1e
Merge branch 'add-ext-dict-redis' of https://github.com/comunodi/ClickHouse into merging_redis
2019-09-09 13:51:50 +03:00
Ivan
cd5c0fc9ac
Fix build issues ( #6744 )
...
* libcxxabi uses exception handling library as public
* Don't set -stdlib for internal libc++ - it poisons the checks.
* Enable capnproto in unbundled build back
2019-08-30 20:40:27 +03:00
alexey-milovidov
358ad13930
Merge pull request #6715 from yandex/remove-mimalloc
...
Remove mimalloc
2019-08-30 00:41:33 +03:00
Ivan Lezhankin
85afd61c01
Fix build with internal libcxx
2019-08-29 13:44:22 +03:00
Ivan
b4339f266d
Make a better build scheme ( #6500 )
...
* Fix shared build
* Major default libs refactor
* Fix build with gcc_eh
* Link all libraries as a big group.
* Use global interface library as a group
* Build capnproto using our cmake
* Use only internal libunwind
2019-08-28 23:49:37 +03:00
Alexey Milovidov
39d50b5144
Remove mimalloc
2019-08-28 22:01:52 +03:00
akonyaev
caf0d30a5f
ADQM-34 add orc input format
2019-08-21 17:19:47 +03:00
alex-zaitsev
1e6437e4ee
WIP: Fix MacOS build ( #6429 )
...
* Fix broken MacOS build
* Fix MacOS build
* Update ReadBufferFromFile.cpp
* Update WriteBufferFromFile.cpp
* Update Elf.h
* Update Elf.h
2019-08-21 03:35:41 +03:00
proller
d09c5c871b
Build fixes ( #6491 )
...
* Fix build
* cmake: fix cpuinfo
* Fix includes after processors merge
Conflicts:
dbms/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
dbms/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
dbms/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
dbms/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp
* Fix build in gcc8
* fix test link
* fix test link
* Fix test link
* link fix
* Fix includes after processors merge 2
Conflicts:
dbms/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
* Fix includes after processors merge 3
* link fix
* Fix likely/unlikely conflict with cython
* Fix conflict with protobuf/stubs/atomicops.h
* remove unlikely.h
* Fix macos build (do not use timer_t)
2019-08-18 01:53:46 +03:00
Vitaly Baranov
75aa1d7858
Merge pull request #6320 from yandex/simdjson-sse42
...
Enabled SIMDJSON for SSE 4.2 with PCLMUL instruction set
2019-08-13 23:12:40 +03:00
alexey-milovidov
c8a810ef58
Merge branch 'master' into fix25
2019-08-10 01:21:54 +03:00
Alexey Milovidov
7e6b1333a1
Renamed Yandex CTO just in case
2019-08-10 00:58:17 +03:00
Vitaly Baranov
0154cdf13b
Remove checks for AVX2 from cmake lists which are no longer needed.
2019-08-07 17:08:15 +03:00
proller
274eb83602
fix
2019-08-05 10:52:41 +00:00
proller
4f9d870fca
Fix arm and freebsd build
2019-08-04 12:37:59 +00:00
alexey-milovidov
14671d6df8
Merge pull request #6254 from yandex/fastops
...
Integration with "FastOps" library. Added functions sigmoid and tanh.
2019-08-04 06:28:34 +03:00
proller
77bd2624ea
Build fixes ( #6016 )
...
* Fix building without submodules
* Fix more gcc9 warnings
* was wrong!
../dbms/src/IO/WriteBufferAIO.cpp:277:54: error: result of comparison 'ssize_t' (aka 'long') > 9223372036854775807 is always false [-Werror,-Wtautological-type-limit-compare]
if ((static_cast<ssize_t>(flush_buffer.offset()) > std::numeric_limits<off_t>::max()) ||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* mimalloc off MI_OVERRIDE
* Fix freebsd build
* Fix shared build
* Fix build in gcc9
* Fix split build
* fix
* fix
* fix
* fix
* clean
* zstd
* Update CMakeLists.txt
* Update Defines.h
* Try fix -Wsign-compare
* Freebsd fix
* Add missing libs
* Fix double-conversion include for copy-headers
* Fix zlib link
* Fix includes for arcadia
* Fix includes for arcadia
* Fix includes for arcadia
* Freebsd fix
* Arcadia fixes
* Update QueryProfiler.cpp
* Freebsd fix
* clean
* 19.11: Fixes for arcadia porting (#6223 )
* fix glibc-compatibility
* M_LIBRARY fix
* wip
* Fix
* Fix arm build
* unwind fix
* Update CMakeLists.txt
2019-08-04 03:19:03 +03:00
Alexey Milovidov
36906a78b5
Fixed typo
2019-08-01 03:45:36 +03:00
Alexey Milovidov
b1c9fc0233
Using FastOps library
2019-08-01 03:29:32 +03:00
Mikhail Filimonov
333d60e3e2
disallow switching ENABLE_MONGODB separate from ENABLE_POCO_MONGODB
2019-07-19 17:34:17 +02:00
Ivan
2f68aa7207
Fix build with external libcxx ( #6010 )
...
* First attempt to fix build with external libcxx
* Fix build
2019-07-18 09:55:05 +03:00
Alexey Milovidov
0d37147377
Added fatal error in cmake
2019-07-15 22:21:37 +03:00
Alexey Milovidov
dfe178d653
Disable mimalloc, because we suspect it zeroes out random memory segments
2019-07-15 20:00:18 +03:00
Alexey Milovidov
6b9df067d8
Merge branch 'master' into libcxx-as-submodule
2019-07-03 22:34:58 +03:00
Nikita Lapkov
9641d058d0
Merge remote-tracking branch 'upstream/master' into update_libunwind
2019-07-01 21:11:26 +00:00
alexey-milovidov
feafcb21bd
Merge branch 'master' into h3-integration
2019-06-30 16:19:11 +03:00
Nikita Lapkov
2a131185b0
Merge remote-tracking branch 'upstream/master' into update_libunwind
2019-06-28 18:20:23 +00:00
proller
c8469ab4ba
Build fixes. no submodules ( #5792 )
2019-06-28 21:06:09 +03:00
Danila Kutenin
5cc91161e9
Comments
2019-06-28 00:44:21 +03:00
Danila Kutenin
407cf9a229
Comments
2019-06-28 00:43:50 +03:00
alexey-milovidov
ebaced1065
Update find_mimalloc.cmake
2019-06-27 21:16:15 +03:00
Danila Kutenin
e67431e455
Use mimalloc instead of lfallocator
2019-06-27 18:13:19 +03:00
Nikita Lapkov
92309eed3e
Merge remote-tracking branch 'upstream/master' into update_libunwind
2019-06-27 14:07:44 +00:00
Ivan Remen
30c7055d3b
Fix
2019-06-26 17:15:29 +03:00
Ivan Remen
b324a9333d
Set include path
2019-06-26 14:52:36 +03:00
Ivan Remen
f3c8ac2d3b
Merge remote-tracking branch 'main/master' into h3-integration
2019-06-25 11:23:53 +03:00
proller
6ec6ab0acc
[Temporary] Dont use llvm 8+ ( #5730 )
2019-06-25 00:28:10 +03:00
Ivan Remen
b439769aa7
Merge remote-tracking branch 'main/master' into h3-integration-fix
2019-06-20 13:53:17 +03:00
proller
3d8c8ee83c
Build fixes. Split config.h ( #5686 )
2019-06-20 12:12:49 +03:00
proller
fc7ae399c4
Use system rapidjson; Fix types for macos;
2019-06-14 13:28:30 +03:00
comunodi
5ea9bb228c
Merge branch 'master' into add-ext-dict-redis
2019-05-26 15:49:35 +03:00
proller
d6a90b6079
Build fixes ( #5368 )
2019-05-22 13:16:16 +03:00
Danila Kutenin
cfdba938ce
Disable LfAlloc for a while to think of a better fix for mmap count
2019-05-21 19:54:09 +03:00
Vitaly Baranov
8ab4e4dcfe
Use rapidjson when AVX2 instructions are not available.
2019-05-16 20:40:24 +03:00
proller
51ca4cbaa4
Build fixes ( #5278 )
2019-05-15 20:19:39 +03:00
Nikita Lapkov
9cd108b6d6
Merge remote-tracking branch 'upstream/master' into update_libunwind
2019-05-12 13:40:17 +00:00
alexey-milovidov
4853b06f95
Merge pull request #5223 from proller/fix26
...
Build fixes
2019-05-09 11:38:20 +03:00
proller
5a6ccab060
Fix
2019-05-08 17:49:53 +03:00
Vitaly Baranov
7ace113ac0
Use custom cmake file for simdjson and fix build
2019-05-08 16:20:25 +03:00
proller
bd76d27305
Apple build fix
2019-05-08 10:40:27 +03:00
proller
c6d0e095e0
Prepare cmake for new contrib/poco ( #5062 )
2019-04-25 00:33:04 +03:00
proller
29c3433322
Freebsd build fixes ( #5083 )
2019-04-23 15:51:27 +03:00
Nikita Lapkov
954dbdc41e
do not use libunwind with shared libraries
2019-04-21 16:28:54 +00:00
Nikita Lapkov
58af14d151
ignore our libunwind in unbundled build
2019-04-21 11:31:16 +00:00
Nikita Lapkov
26c4df9d9c
Merge remote-tracking branch 'upstream/master' into update_libunwind
2019-04-21 09:24:48 +00:00
proller
6ccb720659
Fix freebsd build ( #5009 )
2019-04-16 17:12:02 +03:00
Danila Kutenin
18a6b3123f
Randomization in lfalloc
2019-04-13 17:45:01 +03:00
Danila Kutenin
622b2c8472
Enable LFAlloc for MarkCache and UncompressedCache
2019-04-13 15:07:43 +03:00
Danila Kutenin
37c994b0dd
Better cmake
2019-04-12 17:30:54 +03:00
Danila Kutenin
7f230cc134
LFAlloc added to clickhouse
2019-04-12 17:10:42 +03:00
Alexey Milovidov
a9b47a62ba
Merge branch 'update_libunwind' of https://github.com/laplab/ClickHouse into laplab-update_libunwind
2019-04-11 22:36:36 +03:00
proller
c78176603c
clickhouse-test - prepare for use other than 'test' database ( #4961 )
2019-04-11 20:20:36 +03:00
FawnD2
dfed1579ac
Merge branch 'master' into add-ext-dict-redis
...
# Conflicts:
# ci/jobs/quick-build/run.sh
2019-03-30 16:42:42 +03:00
Ivan Remen
2fb5addc40
H3 library integration
2019-03-26 11:59:48 +03:00
proller
1584fd4367
Fix hyperscan library find and use ( #4798 )
2019-03-26 00:31:00 +03:00
Danila Kutenin
f8001b41ba
Hyperscan multi regular expressions search
2019-03-23 22:40:16 +03:00
proller
d6d83d4a5c
Allow build without ssl ( #4525 ) ( #4750 )
2019-03-22 14:18:24 +03:00
FawnD2
1e014060c9
Merge branch 'master' into add-ext-dict-redis
...
# Conflicts:
# dbms/tests/external_dictionaries/generate_and_test.py
# dbms/tests/external_dictionaries/run.sh
2019-03-16 17:14:27 +03:00
proller
8c70de3bc7
Build fixes (freebsd) ( #4696 )
2019-03-14 23:52:10 +03:00
Alexey Milovidov
312148a40d
Merge branch 'master' into libcxx-as-submodule
2019-03-14 06:30:00 +03:00
Silviu Caragea
b3c674f893
Merge branch 'master' into disable_features
2019-03-13 09:51:20 +02:00
Silviu Caragea
e92c94ed78
Add support for disabling brotli, parquet and protobuf
2019-03-13 09:37:16 +02:00
Alexey Milovidov
37b5e49508
Merge branch 'master' into libcxx-as-submodule
2019-03-12 20:05:56 +03:00
proller
fb5d339335
Fix build (freebsd + clang + asan) ( #4656 )
2019-03-12 12:55:43 +03:00
Alexey Milovidov
93a6571b09
Addition to prev. revision
2019-03-11 04:13:43 +03:00
Alexey Milovidov
880cbbb632
Merge branch 'master' into libcxx-as-submodule
2019-03-11 04:03:13 +03:00
alexey-milovidov
030a4eb3c6
Merge branch 'master' into fix-glibc-compatibility-2
2019-03-10 19:31:18 +03:00
Vitaly Baranov
36add97932
Fix print_include_directories.cmake
2019-03-04 22:47:34 +03:00
Alex Zatelepin
a4e56478ca
Update use_libcxx.cmake
2019-02-28 19:18:36 +03:00
proller
211ec436c5
Build fixes ( #4516 )
2019-02-27 15:52:24 +03:00
Георгий Кондратьев
b94de32423
Support xxHash with external lz4
...
xxhash.h does not exist in external lz4 because it is an implementation detail
and its symbols are namespaced with XXH_NAMESPACE macro. When lz4 is external,
xxHash has to be external too, and the dependents have to link to it.
This find_xxhash.cmake is based on find_lz4.cmake.
2019-02-25 07:14:37 +00:00
proller
00e50f1502
Build fixes ( #4471 )
2019-02-21 23:11:21 +03:00
proller
e20c77e4c6
Add parquet support. Fixes, tests, ...
2019-02-19 23:51:44 +03:00
proller
88076bb8c9
Merge commit 'bf09c2047a47b74f089d701b9b1e4fcbe8955a7f' into fix23
2019-02-19 23:46:37 +03:00