thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-01 03:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,908 Commits 9,191 Branches 1,782 Tags 2.2 GiB
4ed7657008
Commit Graph

2664 Commits

Author SHA1 Message Date
alesapin
6e32e17a7d Merge branch 'master' into alter-name-collision 2020-11-03 13:16:34 +03:00
alesapin
da8ac948bf Disallow to drop parts with parallel quorum 2020-11-03 12:24:10 +03:00
alesapin
294489f6ad Merge branch 'master' into nvartolomei-drop-part 2020-11-03 10:19:03 +03:00
Azat Khuzhin
bdd453c54d Add 01546_log_queries_min_query_duration_ms into arcadia_skip_list 
In attempt to fix "Yandex synchronization check (only for Yandex employees)"
 2020-11-03 00:47:45 +03:00
Anton Popov
a3a8e18637
Merge branch 'master' into select_final 2020-11-03 00:00:43 +03:00
Alexander Kuzmenkov
f10a5207f4
Merge pull request #16601 from ClickHouse/ban_aggregate_function_in_primary_key 
Restrict to use non-comparable types in primary key
 2020-11-02 23:27:46 +03:00
Alexey Milovidov
878fd466c5 Apply SETTINGS clause earlier 2020-11-02 22:23:26 +03:00
Alexey Milovidov
3bc8ff6af6 Add a test for #1148 2020-11-02 21:52:04 +03:00
nikitamikhaylov
08b63fde77 done 2020-11-02 21:39:54 +03:00
Alexey Milovidov
e6d8ab2270 Fix possible name collision in ALTER 2020-11-02 21:37:23 +03:00
Azat Khuzhin
3be8a56f5c Add log_queries_min_query_duration_ms 
Only queries slower then the value of this setting will go to system.query_log,
i.e. something like slow_query_log in mysql.

v2: log_queries_min_time renamed to log_queries_min_query_duration_ms
v3: add current_database into system.query_thread_log
v4: rewrite test using current_database
v5: fix query_duration_ms in system.query_thread_log
 2020-11-02 21:34:54 +03:00
Alexander Tokmakov
ac32809b6a fix #16482 2020-11-02 19:40:39 +03:00
Alexander Kuzmenkov
2c8e42c232
Merge pull request #16563 from azat/query_thread_log_query_duration_ms-fix 
Fix query_thread_log.query_duration_ms
 2020-11-02 19:32:59 +03:00
Alexander Kuzmenkov
68fc76a751
Update 01455_opentelemetry_distributed.sh 2020-11-02 19:20:27 +03:00
alesapin
67d22b3e57 Merge branch 'master' into nvartolomei-drop-part 2020-11-02 19:09:09 +03:00
alesapin
ebd065c7e0
Merge pull request #16607 from ClickHouse/fix_idiotic_test 
Fix stupid error in test with TTL
 2020-11-02 18:56:00 +03:00
Alexander Kuzmenkov
548ac9d57b Merge remote-tracking branch 'origin/master' into HEAD 2020-11-02 17:37:30 +03:00
Nikolai Kochetov
14f6ec6ae2
Merge pull request #16592 from ClickHouse/revert-13964-fix/agg_combinator 
Revert "Try fix IfAggCombinator with NullAggCombinator"
 2020-11-02 16:53:50 +03:00
alesapin
2eb76f28b9 Fix time in test with TTL 2020-11-02 16:26:55 +03:00
Amos Bird
4cfae808fa
Query parameter type : Identifier 2020-11-02 20:58:51 +08:00
Ivan
281bf351d2
Remove ANALYZE and AST queries (#16536) 2020-11-02 15:47:12 +03:00
Alexey Milovidov
eea28e5ca4 Add a test for #9246 2020-11-02 15:16:35 +03:00
Alexey Milovidov
e7ba98fc47 Add a test for #7039 2020-11-02 14:53:18 +03:00
alesapin
f3b3025719 Ban non comparable types in primary key 2020-11-02 14:39:27 +03:00
Nikolai Kochetov
2a0db5d627 Merge branch 'master' into nikitamikhaylov-totals-having 2020-11-02 14:36:18 +03:00
Alexey Milovidov
b0a553e3fd Add a test for #5954 2020-11-02 14:27:49 +03:00
Alexey Milovidov
3f21ae55c9 Add a test for #5995 2020-11-02 14:20:43 +03:00
Nikolai Kochetov
85ed639f8e Added test. 2020-11-02 12:06:17 +03:00
Nikolai Kochetov
962a89843c
Revert "Try fix IfAggCombinator with NullAggCombinator" 2020-11-02 12:01:57 +03:00
Alexander Kuzmenkov
99ee127620 Support SETTINGS clause for File engine 
Accept the usual user settings related to file formats.

Most of the diff are the mechanistic code changes required to allow
providing the required FormatSettings to the format factory. The File
engine then extracts these settings from the `CREATE` query, and specifies
them when creating the format parser.
 2020-11-02 10:50:38 +03:00
Amos Bird
13fee19778
Allow parameterized functions in APPLY 2020-11-02 11:10:20 +08:00
Alexander Tokmakov
33fa54cce6 better scheduling of drop table task 2020-11-01 20:37:54 +03:00
Amos Bird
2a747ce5af
Allow WITH subqueries to take effect immediately 2020-11-01 00:02:52 +08:00
tavplubix
db146ee615
Merge pull request #16555 from ClickHouse/yet_another_fix_for_00993 
Better logging in replication queue, fix flacky test
 2020-10-31 14:38:15 +03:00
Azat Khuzhin
d466d147e6 Add 01548_query_log_query_execution_ms into arcadia_skip_list 
In attempt to fix "Yandex synchronization check (only for Yandex employees)"
 2020-10-31 14:20:27 +03:00
Azat Khuzhin
3b188921dd Fix query_thread_log.query_duration_ms unit 
There is a similar problem as in [1], the problem is that
getCurrentTimeNanoseconds() returns time using CLOCK_MONOTONIC.

  [1]: c0e15ba348 ("Fix RealTimeMicroseconds ProfileEvents")
 2020-10-31 11:15:27 +03:00
alexey-milovidov
15a342e5e1
Merge pull request #16541 from ucasFL/parse-null 
fix parseDateTimeBestEffortOrNull with empty string
 2020-10-31 06:38:51 +03:00
alexey-milovidov
4b3c99530f
Merge pull request #16561 from azat/01541_max_memory_usage_for_user-flacky 
Fix 01541_max_memory_usage_for_user flackiness
 2020-10-31 06:38:25 +03:00
alexey-milovidov
022648a154
Merge pull request #16558 from azat/query_thread_log_current_database 
Add current_database into query_thread_log
 2020-10-31 06:36:10 +03:00
Azat Khuzhin
067a3f9814 Fix 01541_max_memory_usage_for_user flackiness 2020-10-31 01:26:07 +03:00
Azat Khuzhin
ccddf5e9cf Add 01547_query_log_current_database into arcadia_skip_list 
In attempt to fix "Yandex synchronization check (only for Yandex employees)"
 2020-10-30 22:56:11 +03:00
alesapin
94ae5aed73
Merge pull request #16550 from ClickHouse/remove_wrong_assertion 
Remove wrong assertion from SSDComplexKeyCacheDictionary
 2020-10-30 22:45:48 +03:00
Azat Khuzhin
5bab7a5bc7 Add current_database into query_thread_log 2020-10-30 21:16:10 +03:00
Alexander Tokmakov
cf8202d36e better logging, fix flacky test 2020-10-30 15:41:39 +03:00
alesapin
182f9fbdca Remove wrong assertion from SSDComplexKeyCacheDictionary 2020-10-30 12:36:46 +03:00
alesapin
e06f65ee73
Merge pull request #16521 from myrrc/improvement/avro-format-lc 
Fixing the inability to deserialize AVRO into table if it contains LowCardinality columns
 2020-10-30 11:31:22 +03:00
feng lv
21fcd8aece fix 
fix
 2020-10-30 07:35:35 +00:00
feng lv
f428675b6e fix parseDateTimeBestEffortOrNull with empty string 2020-10-30 05:42:10 +00:00
Alexey Milovidov
ba4bb18663 Remove useless sleep in test 2020-10-29 21:57:16 +03:00
myrrc
4e5bfc9784 added the simple test 2020-10-29 21:02:48 +03:00
alexey-milovidov
434f6227cb
Merge pull request #16451 from ClickHouse/decimal-round-fuzz 
Decimal round fuzz
 2020-10-29 20:04:34 +03:00
Azat Khuzhin
b42f77a791 Covert error codes list to lookup table and drop generation of them. 2020-10-29 10:55:41 +03:00
Azat Khuzhin
b2e2322895 Add system.errors table 
Contains error codes with number of times they have been triggered.

Columns:

-   `name` ([String](../../sql-reference/data-types/string.md)) — name of the error (`errorCodeToName`).
-   `code` ([Int32](../../sql-reference/data-types/int-uint.md)) — code number of the error.
-   `value` ([UInt64](../../sql-reference/data-types/int-uint.md)) - number of times this error has been happened.

**Example**

``` sql
SELECT *
FROM system.errors
WHERE value > 0
ORDER BY code ASC
LIMIT 1

┌─name─────────────┬─code─┬─value─┐
│ CANNOT_OPEN_FILE │   76 │     1 │
└──────────────────┴──────┴───────┘
 2020-10-29 10:55:38 +03:00
Azat Khuzhin
3fb8d08dd4 Add errorCodeToName() function 
This patch adds errorCode() function that will return macro name by the
exception code, useful for analyzing query_log and similar.

Later some descriptions can be added.

v2: replace hana::map/fusion::vector with external script
v3:
- use binary cmake dir for .sh
- use jump table over suboptimal std::unordered_map (with very poor hash
  function for int -- std::hash)
- cleanup errorCodeToName (drop extra templates and headers)
- rename errorCode -> errorCodeToName
- fix arcadia build (by not providing those helpers there)
- fix build on CI, by using CMAKE_CXX_COMPILER for parsing the file
 2020-10-29 10:55:00 +03:00
alexey-milovidov
ae4d66ac9d
Merge pull request #16047 from ClickHouse/suggest-destruction-order 
Fix destruction order of Suggest #16035
 2020-10-29 09:10:23 +03:00
Alexey Milovidov
3e8f399f0b Update test 2020-10-29 05:15:01 +03:00
Alexey Milovidov
1e99ce5f3a Merge branch 'master' into decimal-round-fuzz 2020-10-29 04:57:43 +03:00
alesapin
cd05cab09d
Merge pull request #16455 from den-crane/test/bug_14144 
test for #14144
 2020-10-28 14:55:15 +03:00
tavplubix
22847613d1
Merge pull request #16437 from ClickHouse/addition_to_16127 
Addition to #16127
 2020-10-28 13:03:13 +03:00
alexey-milovidov
0cb377da6e
Merge pull request #16452 from ClickHouse/fuzz-cast 
Add a test for #13342
 2020-10-28 09:26:19 +03:00
alexey-milovidov
7c4b0e559d
Merge pull request #16453 from ClickHouse/fuzz-countEqual 
Add a test for #13893
 2020-10-28 09:26:03 +03:00
alexey-milovidov
6667261b02
Merge pull request #16454 from ClickHouse/fuzz-aggregate-desc 
Add a test for #15540
 2020-10-28 09:25:44 +03:00
alexey-milovidov
512dddb2b8
Merge pull request #16445 from ClickHouse/fuzz-lambda-array-join 
Added a test for #11364
 2020-10-28 09:24:57 +03:00
alexey-milovidov
df828a6a6c
Merge pull request #16410 from ClickHouse/fix-quantile-deterministic 
Fix debug assertion in quantileDeterministic function.
 2020-10-28 09:24:46 +03:00
alexey-milovidov
8951c9b0c7
Merge pull request #16439 from den-crane/test/bug_13492 
test for bug_13492
 2020-10-28 09:24:30 +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
Denis Zhuravlev
62e7e0637f test for #14144 2020-10-27 23:34:19 -03:00
Alexey Milovidov
b767efd889 Add a test for #15540 2020-10-28 04:35:40 +03:00
Alexey Milovidov
81cd172af1 Add a test for #13893 2020-10-28 04:31:47 +03:00
Alexey Milovidov
dec51cdb0b Add a test for #13342 2020-10-28 04:27:10 +03:00
Alexey Milovidov
690a3b4310 Fix test 2020-10-28 04:24:30 +03:00
Alexey Milovidov
bd8cc278cc Merge branch 'suggest-destruction-order' of github.com:yandex/ClickHouse into suggest-destruction-order 2020-10-28 04:22:23 +03:00
Alexey Milovidov
c703c052b4 Merge branch 'master' into suggest-destruction-order 2020-10-28 04:21:43 +03:00
Alexey Milovidov
b11229c1b6 Add a test for #13338 2020-10-28 04:15:41 +03:00
Alexander Tokmakov
05099bebcf fix 2020-10-28 03:29:18 +03:00
Alexey Milovidov
309e1c622f Added a test for #11364 2020-10-28 03:13:59 +03:00
alexey-milovidov
4911f334bf
Merge pull request #16429 from ClickHouse/dict-get-load-exception 
Fix another double free for shared exception message in case of dictGet from not loaded dictionary
 2020-10-28 02:07:03 +03:00
Denis Zhuravlev
ff6499cdc4 test for bug_13492 2020-10-27 19:02:56 -03:00
Alexey Milovidov
2352c144e8 Update reference 2020-10-27 22:28:40 +03:00
Alexander Kuzmenkov
6509f1eb39
Merge branch 'master' into minumum 2020-10-27 21:38:23 +03:00
Nikolai Kochetov
b39b2932bc Added test. 2020-10-27 16:49:08 +03:00
Alexander Kuzmenkov
e35be8eae3
Merge pull request #16407 from ClickHouse/agg-functions-case-sensitive 
Some aggregate functions were erroneously marked as case-insensitive
 2020-10-27 16:36:03 +03:00
Alexander Kuzmenkov
766560c138
Merge pull request #14195 from ClickHouse/aku/opentelemetry 
[wip] add some opentelemetry support
 2020-10-27 16:14:21 +03:00
Mikhail Filimonov
41971e073a
Fix typos reported by codespell 2020-10-27 12:04:03 +01:00
alexey-milovidov
30325689c4
Merge pull request #16397 from CurtizJ/fix-group-by-modifiers 
Fix group by with modifiers.
 2020-10-27 02:10:44 +03:00
Alexey Milovidov
f78e0d48b7 Added a test 2020-10-27 00:14:49 +03:00
Alexey Milovidov
25da82328c Adjust tests 2020-10-26 22:26:01 +03:00
Alexander Kuzmenkov
5a70e26c70 Merge remote-tracking branch 'origin/master' into HEAD 2020-10-26 19:21:13 +03:00
Alexander Kuzmenkov
6552613118
Merge pull request #16280 from filimonov/clickhouse-local-tmp-folder 
clickhouse-local can work without tmp directory
 2020-10-26 19:10:15 +03:00
alesapin
6226377ac3
Merge pull request #16261 from ClickHouse/check_flaky_test 
Checking flaky stateless tests
 2020-10-26 18:07:36 +03:00
Anton Popov
ab4c43cb81 fix group by with totals/rollup/cube modifers and min/max functions over group by keys 2020-10-26 16:48:11 +03:00
Anton Popov
5fbca7d62d
Merge pull request #16337 from kitaisreal/uuid-safe-cast-functions-added 
UUID safe cast functions added
 2020-10-26 16:03:27 +03:00
tavplubix
cb94359903
Update 01107_atomic_db_detach_attach.sh 2020-10-26 12:45:30 +03:00
tavplubix
54f823aafa
Update 01114_database_atomic.sh 2020-10-26 12:42:54 +03:00
Nikolai Kochetov
02bd35924e
Merge pull request #16242 from ClickHouse/another-one-untuple 
Another one untuple implementation
 2020-10-26 12:26:43 +03:00
alesapin
7b456e6663 Merge branch 'check_flaky_test' of github.com:ClickHouse/ClickHouse into check_flaky_test 2020-10-26 09:23:52 +03:00
alesapin
265f84fd88 Merge branch 'master' into check_flaky_test 2020-10-26 09:23:21 +03:00
alexey-milovidov
bfe17d7dca
Merge pull request #16358 from azat/dist-insert-fix 
Fix async Distributed INSERT w/ prefer_localhost_replica=0 and internal_replication
 2020-10-26 05:07:35 +03:00
Azat Khuzhin
edc8d6e5e7 Fix async Distributed INSERT w/ prefer_localhost_replica=0 and internal_replication 2020-10-25 14:27:06 +03:00
Maksim Kita
440ae2bc57 UUID safe cast functions added 
1. Added readUUIDTextImpl, readUUIDText, tryReadUUIDText functions in
ReadHelpers.
2. Added toUUIDOrNull, toUUIDOrZero functions based on ReadHelpers read
implementations.
3. Updated documentation.
 2020-10-25 11:45:29 +03:00
alexey-milovidov
6762f96768
Update 01526_client_start_and_exit.sh 2020-10-25 08:25:21 +03:00
Alexey Milovidov
8cc463f549 Better test 2020-10-25 05:31:58 +03:00
Alexey Milovidov
90a3e95aab Add missing file 2020-10-25 05:07:52 +03:00
Alexey Milovidov
2efd740dc7 Added a test 2020-10-25 05:07:52 +03:00
Ivan
1d170f5745
ASTTableIdentifier Part #1: improve internal representation of ASTIdentifier name (#16149) 
* Use only |name_parts| as primary name source

* Restore legacy logic for table restoration

* Fix build

* Fix tests

* Add pytest server config

* Fix tests

* Fixes due to review
 2020-10-24 21:46:10 +03:00
alexey-milovidov
e00f6c4a0d
Merge branch 'master' into total_memory_tracker-by-default 2020-10-24 21:17:53 +03:00
Nikita Mikhaylov
58b4342998
Merge pull request #15874 from nikitamikhaylov/welch-t-test 
Student and Welch t-test
 2020-10-24 15:13:12 +03:00
Azat Khuzhin
c3c6ac39e0 Tune TTL of the background query in 01541_max_memory_usage_for_user 2020-10-24 09:07:28 +03:00
alexey-milovidov
7e4079dca1
Merge pull request #16286 from ClickHouse/aku/error-context 
Add more context to error messages
 2020-10-24 07:28:36 +03:00
alexey-milovidov
c579611420
Merge pull request #16306 from azat/Set-Join-total-rows-bytes 
Add total_rows/total_bytes support for Set/Join
 2020-10-24 07:26:32 +03:00
alexey-milovidov
6037982343
Merge pull request #16284 from ClickHouse/primary_key_without_order_by 
Add ability to specify PRIMARY KEY without ORDER BY
 2020-10-24 06:05:04 +03:00
Azat Khuzhin
6e5b04fad8 Make 01540_MemoryTracking integration 
01540_MemoryTracking is failing on CI for the following reasons:
- log_queries (fixed, by adding log_queries=0)
- profilers (fixed)
- but what can't be fixed is metric_log and so on, so we need separate
  instance with separate configuration (sigh).
 2020-10-24 02:27:29 +03:00
nikitamikhaylov
fe9440689a better 2020-10-24 00:05:24 +03:00
tavplubix
790950ea56
Merge pull request #15934 from ClickHouse/ddl_queries_fixes 
Fixes for DDL queries
 2020-10-23 23:52:13 +03:00
nikitamikhaylov
a949293f95 better 2020-10-23 23:27:38 +03:00
nikitamikhaylov
0064a75916 Merge branch 'master' of github.com:ClickHouse/ClickHouse into welch-t-test 2020-10-23 23:06:15 +03:00
nikitamikhaylov
7822dafcae test added 2020-10-23 22:37:54 +03:00
Azat Khuzhin
3f594ed3ad Add a test for memory drift in user memory tracker (max_memory_usage_for_user) 2020-10-23 22:13:34 +03:00
tavplubix
587f83b2ef
Merge branch 'master' into atomic-drop-database-sync 2020-10-23 21:54:26 +03:00
tavplubix
d6f1056951
Update arcadia_skip_list.txt 2020-10-23 21:53:50 +03:00
Azat Khuzhin
4d1385ef19 Add total_rows/total_bytes support for Set/Join 2020-10-23 21:11:55 +03:00
Azat Khuzhin
6c42ad564c Add a test for MemoryTracking drift 
v2: disable query profiling and logging in 01540_MemoryTracking
    (This should make MemoryTracker drift zero).
 2020-10-23 21:11:22 +03:00
alesapin
b28894c43b More compatible way 2020-10-23 19:31:51 +03:00
alesapin
63ebc02bc3
Update 00652_replicated_mutations_zookeeper.sh 2020-10-23 19:07:53 +03:00
Mikhail Filimonov
f3a18864d5
After CR fixes - better & simpler. Issue in Context::shutdown fixed 2020-10-23 16:57:06 +02:00
Alexander Kuzmenkov
b0a14a41c3 fixup 2020-10-23 17:28:55 +03:00
Nikita Mikhaylov
cb4945d8b0
Merge pull request #16205 from azat/do-not-cache-dictGet 
Do not cache dictionary for dictGet*/dictHas*
 2020-10-23 15:47:11 +03:00
Alexander Tokmakov
b29cfa7f82 fix test with uuid 2020-10-23 15:32:57 +03:00
Alexander Kuzmenkov
28c9e66dc1
Merge pull request #15978 from ucasFL/interval-op 
INTERVAL operator support string literal
 2020-10-23 14:44:05 +03:00
alesapin
69f2f9838e Add ability to specify PRIMARY KEY without ORDER BY 2020-10-23 14:16:27 +03:00
Alexander Kuzmenkov
acc5e3906a
Merge pull request #15476 from ClickHouse/aku/fasttest-debug 
fix some tests for split build
 2020-10-23 14:05:03 +03:00
Mikhail Filimonov
58df7f7883
clickhouse-local can work without tmp directory 2020-10-23 11:53:35 +02:00
Alexander Tokmakov
e90b43c98d use async drop in some tests 2020-10-23 10:23:33 +03:00
Alexander Kuzmenkov
a1a7bc0217
Merge pull request #16192 from filimonov/clickhouse-local-segfault 
Add setTemporaryStorage to clickhouse-local to make OPTIMIZE work
 2020-10-22 20:47:28 +03:00
Alexander Kuzmenkov
ef39def7ff
Apply suggestions from code review 
Co-authored-by: filimonov <1549571+filimonov@users.noreply.github.com>
 2020-10-22 20:46:17 +03:00
Alexander Kuzmenkov
b77e776db4 fixes 2020-10-22 20:30:50 +03:00
Alexander Kuzmenkov
5cbf645de4 Merge remote-tracking branch 'origin/master' into tmp 2020-10-22 19:48:02 +03:00
Alexander Kuzmenkov
145e2b012f cleanup 2020-10-22 19:47:20 +03:00
alesapin
5d4ae538fd Flaky test 2020-10-22 16:14:49 +03:00
Nikolai Kochetov
7fa045cff8 Merge branch 'master' into storage-read-query-plan 2020-10-22 13:31:10 +03:00
Mikhail Filimonov
77f66e5a09
Split test into 2 2020-10-22 11:02:14 +02:00
alexey-milovidov
d879b6a601
Merge pull request #16247 from vzakaznikov/fix_test_01446_json_strings_each_row 
Fixing tests/queries/0_stateless/01446_json_strings_each_row.sql test
 2020-10-22 07:03:51 +03:00
alexey-milovidov
adeba6bdd8
Merge pull request #15074 from amosbird/btc 
Extend trivial count optimization.
 2020-10-22 02:50:57 +03:00
alexey-milovidov
2ae32e3d5c
Merge pull request #16101 from azat/http-memory-tracking-fixes 
Fix memory tracker settings (for HTTP queries)
 2020-10-22 00:00:47 +03:00
Nikolai Kochetov
5292c8b916 Add test. 2020-10-21 21:22:13 +03:00
Pavel Kruglov
10fb8624db Remove double simbol in test 2020-10-21 20:44:35 +03:00
Kruglov Pavel
0b75885c8a
Merge branch 'master' into select_final 2020-10-21 20:42:39 +03:00
Pavel Kruglov
89fdeb4e15 Fix style, move setting and add checking level>0 2020-10-21 20:35:31 +03:00
Alexander Kuzmenkov
154553e4c0 fix one more test 
The CLICKHOUSE_CLIENT has --send_logs_level option, and
boost::program_options prefers the first entry, so we can't override it.
Use CLICKHOUSE_CLIENT_BINARY instead, which does not contain options.
 2020-10-21 19:29:21 +03:00
Alexander Kuzmenkov
8cd560d5ad Merge remote-tracking branch 'origin/master' into HEAD 2020-10-21 19:13:56 +03:00