thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 10:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,640 Commits 9,189 Branches 1,782 Tags 2.2 GiB
059175217f
Commit Graph

4860 Commits

Author SHA1 Message Date
Alexander Kuzmenkov
1beba597ca Merge remote-tracking branch 'origin/master' into HEAD 2021-03-19 02:11:08 +03:00
Alexander Kuzmenkov
6aa9039f7d float frames and lag/lead_in_frame 2021-03-19 02:05:43 +03:00
Alexander Tokmakov
ce31d4608b fix tests 2021-03-18 22:13:21 +03:00
Maksim Kita
85a9ab7d87 Fixed test 2021-03-18 19:32:04 +03:00
Maksim Kita
140fa855c4
Update 01760_ddl_dictionary_use_current_database_name.sql 2021-03-18 18:11:21 +03:00
Alexander Kuzmenkov
c821c0c27a
Merge pull request #21761 from ClickHouse/aku/chunk-no-columns 
fix incorrect number of rows for Chunks with no columns in PartialSor…
 2021-03-18 17:58:09 +03:00
tavplubix
10696fed4d
Update 00953_zookeeper_suetin_deduplication_bug.sh 2021-03-18 17:21:39 +03:00
Maksim Kita
5324d75505 Fixed tests 2021-03-18 17:12:25 +03:00
Alexander Tokmakov
343b8c906d Merge branch 'master' into test_multiple_nodes 2021-03-18 16:01:04 +03:00
Alexander Tokmakov
fdae70df6c fix tests 2021-03-18 15:50:03 +03:00
Maksim Kita
0f95bcac0b DDL dictionary use current database name 2021-03-18 14:30:12 +03:00
Maksim Kita
cf985a86c4 test 2021-03-18 14:25:13 +03:00
Nikolai Kochetov
03cb0299a9
Merge pull request #21841 from ClickHouse/fix-21773 
Fix wrong column order after  filter push down.
 2021-03-18 13:30:22 +03:00
Maksim Kita
18ed9c5c67 SSDCacheDictionary remove max_stored_keys option 2021-03-18 12:55:17 +03:00
Denis Zhuravlev
597370e9bc mark the test long 2021-03-17 23:27:36 -03:00
Denis Zhuravlev
ff9e74bf2a test for #17302 2021-03-17 20:29:24 -03:00
alexey-milovidov
04c957962f
Merge pull request #21724 from azat/tests-replicated-merge-tree-zk-path 
Do not overlap zookeeper path for ReplicatedMergeTree in stateless *.sh tests
 2021-03-17 22:11:14 +03:00
Maksim Kita
bc22f4f6eb Updated implementation 2021-03-17 20:14:36 +03:00
Nikolai Kochetov
6397099d3c Added test. 2021-03-17 20:08:49 +03:00
kevin wan
accc3d0d38
fix 'str' object has no attribute 'decode' in python3 2021-03-17 20:08:30 +08:00
Nikolai Kochetov
05a9f8a793
Update 01755_shard_pruning_with_literal.sql 2021-03-17 12:34:59 +03:00
Nikolai Kochetov
3a3f800f6e
Merge pull request #21579 from azat/dist-query-zero-shards-fix 
Fix optimize_skip_unused_shards for zero shards case
 2021-03-17 11:54:08 +03:00
Nikolai Kochetov
4f1f344d4d
Merge pull request #21529 from azat/system.errors-improvements 
Add last_error_time/last_error_message/last_error_stacktrace/remote columns for system.errors
 2021-03-17 11:51:29 +03:00
alexey-milovidov
d02726bcac
Merge pull request #9404 from Enmk/DateTime64_extended_range 
Date time64 extended range
 2021-03-17 11:06:03 +03:00
Azat Khuzhin
9921e7ca28 Add 01545_system_errors into skip_list.parallel 
https://clickhouse-test-reports.s3.yandex.net/21529/2ce2772d35eb3d81628f4d294d5799e9f05333fd/functional_stateless_tests_flaky_check_(address).html#fail1
 2021-03-16 22:31:49 +03:00
Azat Khuzhin
cc87bcfb63 Fix errorCodeToName() for signed integers 
- https://clickhouse-test-reports.s3.yandex.net/21529/2ce2772d35eb3d81628f4d294d5799e9f05333fd/functional_stateless_tests_(address).html#fail1
- https://clickhouse-test-reports.s3.yandex.net/21529/2ce2772d35eb3d81628f4d294d5799e9f05333fd/functional_stateless_tests_(ubsan).html#fail1
- https://clickhouse-test-reports.s3.yandex.net/21529/2ce2772d35eb3d81628f4d294d5799e9f05333fd/stress_test_(address).html#fail1
 2021-03-16 22:31:49 +03:00
Azat Khuzhin
259e5ba88e Separate accounting of remote exceptions in system.errors 2021-03-16 22:31:46 +03:00
Alexander Tokmakov
2d34bbb4b2 Merge branch 'master' into test_multiple_nodes 2021-03-16 21:29:26 +03:00
tavplubix
848bb59175
Merge pull request #21728 from ClickHouse/fix_alter_decimal 
Fix alter modify for decimal columns when type size doesn't change
 2021-03-16 20:01:35 +03:00
Alexander Tokmakov
735acf27d8 try run stateful tests 2021-03-16 19:39:31 +03:00
Pavel Kovalenko
a43c85b105 Add test for freeze/unfreeze partition with old MergeTree syntax 2021-03-16 16:36:05 +03:00
Nikita Mikhaylov
2e13c767a0
Merge pull request #21149 from nikitamikhaylov/pp-for-csv-with-names 
Support parallel parsing for *WithNames types
 2021-03-16 14:38:03 +03:00
Nikita Mikhaylov
7d7a2bc724
Merge pull request #21630 from nikitamikhaylov/pf-local 
Parallel formatting for clickhouse-local
 2021-03-16 14:37:40 +03:00
Nikolai Kochetov
e8d7349c79
Merge branch 'master' into dist-query-zero-shards-fix 2021-03-16 12:00:08 +03:00
Pavel Kovalenko
39f3b17041 Merge remote-tracking branch 'origin/master' into unfreeze-partitions 2021-03-16 10:56:24 +03:00
alesapin
23a7c00ba4
Merge branch 'master' into fix_alter_decimal 2021-03-16 10:24:46 +03:00
alesapin
8fd3fbc5b3
Merge pull request #20387 from Avogar/optimize-on-insert 
Don't create empty parts on INSERT
 2021-03-16 10:20:34 +03:00
Azat Khuzhin
a03a9051e1 Mark some tests as long 
From [1] and [2]:

  [1]: https://clickhouse-test-reports.s3.yandex.net/21724/dacb6066237b78511ad5f07cc65045b8cf4e5e7b/functional_stateless_tests_flaky_check_(address).html#fail1
  [2]: https://clickhouse-test-reports.s3.yandex.net/21724/ee8ece157987f3cd8b68ca4a5b7df709f4688208/functional_stateless_tests_flaky_check_(address)/test_run.txt.out.log
  [3]: https://clickhouse-test-reports.s3.yandex.net/21724/e4485ce0b1d1b21c4360bbdecacd2485d1634a91/functional_stateless_tests_flaky_check_(address)/test_run.txt.out.log
 2021-03-16 09:52:31 +03:00
Amos Bird
f00e108410
Fix scalar subquery index analysis 2021-03-16 14:07:30 +08:00
Azat Khuzhin
05a8c73eb9 Do not overlap zookeeper path for ReplicatedMergeTree in stateless *.sh tests 
Found with stress tests for 00626_replace_partition_from_table_zookeeper [1]:

    2021.03.15 00:59:48.200106 [ 27417 ] {0f47dbeb-938a-4560-8408-a7cc7b3bafb8} <Trace> ContextAccess (default): Access granted: CREATE TABLE ON test_31.dst_r1
    ...
    2021.03.15 00:59:48.403227 [ 27417 ] {0f47dbeb-938a-4560-8408-a7cc7b3bafb8} <Debug> test_31.dst_r1: This table /clickhouse/test_00626/dst_1 is already created, will add new replica
    2021.03.15 00:59:48.736450 [ 83006 ] {b2db1355-3ec3-4e3a-9c79-f93f27c6e658} <Trace> ContextAccess (default): Access granted: CREATE TABLE ON test_31.dst_r2
    ...
    2021.03.15 00:59:48.851768 [ 83006 ] {b2db1355-3ec3-4e3a-9c79-f93f27c6e658} <Debug> test_31.dst_r2: This table /clickhouse/test_00626/dst_1 is already created, will add new replica
    ...
    2021.03.15 00:59:48.919059 [ 366 ] {} <Debug> test_31.dst_r2 (ReplicatedMergeTreeQueue): Loading queue from /clickhouse/test_00626/dst_1/replicas/2/queue
    2021.03.15 00:59:48.919948 [ 366 ] {} <Debug> test_31.dst_r2 (ReplicatedMergeTreeQueue): Having 3 queue entries to load, 0 entries already loaded.
    2021.03.15 00:59:48.921833 [ 366 ] {} <Trace> test_31.dst_r2 (ReplicatedMergeTreeQueue): Loaded queue
    ...
    2021.03.15 00:59:51.904230 [ 246952 ] {59753eea-3896-45ca-8625-fdaa094ee9ef} <Trace> ContextAccess (default): Access granted: SYSTEM SYNC REPLICA ON test_31.dst_r2
    ...
    2021.03.15 01:04:51.913683 [ 246952 ] {59753eea-3896-45ca-8625-fdaa094ee9ef} <Error> InterpreterSystemQuery: SYNC REPLICA test_31.dst_r2: Timed out!

  [1]: https://clickhouse-test-reports.s3.yandex.net/21716/402bf77783cbda48a9ee1b748bfce3c52ef8fe11/stress_test_(memory)/test_run.txt.out.log

But the problem is more generic, so fix all tests.
 2021-03-16 07:22:32 +03:00
Azat Khuzhin
e6b9740a69 Add $CLICKHOUSE_TEST_ZOOKEEPER_PREFIX (for *.sh stateless tests) 2021-03-16 07:22:32 +03:00
Azat Khuzhin
54f124aae4 Cleanup 00626_replace_partition_from_table_zookeeper 2021-03-16 07:22:32 +03:00
Anton Popov
ecd9220c77 minor fixes 2021-03-16 02:28:11 +03:00
Alexander Kuzmenkov
3c16ea0bc8 fix incorrect number of rows for Chunks with no columns in PartialSortingTransform 2021-03-16 01:59:12 +03:00
Alexey Milovidov
f48bf2aaba Fix issue 2021-03-15 23:29:35 +03:00
Alexey Milovidov
845f4afbf4 Fix parsing of pre-epoch time 2021-03-15 21:09:05 +03:00
Alexey Milovidov
badd5165da Fix UBSan report in rounding to years intervals 2021-03-15 20:36:49 +03:00
Alexey Milovidov
eaeb4a3bf0 Merge branch 'master' into DateTime64_extended_range 2021-03-15 16:59:32 +03:00
alesapin
31ec24255e Fix skip list 2021-03-15 14:24:52 +03:00
alesapin
307b89f6b0 fix skip list 2021-03-15 14:20:11 +03:00
tavplubix
984050e0d1
Merge pull request #21661 from Avogar/path-param 
Add test for path as a query parameter in system.zookeeper
 2021-03-15 13:13:36 +03:00
alesapin
caccc6da37 Add missing tests 2021-03-15 12:01:26 +03:00
alesapin
d502a217e5 Merge branch 'master' into Avogar-optimize-on-insert 2021-03-15 11:38:25 +03:00
tavplubix
6a265f468e
Merge branch 'master' into distributed_ddl_improvements 2021-03-15 11:24:14 +03:00
alesapin
69b8ded578 Fix alter modify for decimal columns when type size doesn't change 2021-03-15 11:22:15 +03:00
alexey-milovidov
adbf032235
Merge pull request #21713 from ClickHouse/modulo-ubsan 
Fix UBSan report in modulo by constant
 2021-03-14 23:19:12 +03:00
Alexey Milovidov
b3d2948081 Fix UBSan report in modulo by constant 2021-03-14 17:31:07 +03:00
Maksim Kita
c94ee3151d
Merge pull request #21182 from ikarishinjieva/fix_#21170 
fix #21170
 2021-03-14 17:24:39 +03:00
Maksim Kita
40d2ec7924
Merge pull request #19816 from kitaisreal/range-hashed-dictionary-support-has-keys 
RangeHashed dictionary support dictHas function
 2021-03-14 13:44:06 +03:00
alexey-milovidov
edbaf756a0
Merge pull request #21696 from azat/stress-tests-fixes 
Tests fixes (that was found by stress tests)
 2021-03-14 12:31:57 +03:00
alexey-milovidov
53e21443eb
Merge branch 'master' into DateTime64_extended_range 2021-03-14 12:27:17 +03:00
Pavel Kruglov
e116e75d2c Fix style 2021-03-14 02:36:40 +03:00
Maksim Kita
98192f1234
Update 01280_ssd_complex_key_dictionary.sql 2021-03-14 01:28:53 +03:00
Pavel Kruglov
d83b4d3ab6 Try fix flacky test 2021-03-13 23:44:06 +03:00
Maksim Kita
b1398e6ffa Updated test 2021-03-13 23:26:01 +03:00
Maksim Kita
084bd03672
Merge pull request #21692 from azat/dict-ip_trie-access_to_key_from_attributes 
Fix SIGSEGV on not existing attributes from ip_trie with access_to_key_from_attributes
 2021-03-13 23:13:26 +03:00
Anton Popov
68b3cbbfe9 fix conversions for fields in function 'arrayElement' for type Map 2021-03-13 17:49:43 +03:00
alexey-milovidov
36935a335f
Merge pull request #21102 from Enmk/governance/query_log 
Added Grant, Revoke and System query_kind for system.query_log
 2021-03-13 15:16:32 +03:00
Maksim Kita
ee8c51f65e Fixed tests 2021-03-13 14:58:31 +03:00
Maksim Kita
add444f71c Fixed broken test 2021-03-13 14:58:31 +03:00
Maksim Kita
854bfaf366 RangeHashed dictionary support has function 2021-03-13 14:57:56 +03:00
Azat Khuzhin
833dbf1225 Mark 01294_lazy_database_concurrent_recreate_reattach_and_show_tables as long 2021-03-13 13:43:17 +03:00
Maksim Kita
79b061ac3c
Merge pull request #21668 from kitaisreal/dictionary-attributes-unique-names 
DictionaryStructure fix non unique attribute names
 2021-03-13 12:31:33 +03:00
Azat Khuzhin
2d66a5c393 Fix hang check for 00966_live_view_watch_events_http 
If INSERT was failed then WATCH EVENTS will hang:

    2021.03.12 23:45:33.666223 [ 1901 ] {} <Trace> DynamicQueryHandler: Request URI: /?allow_experimental_live_view=1&query=WATCH%20test.lv%20EVENTS
    ...
    2021.03.12 23:45:34.119465 [ 35492 ] {55f2c8ec-df9f-4e97-9acc-385ed5b5fde2} <Error> executeQuery: Code: 241, e.displayText() = DB::Exception: Memory limit (for user) exceeded: would use 153.99 MiB (attempt to allocate chunk of 4194729 bytes), maximum: 150.00 MiB (version 21.4.1.6239) (from [::1]:43910) (in query: INSERT INTO test.mt VALUES ), Stack trace (when copying this message, always include the lines below):
    ...

Hung check:

    elapsed:              597.835824299
    is_cancelled:         0
    query:                WATCH test.lv EVENTS
    thread_ids:           [1901]

gdb:

    Thread 133 (Thread 0x7f26ac95b700 (LWP 1901)):
    0  0x00007f2793d447b1 in pthread_cond_timedwait@@GLIBC_2.3.2 () from /lib/x86_64-linux-gnu/libpthread.so.0
    1  0x0000000008cbd5c5 in __tsan::call_pthread_cancel_with_cleanup(int (*)(void*, void*, void*), void*, void*, void*, void (*)(void*), void*) ()
    2  0x0000000008c4f134 in cond_wait(__tsan::ThreadState*, unsigned long, __tsan::ScopedInterceptor*, int (*)(void*, void*, void*), void*, void*, void*) ()
    3  0x0000000008c4f339 in pthread_cond_timedwait ()
    4  0x000000001831c8b6 in std::__1::__libcpp_condvar_timedwait (__cv=0x7b5801053520, __m=0x189, __ts=0x7f26ac9132b8) at ../contrib/libcxx/include/__threading_support:442
    5  std::__1::condition_variable::__do_timed_wait (this=0x7b5801053520, lk=..., tp=...) at ../contrib/libcxx/src/condition_variable.cpp:74
    6  0x00000000134fe7f2 in std::__1::condition_variable::wait_for<long long, std::__1::ratio<1l, 1000000l> > (this=this@entry=0x7b5801053520, __lk=..., __d=...) at ../contrib/libcxx/include/__mutex_base:462
    7  0x00000000134fe2c9 in DB::LiveViewEventsBlockInputStream::tryReadImpl (this=this@entry=0x7b5c0070ff98, blocking=false) at ../src/Storages/LiveView/LiveViewEventsBlockInputStream.h:180
    8  0x00000000134fd6e4 in DB::LiveViewEventsBlockInputStream::readImpl (this=0x189) at ../src/Storages/LiveView/LiveViewEventsBlockInputStream.h:115
    9  0x0000000012285593 in DB::IBlockInputStream::read (this=0x7b5c0070ff98) at ../src/DataStreams/IBlockInputStream.cpp:58
    10 0x00000000122afc7e in DB::copyDataImpl<std::__1::function<bool ()> const&, std::__1::function<void (DB::Block const&)> const&>(DB::IBlockInputStream&, DB::IBlockOutputStream&, std::__1::function<bool ()> const&, std::__1::function<void (DB::Block const&)> const&) (from=..., to=..., is_cancelled=..., progress=...) at ../src/DataStreams/copyData.cpp:26
    11 0x00000000122af8e1 in DB::copyData(DB::IBlockInputStream&, DB::IBlockOutputStream&, std::__1::function<bool ()> const&, std::__1::function<void (DB::Block const&)> const&) (from=..., to=..., is_cancelled=..., progress=...) at ../src/DataStreams/copyData.cpp:73
    12 0x0000000012cfc5e2 in DB::executeQuery(DB::ReadBuffer&, DB::WriteBuffer&, bool, DB::Context&, std::__1::function<void (std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&)>) (istr=..., ostr=..., allow_into_outfile=false, context=..., set_result_details=...) at ../src/Interpreters/executeQuery.cpp:1033
    13 0x000000001357941d in DB::HTTPHandler::processQuery (this=this@entry=0x7b1c006f41b0, context=..., request=..., params=..., response=..., used_output=..., query_scope=...) at ../src/Server/HTTPHandler.cpp:772
    14 0x000000001357c507 in DB::HTTPHandler::handleRequest (this=<optimized out>, request=..., response=...) at ../src/Server/HTTPHandler.cpp:910
    15 0x00000000135f3081 in DB::HTTPServerConnection::run (this=<optimized out>) at ../src/Server/HTTP/HTTPServerConnection.cpp:48
    16 0x00000000161f9e73 in Poco::Net::TCPServerConnection::start (this=0x7b8c01554000) at ../contrib/poco/Net/src/TCPServerConnection.cpp:43
    17 0x00000000161fa59f in Poco::Net::TCPServerDispatcher::run (this=<optimized out>) at ../contrib/poco/Net/src/TCPServerDispatcher.cpp:113
    18 0x0000000016361732 in Poco::PooledThread::run (this=<optimized out>) at ../contrib/poco/Foundation/src/ThreadPool.cpp:199
    19 0x000000001635fcd0 in Poco::(anonymous namespace)::RunnableHolder::run (this=<optimized out>) at ../contrib/poco/Foundation/src/Thread.cpp:55
    20 0x000000001635e4d8 in Poco::ThreadImpl::runnableEntry (pThread=0x7b5400082538) at ../contrib/poco/Foundation/src/Thread_POSIX.cpp:345
    21 0x0000000008c4e36d in __tsan_thread_start_func ()
    22 0x00007f2793d3d609 in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0
    23 0x00007f2793c64293 in clone () from /lib/x86_64-linux-gnu/libc.so.6

Cc: @vzakaznikov
 2021-03-13 11:32:55 +03:00
Azat Khuzhin
68dff2d954 Mark 01018_ip_dictionary as long 
https://clickhouse-test-reports.s3.yandex.net/21692/481d897cadb6b1a309478f24a46efe506b7108d6/functional_stateless_tests_flaky_check_(address).html#fail1
 2021-03-13 11:06:49 +03:00
Azat Khuzhin
a301aa64da Do not use system-wide SYSTEM STOP TTL MERGES, use per-table instead 
Fixes 01294_lazy_database_concurrent_recreate_reattach_and_show_tables
 2021-03-13 10:37:26 +03:00
Azat Khuzhin
1ce9293e97 Fix 01035_lc_empty_part_bug under stress tests 
Found in [1]:

    2021.03.12 23:32:58.897190 [ 436606 ] {97a08a8f-4630-44f8-ba18-a94c6fabbded} <Information> test_13.lc_empty_part_bug: Waiting mutation: mutation_3.txt
    ...
    2021.03.12 23:32:58.900444 [ 374 ] {} <Debug> test_13.lc_empty_part_bug: Current max source part size for mutation is 0 but part size 1. Will not mutate part all_1_1_0_2. Max size depends not only on available space, but also on settings 'number_of_free_entries_in_pool_to_execute_mutation' and 'background_pool_size'
    ...

Hang check:

    query:                alter table lc_empty_part_bug modify column s LowCardinality(String);
    elapsed:              2156.396613506

  [1]: https://clickhouse-test-reports.s3.yandex.net/21511/d7d9638ceb6bd702f34a88ee54f8f83197e90af5/stress_test_(address).html#fail1
 2021-03-13 10:31:19 +03:00
Azat Khuzhin
481d897cad Fix SIGSEGV on not existing attributes from ip_trie with access_to_key_from_attributes 
Found with fuzzer [1]:

  [1]: https://clickhouse-test-reports.s3.yandex.net/21674/2e99dad56213413a72969d47650050b42cbcc073/fuzzer_asan/report.html#fail1
 2021-03-13 09:08:45 +03:00
alexey-milovidov
f6bedf55e9
Merge pull request #21642 from azat/fsync_part_directory-horizontal-merge-fix 
Fix fsync_part_directory for horizontal merge
 2021-03-12 21:22:55 +03:00
Vasily Nemkov
f4246e7be5
Merge branch 'master' into governance/query_log 2021-03-12 18:31:08 +03:00
Pavel Kruglov
7f2d03b128 Change test 2021-03-12 18:24:59 +03:00
Nikita Mikhaylov
e234990cf6
Merge pull request #19257 from nikitamikhaylov/geometry_functions 
Merging geometry functions
 2021-03-12 17:05:24 +03:00
Maksim Kita
97a58777b8 DictionaryStructure fix non unique attribute names 2021-03-12 16:36:42 +03:00
Alexander Kuzmenkov
122790efd1
Merge pull request #21629 from ucasFL/errorcode 
redefine some errorcode
 2021-03-12 16:25:13 +03:00
tavplubix
e3141124fd
Merge pull request #20946 from ClickHouse/stress_test_results 
Move some CI-related scripts to github
 2021-03-12 15:54:15 +03:00
Pavel Kruglov
b83564bdad Add test for path as a query parameter in system.zookeeper 2021-03-12 15:08:00 +03:00
Kruglov Pavel
2e7f756d7c
Merge pull request #21494 from ucasFL/format 
add --backslash option for clickhouse-format
 2021-03-12 14:31:58 +03:00
Nikita Mikhaylov
e4b4665ff5 better 2021-03-12 13:58:03 +03:00
feng lv
1eba096f2a fix conflict 2021-03-12 10:28:04 +00:00
Vasily Nemkov
2cf39d3ac4 Excluded 01702_system_query_log from arcadia runs 2021-03-12 11:25:01 +02:00
tavplubix
2acbfd834a
Merge branch 'master' into stress_test_results 2021-03-12 12:11:33 +03:00
alexey-milovidov
87368befea
Merge pull request #21646 from azat/storage-join-type-conversion 
Add type conversion for StorageJoin (previously led to SIGSEGV)
 2021-03-12 11:21:56 +03:00
Azat Khuzhin
c2372420ee Add type conversion for StorageJoin (previously led to SIGSEGV) 
Found with fuzzer under UBsan [1]:

  [1]: https://clickhouse-test-reports.s3.yandex.net/21579/61d40c3600ba6a1c6d6c0cf4919a3cdaebb3a31f/fuzzer_ubsan/report.html#fail1
 2021-03-11 23:28:32 +03:00
Azat Khuzhin
69b2b2a159 Fix fsync_part_directory for horizontal merge 2021-03-11 21:41:27 +03:00
Alexander Kuzmenkov
ae8585a183
Merge pull request #21580 from azat/git--arcadia_skip_list-union-merge 
[RFC] Union merge for arcadia_skip_list.txt to avoid frequent conflicts
 2021-03-11 21:10:38 +03:00
Nikita Mikhaylov
8e68edebea better test 2021-03-11 18:22:24 +03:00
Nikita Mikhaylov
87eb2592de add input_format_skip_unknown_fields 2021-03-11 18:22:24 +03:00
Nikita Mikhailov
369c9da161 better 2021-03-11 18:22:24 +03:00
Nikita Mikhailov
138dedf2df done 2021-03-11 18:22:24 +03:00
Alexander Kuzmenkov
a2bedd592e
Merge pull request #21436 from azat/optimize_aggregation_in_order-log-fix 
Fix logging for optimize_aggregation_in_order=1 (with small max_block_size)
 2021-03-11 17:46:48 +03:00
Alexander Kuzmenkov
3303371b64
Merge pull request #21526 from azat/optimize_skip_unused_shards-once 
Avoid processing optimize_skip_unused_shards twice
 2021-03-11 17:31:37 +03:00
Alexander Kuzmenkov
3e5447ccec
Merge pull request #21480 from Avogar/slowdown_count 
Add slowdown_count and show actual errors_count in system.clusters
 2021-03-11 17:18:05 +03:00
feng lv
083299e549 redefine some errorcode 2021-03-11 13:54:11 +00:00
Nikita Mikhaylov
5ac5ae3b27
Merge pull request #21157 from CurtizJ/fix-type-map 
Improve support of integer keys in data type Map
 2021-03-11 15:49:57 +03:00
Vasily Nemkov
03bff5c3b5 Fixed test flakkiness 2021-03-11 14:47:20 +02:00
Nikita Mikhaylov
b219b7626e better 2021-03-11 15:19:15 +03:00
Nikita Mikhaylov
934b5bc487 Update 01700_point_in_polygon_ubsan.sql 2021-03-11 15:09:03 +03:00
Nikita Mikhaylov
eecc12ff6a suppress warnings and skip tests in arcadia 2021-03-11 15:09:03 +03:00
Nikita Mikhaylov
35d0b3d3ec better 2021-03-11 15:08:20 +03:00
Nikita Mikhaylov
7ecc78e014 fix tests after revert 2021-03-11 15:08:20 +03:00
Nikita Mikhaylov
c81c742877 Revert "more mercator" 
This reverts commit d4258922d1543211cf8b62f7c827a927712dca42.
 2021-03-11 15:08:20 +03:00
Nikita Mikhaylov
a6779df0ae more tests 2021-03-11 15:08:20 +03:00
Nikita Mikhaylov
7e6d1d43fe more mercator 2021-03-11 15:08:20 +03:00
Nikita Mikhailov
a6c8d50cc2 review fix 2021-03-11 15:08:19 +03:00
Nikita Mikhailov
0e1b2d8fcf geographic -> spherical 2021-03-11 15:08:19 +03:00
Nikita Mikhailov
ac03ba31bf move to spherical point 2021-03-11 15:08:19 +03:00
Nikita Mikhailov
928641aae4 perimeter test 2021-03-11 15:08:19 +03:00
Nikita Mikhailov
a7427a9cdf better 2021-03-11 15:08:19 +03:00
Nikita Mikhailov
4430322edc add some test + style 2021-03-11 15:08:19 +03:00
Nikita Mikhailov
681b0b63f1 return back all functions 2021-03-11 15:08:18 +03:00
Nikita Mikhailov
557fa7c5c8 fix ubsan 2021-03-11 15:08:18 +03:00
Nikita Mikhailov
e78fc3109c better ubsan testing 2021-03-11 15:08:18 +03:00
Nikita Mikhailov
05cf1b5bc5 better 2021-03-11 15:08:18 +03:00
Nikita Mikhailov
6a51ad425e add tests + improvements 2021-03-11 15:08:18 +03:00
Nikita Mikhailov
10d22e9db1 fix empty polygon 2021-03-11 15:08:17 +03:00
Nikita Mikhailov
2475143ed3 fix style 2021-03-11 15:08:17 +03:00
Nikita Mikhailov
155d392d31 fix tests 2021-03-11 15:08:17 +03:00
Nikita Mikhailov
cfee417ce0 better 2021-03-11 15:08:17 +03:00
Nikita Mikhaylov
db9dbfa528 Update 01304_polygons_sym_difference.sql 2021-03-11 15:08:17 +03:00
Nikita Mikhailov
0425d566d3 better 2021-03-11 15:08:17 +03:00
Alexey Ilyukhov
373b429e61 Add more tests 2021-03-11 15:08:17 +03:00
DoomzD
f7019cf589 Add tests 2021-03-11 15:08:17 +03:00
Maksim Kita
583b25b68e
Merge pull request #21513 from kitaisreal/direct-dictionary-fix 
DirectDictionary updated
 2021-03-11 00:01:01 +03:00
tavplubix
2b2c61346c
Update skip_list.json 2021-03-10 20:03:44 +03:00
Vladimir
33dce1296b
Merge pull request #20392 from vdimir/cross-to-inner-join-rewrite 2021-03-10 09:53:55 +03:00
Azat Khuzhin
61d40c3600 Fix optimize_skip_unused_shards for zero shards case 
v2: move check to the beginning of the StorageDistributed::read()
 2021-03-10 09:05:14 +03:00
Azat Khuzhin
2099e5a661 Fix syntax in arcadia_skip_list 2021-03-10 08:50:32 +03:00
alexey-milovidov
2159fb8481
Merge branch 'master' into governance/query_log 2021-03-10 05:29:56 +03:00
Alexander Tokmakov
ba3d51383c fix 2021-03-10 00:41:04 +03:00
Maksim Kita
b5f51e0ca6 Fixed style check 2021-03-09 23:50:06 +03:00
Maksim Kita
45879472d3 DirectDictionary updated 2021-03-09 23:49:34 +03:00
Alexander Tokmakov
4d19c84d90 Merge branch 'master' into distributed_ddl_improvements 2021-03-09 20:06:41 +03:00
Alexander Tokmakov
83b3e4e0f5 allow to use Cluster from Replicated db 2021-03-09 20:05:24 +03:00
Maksim Kita
43ba554191
Merge pull request #20595 from kitaisreal/cache-dictionaries-lru-cache 
Cache dictionaries lru cache
 2021-03-09 19:14:30 +03:00
Amos Bird
b936619fa9
Rename 2021-03-09 22:00:04 +08:00
Vasily Nemkov
93a00cde5d
Update skip_list.json 2021-03-09 16:56:23 +03:00
Alexander Kuzmenkov
0de89e2925
Merge pull request #19401 from CurtizJ/aggregating-in-order 
Try improve performance of aggregation in order of sorting key
 2021-03-09 16:53:32 +03:00
Amos Bird
e9f8dd645e
Shard pruning via literals 2021-03-09 18:58:03 +08:00
Alexander Tokmakov
00b939e5a3 fix 2021-03-09 13:24:08 +03:00
alesapin
90d019a281
Merge pull request #21508 from ClickHouse/fix_stop_merges_global 
Fix global stop merges in test
 2021-03-09 11:37:13 +03:00
Azat Khuzhin
3474ea044e Avoid processing optimize_skip_unused_shards twice 2021-03-09 10:05:56 +03:00
vdimir
36006a7e96
Merge branch 'master' into cross-to-inner-join-rewrite 2021-03-09 09:36:15 +03:00
Vladimir
6ec19b2632
Merge pull request #19885 from ClickHouse/vdimir/join-cast-types-v2 2021-03-09 09:30:50 +03:00
Alexander Tokmakov
5c5d11cfce enable some tests 2021-03-09 03:48:37 +03:00
Kruglov Pavel
c464e3c57b
Merge pull request #21311 from ucasFL/fix-format 
improve clickhouse-format
 2021-03-09 02:16:05 +03:00
Pavel Kruglov
c3ddb1e337 Fix tests 2021-03-09 01:29:40 +03:00
Vasily Nemkov
ada200fa3d
Update skip_list.json 2021-03-09 01:03:40 +03:00
Alexander Tokmakov
2022b90919 configurable output mode for distributed DDL 2021-03-08 23:35:09 +03:00
vdimir
cc770ad441
Fixes for join key inferring 
Fix error with wrong right column type in aggregate with nulls

Add logging inferred type for join keys

Add test for join_use_nulls
 2021-03-08 17:21:50 +03:00
Vasily Nemkov
1711761459
Merge branch 'master' into governance/query_log 2021-03-08 10:52:27 +03:00
Azat Khuzhin
ed09897eb1 Pass optimize_skip_unused_shards_limit to the bottom layer 
And now optimize_skip_unused_shards_limit=0 is not a special case
anymore.
 2021-03-08 10:05:56 +03:00
Azat Khuzhin
16f4c02d42 Add optimize_skip_unused_shards_limit 
Limit for number of sharding key values, turns off
optimize_skip_unused_shards if the limit is reached
 2021-03-26 06:09:00 +03:00
Alexey Milovidov
460658aeab Update tests 2021-03-08 03:18:55 +03:00
Alexey Milovidov
6b309dcc5c Update tests 2021-03-08 03:14:39 +03:00
Alexey Milovidov
355411dfa8 Merge branch 'master' into DateTime64_extended_range 2021-03-08 02:55:14 +03:00
Maksim Kita
492c3d0899
Merge pull request #21321 from kitaisreal/dictionary-source-executable-pool 
Added ExecutablePool dictionary source
 2021-03-08 01:36:33 +03:00
Vasily Nemkov
8874d2e063 Avoid running 01702_system_query_log.sql in parallel 
Shouldn't be run in parallel with itself, since it relies on content of system.query_log
 2021-03-07 23:15:15 +02:00
alesapin
914fa48700 Fix global stop merges in test 2021-03-07 17:46:13 +03:00
Alexey Milovidov
d3b422a336 Update test 2021-03-07 10:10:15 +03:00
Alexey Milovidov
5cf42e87be Update test 2021-03-07 09:31:01 +03:00
Maksim Kita
aa1a16d2b9 Updated tests skiplists 2021-03-06 22:17:24 +03:00
feng lv
ba16896162 add --backslash option for clickhouse-format 
fix

fix

fix
 2021-03-06 12:29:16 +00:00
Nikita Mikhaylov
98707613b8 bump 2021-03-06 14:38:27 +03:00
Maksim Kita
8ea6c4b852 Updated Dictionaries default value handling 2021-03-06 14:37:56 +03:00
Maksim Kita
717a9b048a Fixed tests 2021-03-06 14:37:36 +03:00
Maksim Kita
6ab451d41d Updated tests 2021-03-06 14:36:37 +03:00
Maksim Kita
92b79420a4 Fixed ubsan test 2021-03-06 14:36:37 +03:00
Maksim Kita
e64b18fbac Added dictGet with multiple requested attributes 2021-03-06 14:36:37 +03:00
Maksim Kita
a22ec65e8a Fixed minor issues 2021-03-06 14:36:37 +03:00
Maksim Kita
2a5a9c6ca4 Fixed hierarchy tests 2021-03-06 14:36:37 +03:00
Maksim Kita
1460d57f97 Fixed segfault because of member order of destruction 2021-03-06 14:36:37 +03:00
Maksim Kita
dc0bb7485d Updated CacheDictionary 2021-03-06 14:36:37 +03:00
Azat Khuzhin
9c35e49878 Fix heap-buffer-overflow in highlighting multi-line comments 
Not closed multi-line comment returns the whole query, so it should not
be processed further with the lexer.

ASan report:

    :) /*=================================================================
    ==14889==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60400006ebc0 at pc 0x00000a8148ea bp 0x7fffffff8610 sp 0x7fffffff7dd8
    WRITE of size 16 at 0x60400006ebc0 thread T0
        0 0xa8148e9 in __asan_memcpy (/src/ch/tmp/upstream/clickhouse-asan+0xa8148e9)
        1 0xaa8a3a4 in DB::Client::highlight(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::vector<replxx::Replxx::Color, std::__1::allocator<replxx::Replxx::Color> >&) obj-x86_64-linux-gnu/../programs/client/Client.cpp:464:52
        2 0x25f7b6d8 in std::__1::__function::__policy_func<void (std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::vector<replxx::Replxx::Color, std::__1::allocator<replxx::Replxx::Color> >&)>::operator()(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::vector<replxx::Replxx::Color, std::__1::allocator<replxx::Replxx::Color> >&) const obj-x86_64-linux-gnu/../contrib/libcxx/include/functional:2221:16
        3 0x25f7b6d8 in std::__1::function<void (std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::vector<replxx::Replxx::Color, std::__1::allocator<replxx::Replxx::Color> >&)>::operator()(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::vector<replxx::Replxx::Color, std::__1::allocator<replxx::Replxx::Color> >&) const obj-x86_64-linux-gnu/../contrib/libcxx/include/functional:2560:12
        4 0x25f7b6d8 in replxx::Replxx::ReplxxImpl::render(replxx::Replxx::ReplxxImpl::HINT_ACTION) obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:546:3
        5 0x25f74059 in replxx::Replxx::ReplxxImpl::refresh_line(replxx::Replxx::ReplxxImpl::HINT_ACTION) obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:729:2
        6 0x25f6bc8f in replxx::Replxx::ReplxxImpl::insert_character(char32_t) obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:1197:3
        7 0x25f79347 in replxx::Replxx::ReplxxImpl::action(unsigned long long, replxx::Replxx::ACTION_RESULT (replxx::Replxx::ReplxxImpl::* const&)(char32_t), char32_t) obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:1130:29
        8 0x25f79347 in replxx::Replxx::ReplxxImpl::get_input_line() obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:1123:11
        9 0x25f7844c in replxx::Replxx::ReplxxImpl::input(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:455:8
        10 0x25af5693 in ReplxxLineReader::readOneLine(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) obj-x86_64-linux-gnu/../base/common/ReplxxLineReader.cpp:108:29
        11 0x25aed149 in LineReader::readLine(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) obj-x86_64-linux-gnu/../base/common/LineReader.cpp:81:26
        12 0xaa80ba2 in DB::Client::mainImpl() obj-x86_64-linux-gnu/../programs/client/Client.cpp:654:33
        13 0xaa756f5 in DB::Client::main(std::__1::vector<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, std::__1::allocator<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > > const&) obj-x86_64-linux-gnu/../programs/client/Client.cpp:280:20
        14 0x25c0c8b5 in Poco::Util::Application::run() obj-x86_64-linux-gnu/../contrib/poco/Util/src/Application.cpp:334:8
        15 0xaa4d050 in mainEntryClickHouseClient(int, char**) obj-x86_64-linux-gnu/../programs/client/Client.cpp:2724:23
        16 0xa848c3a in main obj-x86_64-linux-gnu/../programs/main.cpp:368:12
        17 0x7ffff7dcab24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
        18 0xa79b36d in _start (/src/ch/tmp/upstream/clickhouse-asan+0xa79b36d)

    0x60400006ebc0 is located 0 bytes to the right of 48-byte region [0x60400006eb90,0x60400006ebc0)
    allocated by thread T0 here:
        0 0xa84509d in operator new(unsigned long) (/src/ch/tmp/upstream/clickhouse-asan+0xa84509d)
        1 0x25f7af76 in void* std::__1::__libcpp_operator_new<unsigned long>(unsigned long) obj-x86_64-linux-gnu/../contrib/libcxx/include/new:235:10
        2 0x25f7af76 in std::__1::__libcpp_allocate(unsigned long, unsigned long) obj-x86_64-linux-gnu/../contrib/libcxx/include/new:261:10
        3 0x25f7af76 in std::__1::allocator<replxx::Replxx::Color>::allocate(unsigned long) obj-x86_64-linux-gnu/../contrib/libcxx/include/memory:840:38
        4 0x25f7af76 in std::__1::allocator_traits<std::__1::allocator<replxx::Replxx::Color> >::allocate(std::__1::allocator<replxx::Replxx::Color>&, unsigned long) obj-x86_64-linux-gnu/../contrib/libcxx/include/__memory/allocator_traits.h:468:21
        5 0x25f7af76 in std::__1::vector<replxx::Replxx::Color, std::__1::allocator<replxx::Replxx::Color> >::__vallocate(unsigned long) obj-x86_64-linux-gnu/../contrib/libcxx/include/vector:993:37
        6 0x25f7af76 in std::__1::vector<replxx::Replxx::Color, std::__1::allocator<replxx::Replxx::Color> >::vector(unsigned long, replxx::Replxx::Color const&) obj-x86_64-linux-gnu/../contrib/libcxx/include/vector:1155:9
        7 0x25f7af76 in replxx::Replxx::ReplxxImpl::render(replxx::Replxx::ReplxxImpl::HINT_ACTION) obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:543:19
        8 0x25f74059 in replxx::Replxx::ReplxxImpl::refresh_line(replxx::Replxx::ReplxxImpl::HINT_ACTION) obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:729:2
        9 0x25f6bc8f in replxx::Replxx::ReplxxImpl::insert_character(char32_t) obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:1197:3
        10 0x25f79347 in replxx::Replxx::ReplxxImpl::action(unsigned long long, replxx::Replxx::ACTION_RESULT (replxx::Replxx::ReplxxImpl::* const&)(char32_t), char32_t) obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:1130:29
        11 0x25f79347 in replxx::Replxx::ReplxxImpl::get_input_line() obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:1123:11
        12 0x25f7844c in replxx::Replxx::ReplxxImpl::input(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) obj-x86_64-linux-gnu/../contrib/replxx/src/replxx_impl.cxx:455:8
        13 0x25af5693 in ReplxxLineReader::readOneLine(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) obj-x86_64-linux-gnu/../base/common/ReplxxLineReader.cpp:108:29
        14 0x25aed149 in LineReader::readLine(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) obj-x86_64-linux-gnu/../base/common/LineReader.cpp:81:26
        15 0xaa80ba2 in DB::Client::mainImpl() obj-x86_64-linux-gnu/../programs/client/Client.cpp:654:33
        16 0xaa756f5 in DB::Client::main(std::__1::vector<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, std::__1::allocator<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > > const&) obj-x86_64-linux-gnu/../programs/client/Client.cpp:280:20
        17 0x25c0c8b5 in Poco::Util::Application::run() obj-x86_64-linux-gnu/../contrib/poco/Util/src/Application.cpp:334:8
        18 0xaa4d050 in mainEntryClickHouseClient(int, char**) obj-x86_64-linux-gnu/../programs/client/Client.cpp:2724:23
        19 0xa848c3a in main obj-x86_64-linux-gnu/../programs/main.cpp:368:12
        20 0x7ffff7dcab24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)

    SUMMARY: AddressSanitizer: heap-buffer-overflow (/src/ch/tmp/upstream/clickhouse-asan+0xa8148e9) in __asan_memcpy

v2: fix lexer instead of client quirk
 2021-03-06 12:23:41 +03:00
feng lv
d208013161 add test 
fix

fix

fix
 2021-03-06 05:03:53 +00:00
Alexey Milovidov
2b1ab0f927 Merge branch 'master' into DateTime64_extended_range 2021-03-06 02:25:43 +03:00
alexey-milovidov
af2135ef9d
Merge pull request #21477 from ClickHouse/fix_mutation_deadlock 
Fix deadlock in delete mutations when predicate contains table itself
 2021-03-06 02:08:00 +03:00
alexey-milovidov
af90658369
Merge pull request #21432 from azat/flaky-distributed-tests 
Fix flaky tests with distributed queries
 2021-03-06 02:04:07 +03:00
alexey-milovidov
5a100e246c
Merge pull request #21455 from den-crane/tests/issue_21413 
test for #21413
 2021-03-06 01:56:15 +03:00
vdimir
3da3794c7e
Add test for cast join on keys with second analyze 2021-03-05 17:58:46 +03:00
Anton Popov
562065732d Merge remote-tracking branch 'upstream/master' into HEAD 2021-03-05 17:30:05 +03:00
alesapin
aff86b1da2 Fix deadlock in delete mutations when predicate contains table itself 2021-03-05 15:32:55 +03:00
Maksim Kita
d3615aca67 Added tests 2021-03-05 13:17:46 +03:00
Vasily Nemkov
4a26e5cd43 Fixed tests + added DROP TABLE to see if it shows up in logs 2021-03-05 12:06:09 +02:00
Alexey Milovidov
c3110a611e Skip Arcadia 2021-03-05 05:06:49 +03:00
Alexey Milovidov
0f52c62ab0 Merge branch 'master' into dict-name-dot 2021-03-05 05:06:25 +03:00
Alexey Milovidov
3e77c9b1c5 Merge branch 'master' into DateTime64_extended_range 2021-03-05 03:07:19 +03:00
Nikita Mikhaylov
37d4c69d3a
Merge pull request #21433 from azat/parsing-exception-message-fix 
Fix ParsingException::displayText()
 2021-03-05 01:59:06 +03:00
Denis Zhuravlev
c0eefb644e test for #21413 2021-03-04 16:58:12 -04:00
Azat Khuzhin
7794ac66d4 Fix flaky tests with distributed queries 
There was few attempts to fix this [1] and [2], but it still pops up
sometimes, for example here [3].

  [1]: 009f57fc2f / #11211
  [2]: cdb6bed8b9 / #14198
  [3]: https://clickhouse-test-reports.s3.yandex.net/21318/38be9ff43ac4c46ce6e803fc125d910bde1d4c71/functional_stateless_tests_(release,_databasereplicated).html#fail1

Let's use more generic approach, and do not hide any errors (and see
does increasing timeout will be enough).
 2021-03-04 22:48:04 +03:00
Denis Zhuravlev
102a0b2c5d test for #21413 2021-03-04 10:46:01 -04:00