Commit Graph

499 Commits

Author SHA1 Message Date
alexey-milovidov
55ed2ab563
Update wide_integer_impl.h 2020-12-20 09:46:43 +03:00
Amos Bird
c447628d42
Add connection thread metrics 2020-12-18 15:22:55 +08:00
alexey-milovidov
6ee2ada592
Merge pull request #18204 from ClickHouse/remove-strerror
Do not use non thread-safe function `strerror`
2020-12-18 08:07:46 +03:00
Alexey Milovidov
ec5b030928 More functions 2020-12-17 21:39:04 +03:00
Alexey Milovidov
fb3d235e84 Do not use strerror 2020-12-17 21:25:12 +03:00
Alexey Milovidov
aa9dda5d9a Do not use strerror 2020-12-17 21:08:42 +03:00
Maksim Kita
fd7fe0f84c Updated ya.make 2020-12-17 12:10:46 +03:00
Alexey Milovidov
bef492240c Apply harmful library only for clickhouse binary 2020-12-17 06:45:46 +03:00
Alexey Milovidov
42a4e38f08 Merge branch 'master' into harmful 2020-12-17 06:28:55 +03:00
Maksim Kita
685099af7f Move getPageSize in common 2020-12-17 00:23:41 +03:00
Nikolai Kochetov
af83d82a84 Try use tsan annotated boost fibre. 2020-12-16 20:06:04 +03:00
alexey-milovidov
0d7e27d93f
Merge branch 'master' into fix 2020-12-14 23:02:14 +03:00
Nikolai Kochetov
8de5cd5bc7 Merge branch 'master' into async-read-from-socket 2020-12-14 17:45:38 +03:00
Nikolai Kochetov
e295dfe6e3 Use ucontext for asan 2020-12-14 17:42:08 +03:00
Nikolai Kochetov
dd6b5baa59 Add timerfd from musl 2020-12-14 17:41:59 +03:00
Amos Bird
88341fec82
client SIGWINCH fix 2020-12-12 00:34:40 +08:00
alesapin
dd9f4bfc8a
Merge pull request #16877 from ClickHouse/complete_zk_api
Fake in-memory ZooKeeper server inside ClickHouse
2020-12-10 10:47:54 +03:00
Nikita Mikhaylov
80d4af9a73
Merge pull request #17874 from nikitamikhaylov/calendar-date
Merging #17750
2020-12-10 00:19:04 +03:00
tavplubix
f13de96afc
Merge pull request #17366 from zhang2014/fix/ISSUES-16835
ISSUES-16835 try fix miss match header with MySQL SHOW statement
2020-12-09 23:12:47 +03:00
zhang2014
2f735aa61d ISSUES-16835 try fix review comment 2020-12-09 16:19:09 +08:00
alesapin
3d0dbbe411 Fix build 2020-12-08 17:49:18 +03:00
alexey-milovidov
d9b52f94f7
Merge pull request #17637 from amosbird/buildid
reload symbols and fix build-id
2020-12-08 14:55:35 +03:00
Alexander Kazakov
0e41af11c7
Fixed typo in message format (#17900) 2020-12-08 14:28:35 +03:00
Winter Zhang
972cb41fae
Merge branch 'master' into fix/ISSUES-16835 2020-12-08 15:32:58 +08:00
PHO
d014ac4ce2 Provide a default constructor for wide::integer
The implicit one provided by compiler does not initialize its member
variable "items" because it's a POD array. GCC emits a warning about this.
2020-12-07 16:00:32 +03:00
fenglv
ff4ffd2c6d Merge branch 'master' of github.com:ClickHouse/ClickHouse into fix 2020-12-07 04:39:49 +00:00
Alexey Milovidov
a63d4f0db3 Merge branch 'master' into amosbird-buildid 2020-12-07 02:17:29 +03:00
alesapin
278bbf6d51 Merge branch 'master' into complete_zk_api 2020-12-04 16:48:19 +03:00
Ivan
315ff4f0d9
ANTLR4 Grammar for ClickHouse and new parser (#11298) 2020-12-04 05:15:44 +03:00
Alexander Kazakov
81d9d3237f
In mysqlxx::Pool: fix for reconnection problem (#17681)
Remove stalled unrecoverable connections from myqsl connections pool
2020-12-03 23:36:10 +03:00
Ilya Yatsishin
9b72323594
Try fix arcadia build (#17720)
* Try fix arcadia build

* fix
2020-12-02 17:54:52 +03:00
alesapin
93ea2f5b1f Merge branch 'master' into complete_zk_api 2020-12-02 11:30:09 +03:00
alexey-milovidov
c0489ce537
Merge pull request #17543 from ClickHouse/sentry-official-cpu-ram
Sentry: send info about official build, memory, cpu and free disk space.
2020-12-01 10:33:10 +03:00
Yuriy Chernyshov
a6e66fc3b5
Use feature testing macro to test if char8_t is supported 2020-11-30 22:36:30 +03:00
Amos Bird
310918b06a
reload symbols and fix build-id 2020-11-30 22:30:55 +08:00
alexey-milovidov
81e4885664
Merge pull request #17556 from ClickHouse/memory-amount-worse
getMemoryAmount: make code worse
2020-11-30 12:53:50 +03:00
alesapin
6d2a007b79 Merge branch 'master' into complete_zk_api 2020-11-30 10:58:25 +03:00
Alexey Milovidov
97242e1fee Merge branch 'master' into sentry-official-cpu-ram 2020-11-30 09:40:10 +03:00
Alexey Milovidov
f80ae936ad Fix parsing of multiline queries in interactive mode #13654 2020-11-29 17:50:42 +03:00
Alexey Milovidov
7627f4f371 getMemoryAmount: make code worse 2020-11-29 15:13:10 +03:00
Alexey Milovidov
c516b96b00 Add comment 2020-11-29 11:34:42 +03:00
Alexey Milovidov
a8937ca792 Send info about official build, memory and cpu to Sentry 2020-11-29 11:31:06 +03:00
Alexey Milovidov
448ef3aca1 Send info about official build, memory and cpu to Sentry 2020-11-29 11:25:38 +03:00
fenglv
5c5d72379a Merge branch 'master' of github.com:ClickHouse/ClickHouse into fix 2020-11-28 03:38:29 +00:00
alesapin
89c292f5b7 Fix response pipe read 2020-11-27 13:12:11 +03:00
alexey-milovidov
d3b10c91f0
Update wide_integer_impl.h 2020-11-26 08:03:54 +03:00
Vitaly Baranov
08b3707842
Merge pull request #15111 from vitlibar/grpc-protocol
Implement GRPC protocol.
2020-11-25 09:00:32 +03:00
zhang2014
a74235397e ISSUES-16835 try fix miss match header with MySQL SHOW statement 2020-11-24 23:31:43 +08:00
Vitaly Baranov
7b0f94b5f2 glibc-compatibility: Add secure_getenv(). 2020-11-24 17:55:02 +03:00
Vitaly Baranov
3253a525e2 glibc-compatibility: Add getauxval(). 2020-11-24 17:55:02 +03:00
Vitaly Baranov
a61359c224 glibc-compatibility: Add accept4() from musl 1.2.1. 2020-11-24 17:55:02 +03:00
Vitaly Baranov
fc67aaec20 glibc-compatibility: Add epoll_create1() from musl 1.2.1. 2020-11-24 17:55:02 +03:00
Vitaly Baranov
d949898890 glibc-compatibility: Add eventfd(), eventfd_read(), eventfd_write() from musl 1.2.1. 2020-11-24 17:55:02 +03:00
Alexander Tokmakov
60a5782c75 fix AST formatting in log messages 2020-11-22 20:23:12 +03:00
fenglv
615287ae75 Avoid bigint_cast stack overflow 2020-11-22 03:42:16 +00:00
Matwey V. Kornilov
9d509cfc56 Add missed <stdexcept>
std::logic_error is used at line 294, so the appropriate header is required.
2020-11-21 13:26:38 +03:00
alexey-milovidov
b494b18748
Merge pull request #17108 from ClickHouse/ya-make-owners
Add "OWNER" to ya.make files.
2020-11-17 05:19:46 +03:00
Alexey Milovidov
24f4fa6edf Follow Arcadia ya.make rules 2020-11-17 00:16:50 +03:00
Alexey Milovidov
3df04ce0c2 Follow Arcadia ya.make rules 2020-11-16 21:24:58 +03:00
myrrc
2430d9d20d fixed the UB when casting from double to int64_t
Corresponding upstream fix: https://github.com/cerevra/int/pull/24
2020-11-13 18:13:15 +03:00
Ivan
902091cc07
Slightly better miniselect usage (#16896)
* Slightly better miniselect usage
* Update ColumnDecimal.cpp
2020-11-13 14:28:18 +03:00
sundyli
5ef809931e
Merge branch 'master' into storage-rocksdb 2020-11-12 08:26:27 +08:00
sundy-li
c7617173c4 add sync_file_range for glibc-compatibility 2020-11-11 09:08:52 +08:00
Alexander Tokmakov
b94cc5c4e5 remove more stringstreams 2020-11-10 21:22:26 +03:00
Alexander Tokmakov
5cdfcfb307 remove other stringstreams 2020-11-09 22:12:44 +03:00
Alexander Tokmakov
a06be511df pcg serialization 2020-11-09 16:07:38 +03:00
Alexey Milovidov
b56486510f Improve Arcadia 2020-11-05 12:55:01 +03:00
Alexey Milovidov
53ef792fe5 Fix gcc build 2020-10-28 02:00:16 +03:00
Alexey Milovidov
91e80598cd Add "harmful" library 2020-10-28 02:00:16 +03:00
Mikhail Filimonov
41971e073a
Fix typos reported by codespell 2020-10-27 12:04:03 +01:00
nikitamikhaylov
8a39b65fa2 fix build and tests 2020-10-19 19:15:22 +03:00
nikitamikhaylov
7a97329209 Merge branch 'master' of github.com:ClickHouse/ClickHouse into welch-t-test 2020-10-19 18:54:26 +03:00
nikitamikhaylov
ff7601a52c add python test and fix build 2020-10-14 21:41:35 +03:00
nikitamikhaylov
252b9b2ec1 better 2020-10-14 16:54:55 +03:00
nikitamikhaylov
f9204135d8 add lgammal.c 2020-10-14 16:54:02 +03:00
Alexey Milovidov
87fe8f2a00 Merge branch 'master' into filipecaixeta-master 2020-10-14 15:27:58 +03:00
Azat Khuzhin
f7bf94b5d3 Check return value of the history_save/history_load
The coding style is different and this is the intention, to make look
like surrounding code.
2020-10-12 23:57:00 +03: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
a171af157e Remove seven years old trash 2020-10-11 18:52:33 +03:00
Alexey Milovidov
269b6383f5 Check for #pragma once in headers 2020-10-10 21:37:02 +03:00
alesapin
16fa71a4c9 Missed comment 2020-10-08 20:46:59 +03:00
alesapin
70f2a3328d Better atomic operations on refcount 2020-10-08 20:45:18 +03:00
alesapin
de722cd57c Fix race condition in MySQL pool 2020-10-08 18:50:09 +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
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
Amos Bird
6e23901227 enable FastMemcpy properly 2020-09-30 18:52:49 +03:00
Artem Zuikov
4fd1db73a1
Faster 256-bit multiplication (#15418) 2020-09-29 20:52:34 +03:00
tavplubix
421d3b0b86
Merge pull request #14760 from bharatnc/ncb/event_time_microsec_p2
add event_time_microseconds field for system.{trace,text,query,query_thread}_log tables
2020-09-28 18:34:21 +03:00
alesapin
071ff6c9af
Merge pull request #15063 from azat/symbolizers-settings-for-non-server
Set sanitizers options in the current shell too
2020-09-28 17:44:39 +03:00
alesapin
1adc0a8205 Fix race condition in client suggestions 2020-09-28 12:58:42 +03:00
Artem Zuikov
b4f1eb07ff
slightly better bigint plus/minus (#15320) 2020-09-28 12:07:45 +03:00
bharatnc
a351980717 TextLog - add event_time_microseconds field 2020-09-25 10:39:37 -07:00
alexey-milovidov
31ece3bda5
Merge pull request #15145 from 4ertus2/debt
Better min/max for Int128
2020-09-23 02:03:51 +03:00
Artem Zuikov
2e6edc250c better min/max for Int128 2020-09-22 14:35:46 +03:00
Alexander Kuzmenkov
dde4cf70e1 Merge remote-tracking branch 'origin/master' into HEAD 2020-09-22 14:03:59 +03:00
Alexey Milovidov
ef5363b87f Fix terribly wrong code 2020-09-19 02:05:13 +03:00
Alexey Milovidov
37facf4482 Fix clang-tidy 2020-09-19 02:05:13 +03:00
alexey-milovidov
456c970929
Merge pull request #14808 from ClickHouse/remove-header
Remove one header
2020-09-18 21:57:00 +03:00
Artem Zuikov
0520b05001
Speedup wide integers (#14859) 2020-09-18 12:51:44 +03:00
Alexey Milovidov
9df338f37b Merge branch 'master' into remove-header 2020-09-18 01:18:53 +03:00
Alexander Kuzmenkov
fb64cf210a straighten the protocol version 2020-09-17 17:37:29 +03:00
Artem Zuikov
51ba12c2c3
Try speedup build (#14809) 2020-09-15 12:55:57 +03:00
Alexey Milovidov
3795dfed14 Remove one header 2020-09-14 16:34:44 +03:00
Artem Zuikov
d274125c74
Fix wide integer left shift + refactoring (#14697) 2020-09-14 14:56:43 +03:00
Alexey Milovidov
4e197cf069 Remove unused headers 2020-09-10 19:41:46 +03:00
Vasily Nemkov
3973a17530
MySql datatypes dateTime64 and decimal (#11512) 2020-09-09 15:18:02 +03:00
Alexey Milovidov
e3924b8057 Fix "Arcadia" 2020-09-08 01:14:13 +03:00
Artem Zuikov
7c20aa2c62
Another 256-bit integers (strict 32 bytes) (#14229) 2020-09-04 16:33:02 +03:00
Artem Zuikov
d304d522cc
Refactoring: rename types to allow change bigint library (#14219) 2020-09-01 12:54:50 +03:00
Yatsishin Ilya
a47ffd191d Change my_bool to bool.
The my_bool type no longer exists, and people may have been using it in their own code since some mysql.h functions have been returning that. The recommended fix is to use bool or int, which will work both in 8.0 and older versions.

https://bugs.mysql.com/bug.php?id=85131
2020-08-28 11:59:50 +03:00
Konstantin Podshumok
ef858027d4
unbundled: fix detection of mariadb headers
Squashed:
- unbundled: add warning about mariadbclient dependencies

Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-25 20:16:42 +03:00
alexey-milovidov
7ea5364299
Merge pull request #13648 from filimonov/tzdata_version2
tzdata improvements
2020-08-24 23:07:37 +03:00
myrrc
d298409660 Merge remote-tracking branch 'upstream/master' into bug/low-cardinality-arrays-optimisations 2020-08-20 12:07:02 +03:00
Artem Zuikov
becc186c91
Add support for extended precision integers and decimals (#13097) 2020-08-19 14:52:17 +03:00
Alexey Milovidov
eeb769d2d4 Remove useless code around zkutil 2020-08-18 22:02:07 +03:00
Alexey Milovidov
5ac2ed9e5b Generate ya.make #13572 2020-08-18 12:53:21 +03:00
Alexey Milovidov
b5af14d6a0 Generate ya.make 2020-08-18 12:47:29 +03:00
alexey-milovidov
1e80318b94
Merge pull request #13600 from amosbird/rlfix
Readline fix
2020-08-16 17:41:50 +03:00
alexey-milovidov
6ac1534f21
Merge pull request #13684 from azat/exceptions-from-signal-handlers
Reset signal handlers just before closing signal pipe to avoid EBADF after
2020-08-14 04:37:54 +03:00
Mikhail Filimonov
fe55ef6b2c Trying to fix TZ with plus sign inside 2020-08-13 23:28:56 +02:00
Azat Khuzhin
b7ba0b64dc Reset signal handlers just before closing signal pipe to avoid EBADF after
stack trace:

    (gdb) bt
    0  0x00007ffff7dda355 in raise () from /usr/lib/libc.so.6
    1  0x00007ffff7dc3853 in abort () from /usr/lib/libc.so.6
    2  0x0000000013a78180 in abort_message (format=format@entry=0x5781e10 "terminate_handler unexpectedly threw an exception") at abort_message.cpp:76
    3  0x0000000013a899ff in std::__terminate (func=<optimized out>) at cxa_handlers.cpp:67
    4  0x0000000013a771a1 in __cxxabiv1::call_terminate (native_exception=native_exception@entry=true, unwind_exception=unwind_exception@entry=0x7ffff70e9060) at cxa_personality.cpp:323
    5  0x0000000013a77669 in __cxxabiv1::scan_eh_tab (results=..., actions=<optimized out>, native_exception=native_exception@entry=true, unwind_exception=0x7ffff70e9060, context=context@entry=0x7fffffffc3a0) at cxa_personality.cpp:887
    6  0x0000000013a77bde in __cxxabiv1::__gxx_personality_v0 (version=<optimized out>, actions=<optimized out>, exceptionClass=<optimized out>, unwind_exception=0x7ffff70e9060, context=0x7fffffffc3a0) at cxa_personality.cpp:969
    7  0x0000000013a962d7 in unwind_phase1 (exception_object=0x7ffff70e9060, cursor=0x7fffffffc3a0, uc=0x7fffffffc2f0) at UnwindLevel1.c:98
    8  _Unwind_RaiseException (exception_object=exception_object@entry=0x7ffff70e9060) at UnwindLevel1.c:363
    9  0x0000000013a8929b in __cxxabiv1::__cxa_rethrow () at cxa_exception.cpp:607
    10 0x000000000f170ad2 in DB::WriteBuffer::next (this=0x7fffffffc510) at WriteBuffer.h:52
    11 writeSignalIDtoSignalPipe (sig=<optimized out>) at BaseDaemon.cpp:111
    12 <signal handler called>
    13 0x00007ffff7e9895b in munmap () from /usr/lib/libc.so.6
    14 0x00007ffff7f7e255 in free_stacks () from /usr/lib/libpthread.so.0
    15 0x00007ffff7f7e6aa in __deallocate_stack () from /usr/lib/libpthread.so.0
    16 0x00007ffff7f80898 in __pthread_clockjoin_ex () from /usr/lib/libpthread.so.0
    17 0x0000000013a759f7 in std::__1::__libcpp_thread_join (__t=0x7fff0aa2b090) at __threading_support:409
    18 std::__1:🧵:join (this=this@entry=0x7fff0aa2b090) at thread.cpp:56
    19 0x000000000a4c9399 in ThreadPoolImpl<std::__1::thread>::finalize (this=this@entry=0x7ffff7053900) at list:355
    20 0x000000000a4c9426 in ThreadPoolImpl<std::__1::thread>::~ThreadPoolImpl (this=0x7ffff7053900, __in_chrg=<optimized out>) at ThreadPool.cpp:172
    21 0x000000000a4c8a9c in GlobalThreadPool::~GlobalThreadPool (this=0x7ffff7053900, __in_chrg=<optimized out>) at ThreadPool.h:132
    22 std::__1::default_delete<GlobalThreadPool>::operator() (__ptr=0x7ffff7053900, this=<optimized out>) at memory:2363
    23 std::__1::unique_ptr<GlobalThreadPool, std::__1::default_delete<GlobalThreadPool> >::reset (__p=0x0, this=<optimized out>) at memory:2618
    24 std::__1::unique_ptr<GlobalThreadPool, std::__1::default_delete<GlobalThreadPool> >::~unique_ptr (this=<optimized out>, __in_chrg=<optimized out>) at memory:2572
    25 0x00007ffff7ddcc57 in __run_exit_handlers () from /usr/lib/libc.so.6
    26 0x00007ffff7ddcdfe in exit () from /usr/lib/libc.so.6
    27 0x00007ffff7dc5009 in __libc_start_main () from /usr/lib/libc.so.6
    28 0x000000000a48702e in _start () at new:340
2020-08-13 23:12:36 +03:00
myrrc
e2e38e30d0 Merge remote-tracking branch 'upstream/master' into bug/low-cardinality-arrays-optimisations 2020-08-12 19:12:08 +03:00
myrrc
82206e89dd fixed perftest long test and StringRef assert 2020-08-12 17:07:56 +03:00
myrrc
67d716b5cc revert accidental changes 2020-08-11 16:36:28 +03:00
Alexander Kazakov
6e0d536327
Merge branch 'master' into bug/low-cardinality-arrays-optimisations 2020-08-11 16:25:20 +03:00
Amos Bird
1eda00d27d
Readline fix 2020-08-11 17:49:39 +08:00
Alexey Milovidov
16b9d77ebf Merge branch 'master' of github.com:yandex/ClickHouse into clickhouse-install 2020-08-11 00:41:35 +03:00
Ivan
c8d3999693
Enable Poco::NetSSL support in ya.make 2020-08-10 14:18:57 +03:00
Alexey Milovidov
6716e442f9 Merge branch 'master' of github.com:yandex/ClickHouse into clickhouse-install 2020-08-10 02:20:37 +03:00
Vitaly Baranov
2e6ba2a05d
Merge pull request #13496 from vitlibar/compound-identifiers-for-custom-settings
Support compound identifiers for custom settings.
2020-08-10 01:03:02 +03:00
Alexey Milovidov
0eac2d4054 Merge branch 'embed-configs' into clickhouse-install 2020-08-09 02:42:06 +03:00
Alexey Milovidov
182e2929f3 Merge branch 'master' into embed-configs 2020-08-09 02:41:44 +03:00
Alexey Milovidov
b4ac900462 Fix "Arcadia" build 2020-08-09 02:38:53 +03:00
alexey-milovidov
ba5988dcf6
Merge pull request #13446 from ClickHouse/fix-netloc
Function "netloc": fix wrong code.
2020-08-09 01:39:46 +03:00
Alexey Milovidov
d9db0a3442 Add simple "clickhouse-install" tool 2020-08-08 21:38:34 +03:00
Vitaly Baranov
5401694138 splitInto() now can put result into a vector of std::string_view. 2020-08-08 19:35:53 +03:00
Alexey Milovidov
0d70393bac Fix build 2020-08-08 07:55:33 +03:00
Alexey Milovidov
0f79eb3cc5 Embed configs into binary 2020-08-08 06:42:42 +03:00
Alexey Milovidov
0cbbe153cd Fix typos, the last 1% 2020-08-08 04:21:04 +03:00
Alexey Milovidov
d1ed1fb83a Fix error 2020-08-07 04:04:37 +03:00
alesapin
aa7d5adf11
Merge pull request #13379 from ClickHouse/remove-recursive-submodules
Remove recursive submodules
2020-08-06 11:50:40 +03:00
Nikita Mikhaylov
fa51f15f00
fix style 2020-08-05 19:23:14 +03:00
Nikita Mikhaylov
b80677fdb3
Update OwnSplitChannel.cpp 2020-08-05 18:12:06 +03:00
Alexey Milovidov
2cd811975a Update Sentry 2020-08-05 17:41:27 +03:00
nikitamikhaylov
4e3c7c60b7 fix build 2020-08-05 16:39:14 +03:00
nikitamikhaylov
264320a82c done 2020-08-05 16:33:04 +03:00
Alexander Kuzmenkov
0eaab3d095
Merge pull request #13191 from ClickHouse/aku/semicolon-cleanup
Cleanup for #12999. NFC
2020-08-05 14:53:27 +03:00
myrrc
98119af9de Merge remote-tracking branch 'upstream/master' into bug/low-cardinality-arrays-optimisations 2020-08-04 15:01:27 +03:00
Alexander Kuzmenkov
e7744cc15c Merge remote-tracking branch 'origin/master' into HEAD 2020-08-03 16:35:42 +03:00