Commit Graph

1605 Commits

Author SHA1 Message Date
sundy-li
03ad32a3fa disable WITH_GFLAGS 2020-11-11 09:08:52 +08:00
root
e9de5b6ad4 Add StorageEmbeddedRocksdb Engine 2020-11-11 09:08:52 +08:00
Alexey Milovidov
0cca51f4aa Check for wrong DWARF expressions for CFA 2020-11-11 02:44:09 +03:00
a.palagashvili
f999ea2a6f renamed files, added new library, changed error codes, added tests for file() function 2020-11-10 01:52:22 +03:00
Danila Kutenin
d0840bfc5d Move miniselect to submodule and replace quantile exact with better algorithm 2020-11-10 00:53:43 +03:00
Danila Kutenin
3c6794bf37 Add Floyd-Rivest selection algorithm instead of std::partial_sort 2020-11-09 20:22:05 +03:00
FawnD2
43799204f9 Remove misleading comment 2020-11-08 05:16:41 +03:00
FawnD2
6a89d965fd Merge branch 'master' into switch-upstream-for-arrow-submodule 2020-11-07 22:34:55 +03:00
FawnD2
65e4fa555b Remove build branch with internal parquet native cmake 2020-11-07 19:49:36 +03:00
FawnD2
bd1daf93fa Set correct sha for submodule 2020-11-07 17:32:45 +03:00
FawnD2
6cf4d58ce1 Fix parquet reader in submodule 2020-11-07 17:27:25 +03:00
a.palagashvili
268f289bd1 resolved conflict 2020-11-07 16:36:38 +03:00
FawnD2
9be0340d98 Regenerate parquet config 2020-11-07 16:25:48 +03:00
FawnD2
8fd417f9a3 Fix build 2020-11-07 16:25:38 +03:00
FawnD2
066a3032e1 Move arrow config from SOURCE_DIR to BINARY_DIR 2020-11-07 16:25:30 +03:00
FawnD2
4598046176 Update cmake 2020-11-07 16:24:50 +03:00
alexey-milovidov
010f0cb33d
Merge pull request #16764 from ClickHouse/3rdparty-no-ubsan
Do not instrument 3rd-party libraries with UBSan
2020-11-07 13:39:50 +03:00
Alexey Milovidov
8ec6653fb1 Fix UBSan report in Poco 2020-11-06 20:56:21 +03:00
Alexey Milovidov
584f1a83be Do not instrument 3rd-party libraries with UBSan 2020-11-06 20:52:28 +03:00
FawnD2
069e3dec0d Do not use deprecated API 2020-11-05 20:10:11 +03:00
FawnD2
4f82e95a46 Update submodule to the latest release 2020-11-05 19:49:11 +03:00
Anton Ivashkin
6f96cd04cc Update aws submodule, use version with patch for non-empty http path in urls 2020-11-05 15:53:40 +03:00
FawnD2
b0277e99a5 Update sources list 2020-11-04 19:51:43 +03:00
FawnD2
19f81e0f82 Update submodule sha 2020-11-04 15:51:10 +03:00
a.palagashvili
ba6fa5d828 fixed whitespaces, added hidden submodule file 2020-11-02 23:04:49 +03:00
a.palagashvili
805bfd286c resolved git modules 2020-11-02 15:16:49 +03:00
a.palagashvili
be2b002ff4 fixed cmake for building, added test for compression method, added basic code for encoding 2020-11-01 21:40:05 +03:00
a.palagashvili
c1abf5d13c *added adapters' boilerplate for Lzma buffers, *added submodule to gitmodules, *added cmake for xz 2020-11-01 02:56:41 +03:00
Alexander Kuzmenkov
ba34145817
Merge pull request #16425 from filimonov/minumum
Fix typos reported by codespell
2020-10-28 08:07:18 +03:00
Alexey Milovidov
eee81eef43 Remove dependency on "services" database 2020-10-28 01:58:53 +03:00
Mikhail Filimonov
41971e073a
Fix typos reported by codespell 2020-10-27 12:04:03 +01:00
sundy-li
f407504a7a try use cmake version for croaring instead of amalgamation.sh 2020-10-23 19:42:21 +08:00
Azat Khuzhin
f211d33841 Avoid creating separate replxx instance
This replxx object is pretty heavy and in debug build may slow down [1]
(although I cannot confirm 0.5s delay for each query in debug build) the
client and besides it is not required since ClickHouse-Extras/replxx#10,
which changes the behaviour of history_save(), and now it will not
update current session anymore, only save the history to the disk.

  [1]: https://github.com/ClickHouse/ClickHouse/pull/13086#issuecomment-667719026
2020-10-12 23:56:29 +03:00
alexey-milovidov
557002262f
Merge pull request #15828 from azat/unbundled-INTERFACE_COMPILE_DEFINITIONS
Fix INTERFACE_COMPILE_DEFINITIONS for IMPORTED targets
2020-10-11 19:28:18 +03:00
alexey-milovidov
2be4995a4e
Merge pull request #15815 from amosbird/h1
Fix undefined behavior in libhdfs3
2020-10-11 13:13:04 +03:00
Azat Khuzhin
c160b251ba Drop support for unbundled jemalloc
unbundled jemalloc cannot be used, since it includes jemalloc_cpp.o that
contains new/delete overrides, so as clickhouse [1]:

    ld.lld: error: duplicate symbol: operator delete(void*, unsigned long)
    >>> defined at new_delete.cpp:147 (../src/Common/new_delete.cpp:147)
    >>>            new_delete.cpp.o:(operator delete(void*, unsigned long)) in archive src/libclickhouse_new_delete.a
    >>> defined at jemalloc_cpp.o:(.text+0x160) in archive /usr/lib/x86_64-linux-gnu/libjemalloc.a

  [1]: https://clickhouse-builds.s3.yandex.net/15828/35335f07dbf8cab89b4188a674b033c28409dc7b/clickhouse_build_check/build_log_793952627_1602401325.txt
2020-10-11 11:18:56 +03:00
Azat Khuzhin
35335f07db Fix INTERFACE_COMPILE_DEFINITIONS for IMPORTED targets
INTERFACE_COMPILE_DEFINITIONS does not work IMPORTED targets:

From 3.6:

    Specify compile definitions to use when compiling a given <target>.
    The named <target> must have been created by a command such as
    add_executable() or add_library() and must not be an Imported Target.

Since 3.11:

    Specify compile definitions to use when compiling a given <target>.
    The named <target> must have been created by a command such as
    add_executable() or add_library() and must not be an ALIAS target.

And this causes the -Wundef warning:
    src/Functions/FunctionsHashing.h:1326:5: warning: 'USE_XXHASH' is not defined, evaluates to 0 [-Wundef]
2020-10-11 09:06:01 +03:00
alexey-milovidov
c2069ad3ee
Merge pull request #15035 from azat/jemalloc-percpu-arena-fix
Update jemalloc to fix percpu_arena with affinity mask
2020-10-10 23:19:56 +03:00
Amos Bird
d13cb2a48b
Fix undefined behavior in libhdfs3 2020-10-11 01:36:00 +08:00
alesapin
efaa7ad1d2 Update openssl 2020-10-09 12:31:01 +03:00
alesapin
4fbe925490
Merge pull request #15686 from ClickHouse/fix_race_mariadb
Fix race in mariadb
2020-10-08 09:42:41 +03:00
alesapin
d093d4c535
Merge pull request #15675 from ClickHouse/fix_races_in_hdfs
Fix races in libhdfs
2020-10-07 20:39:40 +03:00
alesapin
e00583cf2b Build with gcc-9 2020-10-07 11:27:29 +03:00
alesapin
8dbae0966b Apply strange fix for g++ 2020-10-07 10:51:57 +03:00
alesapin
d08909cc24 Update mariadb 2020-10-06 19:28:32 +03:00
alesapin
00f29e400f Fix race condition in hdfs 2020-10-06 16:29:08 +03:00
alesapin
585ca87001 Fix cmake 2020-10-06 14:26:27 +03:00
alesapin
c008555bc5 Trying to fix race in AMQP-CPP 2020-10-06 14:00:52 +03:00
Vitaly Baranov
dd634aa731
Merge pull request #15491 from vitlibar/update-grpc
Update gRPC to the latest version
2020-10-02 15:54:35 +03:00
alesapin
c5df9433f0
Merge pull request #15239 from ClickHouse/100_percent_lld_11_for_clang_11
Build ClickHouse for release with clang-11
2020-10-02 14:59:29 +03:00
Vitaly Baranov
65a1684ed7 Fix gRPC build scripts. 2020-10-02 01:45:01 +03:00
Amos Bird
7c9bbe4c29 Neutrialize thinlto's memcpy libcall gen.
(cherry picked from commit 8ffa4d395c)
2020-10-01 22:22:32 +03:00
alesapin
38e50d1078 Revert "enable FastMemcpy properly"
This reverts commit 6e23901227.
2020-10-01 10:38:06 +03:00
Vitaly Baranov
8a3b024a6d Fix using external protobuf library for the build. 2020-10-01 06:28:54 +03:00
Azat Khuzhin
7f776a4344 Update jemalloc to inculde fix for percpu_arena
This fix is the same as from [1], but backported to 5.2.1.

    [1]: https://github.com/jemalloc/jemalloc/pull/1939
2020-10-01 01:58:57 +03:00
Vitaly Baranov
c7e8021a70 Update gRPC to the latest revision. 2020-10-01 01:34:33 +03:00
Amos Bird
6e23901227 enable FastMemcpy properly 2020-09-30 18:52:49 +03:00
tavplubix
a4b4895b26
Merge pull request #15435 from ClickHouse/ADQM-160-fix
Try merge #14265 again
2020-09-30 11:21:55 +03:00
Alexey Milovidov
218a947e05 Suppress clang-tidy diagnostics 2020-09-30 01:20:53 +03:00
Alexander Tokmakov
a7d3a024c7 Revert "Revert "Test and doc for PR12771 krb5 + cyrus-sasl + kerberized kafka""
This reverts commit c298c633a7.
2020-09-29 11:56:37 +03:00
Vitaly Baranov
c8dac53836
Merge pull request #15207 from vitlibar/update-protobuf
Update protobuf to latest revision
2020-09-24 16:19:08 +03:00
tavplubix
c298c633a7
Revert "Test and doc for PR12771 krb5 + cyrus-sasl + kerberized kafka" 2020-09-24 16:10:24 +03:00
Vitaly Baranov
ba3257de22 Disable warnings in protobuf's headers. 2020-09-23 23:20:59 +03:00
Vitaly Baranov
b2d66770ee Update protobuf to the latest version. 2020-09-23 23:20:23 +03:00
Ilya Yatsishin
7dad84ea6b
Merge pull request #14265 from arenadata/ADQM-160
Test and doc for PR12771 krb5 + cyrus-sasl + kerberized kafka
2020-09-23 19:02:58 +03:00
Azat Khuzhin
0275202167 Update jemalloc to include patch for percpu arena
Refs: https://github.com/jemalloc/jemalloc/pull/1676
2020-09-17 21:31:39 +03:00
Ilya Golshtein
66a055ddde switched to cyrus-sasl-2.1 release branch 2020-09-17 16:51:34 +03:00
alesapin
c34eaf5de3 Update ci_config and llvm 2020-09-09 10:08:38 +03:00
Alexey Milovidov
4b3220f79a Prepare for clang 11 2020-09-04 03:39:56 +03:00
alexey-milovidov
d7983f0c2a
Merge pull request #14256 from dmthuc/fix_build_for_AppleClang
Fix build for AppleClang
2020-09-03 01:38:25 +03:00
Dao Minh Thuc
d646ca1d0c Disable -fchar8_t for capnproto only 2020-09-01 23:07:26 +07:00
Dao Minh Thuc
e22ee38a35 Fix build for AppleClang 2020-08-30 22:48:43 +07:00
Alexey Milovidov
00419722c2 Minor modification 2020-08-29 22:22:59 +03:00
alesapin
14229a27e9
Update CMakeLists.txt 2020-08-28 16:40:22 +03:00
filimonov
6d2c9fa70c
Fix a build for old some OS with old find
Actually there are no symlinks there, so `-type f` is enough
2020-08-28 12:00:51 +02:00
alexey-milovidov
d3a9389465
Merge branch 'master' into bharatnc-ncb/timezones-table 2020-08-26 04:26:37 +03:00
alexey-milovidov
f904664742
Merge pull request #14063 from azat/bump-zlib-ng-gcc10
Bump zlib-ng (to fix gcc10 build)
2020-08-26 03:40:53 +03:00
Alexey Milovidov
7799cc37ca Fix build 2020-08-26 02:19:50 +03:00
Alexey Milovidov
63feb75306 Some tweaks 2020-08-25 23:49:22 +03:00
Azat Khuzhin
9971cf2eff Bump zlib-ng (to fix gcc10 build)
[1] is required for gcc10 build, due to incorrect `static_ltree` declaration:

    ld.lld: error: duplicate symbol: static_ltree
    >>> defined at trees.h:6 (../contrib/zlib-ng/trees.h:6)
    >>>            trees.c.o:(static_ltree) in archive contrib/zlib-ng/libzlib.a
    >>> defined at deflate_quick.c:168 (../contrib/zlib-ng/arch/x86/deflate_quick.c:168)
    >>>            deflate_quick.c.o:(.rodata+0x0) in archive contrib/zlib-ng/libzlib.a
    collect2: error: ld returned 1 exit status
    ninja: build stopped: subcommand failed.

  [1]: https://github.com/ClickHouse-Extras/zlib-ng/pull/2
2020-08-25 22:31:19 +03:00
Konstantin Podshumok
e296997b6c
cmake: fix potential curl linking problems
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:44 +03:00
Konstantin Podshumok
68a921cdea
cmake: use bundled rdkafaka for in unbundled tests for now
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:43 +03:00
Konstantin Podshumok
5097793872
cmake: Fix odbc in unbudled
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:43 +03:00
Konstantin Podshumok
8479da3033
cmake: unbundled protobuf: don't expect old c++ API by default
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:43 +03:00
Konstantin Podshumok
5d13c1f03f
cmake: unbundled: libxml2 requires liblzma when building static
Squashed:
- fixup hdfs3-libxml2

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

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

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

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

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

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

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

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

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

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

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

      For compatibility with older versions of CMake, option is clearing the
      normal variable 'BUILD_SHARED_LIBS'.
    This warning is for project developers.  Use -Wno-dev to suppress it.
2020-07-09 10:16:39 +03:00
alexey-milovidov
36205e3ddf
Merge pull request #12181 from azat/bump-arrow-to-0.17
Bump arrow to 0.17 (and flatbuffers to v1.12, required by arrow)
2020-07-09 04:24:47 +03:00
Azat Khuzhin
fd5e08884a Bump arrow to 0.17 (and flatbuffers to v1.12, required by arrow)
MOTIVATION:
- remove double-conversion external dependency
- remove flatc (but flatbuffers is still required, arrow just shipped
  with generated files and that's it)

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

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

# Conflicts:
#	src/Access/ya.make
#	src/Common/ErrorCodes.cpp
2020-07-08 00:42:09 +04:00
Azat Khuzhin
32227b9c38 AMQP requires libuv
Otherwise fails:

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

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

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

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

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

      INTERFACE_LINK_LIBRARIES:

        global-group;Threads::Threads

      LINK_INTERFACE_LIBRARIES_DEBUG:

        Threads::Threads

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

    -- Generating done
    -- Build files have been written to: /src/ch/clickhouse/.cmake-tmp
2020-07-06 23:34:40 +03:00
Azat Khuzhin
b173385431 Bump googletest to master (to fix gcc10 builds)
gcc10 reports:

    FAILED: src/CMakeFiles/unit_tests_dbms.dir/Columns/tests/gtest_column_unique.cpp.o
    <snip>
    ../contrib/googletest/googletest/include/gtest/gtest-printers.h:287:7: error: use of deleted function ‘std::basic_ostream<char, _Traits>& std::operator<<(std::basic_ostream<char, _Traits>&, char8_t) [with _Traits = std::char_traits<char>]’
      287 |   *os << value;
          |   ~~~~^~~~~~~~
    In file included from ../base/common/../common/StringRef.h:6,
                     from ../src/Columns/IColumn.h:7,
                     from ../src/Columns/IColumnUnique.h:2,
                     from ../src/Columns/ColumnUnique.h:2,
                     from ../src/Columns/tests/gtest_column_unique.cpp:1:
    /usr/include/c++/10.1.0/ostream:544:5: note: declared here
      544 |     operator<<(basic_ostream<char, _Traits>&, char8_t) = delete;
          |
2020-07-06 23:34:40 +03:00
Azat Khuzhin
a0f257b237 Set GOOGLETEST_VERSION for googletest
Otherwise cmake reports:

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

(since GOOGLETEST_VERSION is set in contrib/googletest/CMakeLists.txt)
2020-07-06 23:34:40 +03:00
Nikita Mikhaylov
53522c728b
Merge pull request #11662 from Avogar/orc_output_format
Add ORCBlockOutputFormat
2020-07-06 18:51:35 +04:00
Nikita Mikhaylov
dac7a39256 fix ubsan final 2020-07-06 12:29:22 +03:00
alexey-milovidov
1719ab1ec5
Merge pull request #12041 from azat/curl-proper-cmake
Rewrite curl dependency in a more ch compatible way
2020-07-06 06:31:51 +03:00
Alexey Milovidov
351eda5d8a Replace exit to abort in libdivide 2020-07-05 03:02:50 +03:00
Alexey Milovidov
c5cf7199d8 Update libdivide to the latest master 2020-07-05 02:58:10 +03:00
alexey-milovidov
6ae9bfe3b3
Merge pull request #12131 from matwey/fix/cmake_unixodbc
Minor cmake fixes for UNBUNDLED build
2020-07-04 22:29:28 +03:00
Azat Khuzhin
9258368de2 Fail if curl library was enabled and was not found in case of unbundled build 2020-07-04 16:48:25 +03:00
Matwey V. Kornilov
20c8e22942 poco-cmake: Fix Poco::Data::ODBC target when UNBUNDLED
By default IMPORTED target has a scope in the directory in which it is created
and below. This leads to the following issues when building UNBUNDLED:

Target "clickhouse" links to target "Poco::Data::ODBC" but the target was not
found.  Perhaps a find_package() call is missing for an IMPORTED target, or an
ALIAS target is missing?
2020-07-04 13:58:53 +03:00
Matwey V. Kornilov
338e772393 contrib/unixodbc-cmake: Fix build when UNBUNDLED
target_compile_definitions may only set INTERFACE properties on IMPORTED targets
2020-07-04 10:21:56 +03:00
Azat Khuzhin
0700a705bc Rewrite curl dependency in a more ch compatible way
- add support of unbundled curl
- add CURL::libcurl libraries
- avoid explicit linkage of daemon with curl (added with sentry)
- set CACHE variables for non-direct users:
  - mariadb-connector-c
  - aws-s3-cmake
  - sentry-native

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

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

v2: replace cmake/find/curl.cmake with proper contrib/curl-cmake (as
pointed by @abyss7, cmake/find/*.cmake is deprecated)
2020-07-03 00:57:08 +03:00
alesapin
64583ceb22 Merge branch 'master' into add-storage-rabbitmq-read-only 2020-07-02 16:08:29 +03:00
Alexander Kuzmenkov
baec4093dd
Merge pull request #11993 from ClickHouse/aku/more-jemalloc-tweaks
jemalloc: set muzzy_decay_ms = 10s
2020-06-30 22:51:21 +03:00
Alexander Kazakov
8b2a5d81df
Update contrib/poco to ClickHouse-Extras/poco #22 (#12037)
* Updated ClickHouse-Extras/poco #22
2020-06-30 14:27:40 +03:00
kssenii
3d2cc9d4b2 Remove libevent library 2020-06-29 12:11:17 +00:00
Alexander Kuzmenkov
8c0177b216
Update contrib/jemalloc-cmake/CMakeLists.txt 2020-06-29 15:01:29 +03:00
alexey-milovidov
77c4861430
Merge pull request #11975 from oandrew/fix-word-breaks
Extend word break config to all non-alphanumeric chars
2020-06-27 19:13:44 +03:00
Alexander Kuzmenkov
8b82ff215f muzzy decay 10 ms 2020-06-27 04:08:21 +03:00
Andrew Onyshchuk
c985dddd45 Update replxx submodule 2020-06-26 13:14:31 -05:00
alexey-milovidov
751d36f7c7
Merge pull request #11954 from oandrew/avro-uuid
Avro UUID support
2020-06-26 14:09:54 +03:00
Andrew Onyshchuk
fc1ae85600 Avro UUID support 2020-06-25 14:25:45 -05:00
alexey-milovidov
a34032cace
Merge pull request #11300 from blinkov/sentry
Opt-in support for sending crash reports
2020-06-25 17:20:50 +03:00
Azat Khuzhin
236cac3d52 Fix jemalloc under OSX (by registering it as default zone explicitly)
In case of OSX jemalloc register itself as a default zone allocator.

But when you link statically then zone_register() will not be called,
and even will be optimized out:

  $ nm clickhouse.patched  | grep -c zone_register
  0

Fix this, by manually calling it.

v2: extern C
2020-06-24 21:05:35 +03:00
alesapin
3fc65b3269 Merge branch 'master' into kssenii-rabbit-mq 2020-06-24 20:14:28 +03:00
Ivan Blinkov
45d1ca2567 merge master 2020-06-24 00:18:16 +03:00
Azat Khuzhin
f76511668f jemalloc: disable it for darwin
Right now it aborts (Abort trap: 6) on osx, the issue does not looks
like [1], but should be investigated, so disable for now.

What is interesting that it works under debugger, so I guess it is
indeed the order of symbol replacements...

  [1]: https://github.com/jemalloc/jemalloc/issues/420
2020-06-23 11:40:34 +03:00
Azat Khuzhin
c230d76cb9 jemalloc: disable percpu_arena on non-linux (not supported anyway)
And since it does not supported it produces the following warning:
  <jemalloc>: No getcpu support: percpu_arena:percpu
  <jemalloc>: perCPU arena getcpu() not available. Setting narenas to 8.

However it is uses narenas=ncpu instead of default narenas=ncpu*4
2020-06-23 11:14:22 +03:00
Azat Khuzhin
5b5ba93523 jemalloc: explicitly disable pthread_setname_np on freebsd (requires 12.1) 2020-06-23 05:45:56 +03:00
Azat Khuzhin
8b6e2e6c67 jemalloc: drop superfluous include directory 2020-06-23 01:47:56 +03:00
Azat Khuzhin
77a3f606f4 jemalloc: enable by default for freebsd/darwin 2020-06-23 01:47:56 +03:00
Azat Khuzhin
1354a103ab jemalloc: add darwin pregenerated header 2020-06-23 01:47:56 +03:00
Azat Khuzhin
637f2cefeb jemalloc: add freebsd pregenerated header 2020-06-23 01:47:56 +03:00
Azat Khuzhin
f0bb511468 jemalloc: fix JEMALLOC_NOTHROW/JEMALLOC_CXX_THROW for freebsd/darwin 2020-06-23 01:47:56 +03:00
Azat Khuzhin
1becc6ca02 jemalloc: jemalloc_preamble.h is common 2020-06-23 01:47:56 +03:00
Azat Khuzhin
6704c42a9e jemalloc: fix HAVE_CPU_SPINWAIT for linux aarch64
Fixes: #11163
2020-06-22 23:24:43 +03:00
Ivan Blinkov
2c0ff29c48 Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-22 10:06:36 +03:00
Denis Glazachev
6c1b2a4831 Merge branch 'master' into ldap-per-user-authentication
* master: (114 commits)
  Update alter.md (#11823)
  Update PODArray.h
  Added a test for #6549
  Update create.md
  Update create.md
  replacingmergetree translate into "替换合并树“ better (#11814)
  Whitespace
  Fix style
  Added a test
  Fix another 10% of bad code #11529
  Update join.md (#11798)
  Update memory.md (#11800)
  Whitespace
  Check for tests with "fail" in their names
  Fix 10% of bad code #11756
  Update PODArray.h
  avoid duplicate short system name
  adapt recent result as well
  [website] tune benchmark pages styling + add extra checks
  Added MSan suppression for Hyperscan
  ...

# Conflicts:
#	src/Common/ErrorCodes.cpp
2020-06-20 22:01:12 +04:00
Alexey Milovidov
abb59a2621 Give up on UBSan for Hyperscan 2020-06-19 21:45:09 +03:00
Alexey Milovidov
e85227ce2e Remove one compile option 2020-06-19 16:44:30 +03:00
Alexey Milovidov
cebec2115b Added missing compile options from original Hyperscan 2020-06-19 14:57:31 +03:00
Denis Glazachev
5db60202b6 Merge branch 'master' into ldap-per-user-authentication 2020-06-19 00:11:08 +04:00
Alexey Milovidov
39562b4711 Update submodule 2020-06-17 10:12:24 +03:00
Alexey Milovidov
e070c0fa8f Update submodule 2020-06-17 10:10:36 +03:00
Ivan Blinkov
e98a91e9f7 Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-12 16:53:00 +03:00
alesapin
29311f71bf
Merge pull request #11585 from azat/unbundled-boost
Add unbundled boost support
2020-06-11 23:43:28 +03:00
Ivan Blinkov
b70ed921ea Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-11 12:22:13 +03:00
Ivan Blinkov
3e5d735871 back to upstream 2020-06-11 12:21:23 +03:00
kssenii
18820814f5 Merge 2020-06-10 23:25:33 +00:00
Denis Glazachev
9e3a28a6b8 Merge branch 'master' into ldap-per-user-authentication
* master: (414 commits)
  Update file.md
  Update merge.md
  Update dictionary.md
  Update external-data.md
  Update distributed.md
  Update null.md
  Update set.md
  Update join.md
  Update url.md
  Update view.md
  Update materializedview.md
  Update memory.md
  Update buffer.md
  Update generate.md
  removed a sentence about global lock during rename (#11577)
  greatCircleAngle en translation (#11584)
  Update configuration-files.md
  try fix flacky test
  Update why.html
  Update rich.html
  ...

# Conflicts:
#	src/Common/ErrorCodes.cpp
#	utils/ci/jobs/quick-build/run.sh
2020-06-11 03:06:17 +04:00
Azat Khuzhin
8ec3ab9c9f Require less recent boost - 1.67 2020-06-10 23:57:54 +03:00
Azat Khuzhin
8418612e09 Add unbundled boost support
Follow-up-for: #11390
Cc: @@abyss7
2020-06-10 20:56:47 +03:00
Ivan
2de9ddce53
Update CMakeLists.txt (#11560)
Update CMakeLists.txt (#11560)
2020-06-10 20:30:34 +03:00
Nikita Mikhaylov
9df693ced5
Merge pull request #11561 from Jokser/s3-http-client-memory-optimization
Avoid copying whole response stream into memory in S3 HTTP client.
2020-06-10 16:53:33 +04:00
Ivan Blinkov
90ee4d52f4 merge master 2020-06-10 13:18:41 +03:00
Ivan Blinkov
f872c639ed Try to disable linker options from sentry 2020-06-09 20:44:56 +03:00
Alexander Tokmakov
6bb68329f8 Merge branch 'master' into merging_external_source_cassandra 2020-06-09 19:51:14 +03:00
Ivan Blinkov
6f7064928f Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-09 19:07:57 +03:00
Ivan Blinkov
d91f0bd580 Switch back to sentry upstream 2020-06-09 19:07:40 +03:00
Pavel Kovalenko
f623ef635b Avoid copying whole response stream into memory in S3 HTTP client. 2020-06-09 18:26:51 +03:00
Ivan
47ad338cb2
Refactor CMake build files (#11390)
* Get rid of lib_name.cmake
* Refactor Boost and HyperScan libraries
* Refactor lz4
* Fix build with xxHash
2020-06-09 13:54:49 +03:00
Ivan Blinkov
5b3fef526e Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-09 11:51:29 +03:00
alexey-milovidov
44b20eee96
Revert "S3 HTTP client - Avoid copying response stream into memory" 2020-06-09 10:23:35 +03:00
Pavel Kovalenko
8b8beb26d3 S3 Poco HTTP Client (do not copy response stream body into memory). 2020-06-09 05:03:22 +03:00
Alexey Milovidov
d03b1b165b Fix build on gcc 2020-06-07 23:12:24 +03:00
Alexey Milovidov
d5f38274b3 Fix build on gcc 2020-06-07 19:33:31 +03:00
Alexey Milovidov
9eacaf648b Make syntax highlight to work ok on white background 2020-06-07 00:20:17 +03:00
Ivan Blinkov
653a9afda0 Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-05 22:51:28 +03:00
Ivan Blinkov
6f0e754f1e try to fix the glibc compatibility 2020-06-04 11:57:01 +03:00
Alexander Tokmakov
e67837bc4a cleenup 2020-06-04 00:11:17 +03:00
Pervakov Grigorii
bc9381406f Add default credentials and custom headers for s3 table functions. 2020-06-02 20:48:49 +03:00
Ivan Blinkov
862693d78d change sentry-native commit 2020-06-02 16:59:45 +03:00
Ivan Blinkov
5036ad7c6a back to upstream 2020-06-02 13:13:29 +03:00
Denis Glazachev
c61cbe8e98 Merge branch 'master' into ldap-per-user-authentication
* master: (114 commits)
  Update PushingToViewsBlockOutputStream.cpp
  Update PushingToViewsBlockOutputStream.cpp
  make clang-10 happy
  Fix sync_async test (remove timeout)
  CLICKHOUSEDOCS-631: temporary_files_codec, join_on_disk_max_files_to_merge settings. (#11242)
  Suppress output of cancelled queries in clickhouse-client #9473
  Better log messages in ConfigReloader
  fix select from StorageJoin
  Fix unit tests under MSan
  Added test.
  Fix build.
  Fix arguments for AggregateFunctionQuantile/
  Update style.md
  Add a guide on error messages.
  Report dictionary name on dictionary load errors.
  more types in ASOF JOIN (#11301)
  Fix part_log test
  Update test.
  Add perftest.
  Parallel processing for PushingToViewsBlockOutputStream::writeSuffix
  ...
2020-06-02 12:42:29 +04:00
Ivan Blinkov
9c1ac2f1c1 experiment 2020-06-02 09:46:36 +03:00
Ivan Blinkov
965204dfb1 Try to fix the msan build 2020-06-01 21:48:34 +03:00
kssenii
d3b069e37b Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into add-storage-rabbitmq-read-only 2020-06-01 18:25:36 +00:00
Alexander Tokmakov
62761eddcc Merge branch 'master' into merging_external_source_cassandra 2020-06-01 14:44:46 +03:00
Ivan Blinkov
fcc7ff0ef9 Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-01 08:42:03 +03:00
kssenii
e80b405359 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into add-storage-rabbitmq-read-only 2020-05-31 10:30:53 +00:00
Ivan Blinkov
b6e4a2ec61 one more merge issue 2020-05-29 23:21:53 +03:00
Ivan Blinkov
d033941399 try to fix merge issues 2020-05-29 23:20:28 +03:00
Ivan Blinkov
95ee742ee7 merge master 2020-05-29 22:56:10 +03:00
Alexander Tokmakov
8921041706 Merge branch 'master' into merging_external_source_cassandra 2020-05-29 18:20:39 +03:00
Denis Glazachev
d9ca9cd9b2 Compilation fix
Typo fix
2020-05-29 14:00:12 +04:00