thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,267 Commits 8,938 Branches 1,766 Tags 2 GiB
c55a73b752
Commit Graph

1619 Commits

Author SHA1 Message Date
Vladimir Chebotarev
8ba8e8efd5 Added prefix-based S3 endpoint settings. 2021-01-25 06:40:57 +03:00
alexey-milovidov
be2d1deac2
Merge pull request #19431 from ClickHouse/integration_tests_forbid_check_call 
Integration tests: print stderr of failed subprocess
 2021-01-23 02:28:42 +03:00
Alexander Tokmakov
14e842c197 print stderr of failed subprocess 2021-01-22 17:27:23 +03:00
Ivan Lezhankin
c965e66a3b Increase timeout for crash report 2021-01-22 15:02:41 +03:00
Winter Zhang
7f68afa362
ISSUES-18684 fix MaterializeMySQL integration failure 2021-01-21 13:11:07 +08:00
Anton Ivashkin
357d98eb36 Merge master 2021-01-20 12:23:03 +03:00
Pavel Kruglov
97b5179e55 Implement HedgedRequests 2021-01-19 22:41:05 +03:00
Alexander Tokmakov
e2467427d1 Merge branch 'master' into update_cassandra 2021-01-19 14:10:15 +03:00
Alexander Tokmakov
7f97a11c84 Merge branch 'master' into database_replicated 2021-01-18 17:09:39 +03:00
Pavel Kovalenko
1e3a059f64 Merge remote-tracking branch 'origin/master' into disk-s3-backup-restore-metadata 
# Conflicts:
#	src/Disks/DiskCacheWrapper.cpp
#	src/Disks/S3/DiskS3.cpp
 2021-01-18 13:39:49 +03:00
Pavel Kovalenko
2dda8ed1e0 Ability to backup-restore metadata files for DiskS3 (minor fixes) 2021-01-18 13:37:09 +03:00
alexey-milovidov
d2366b5c6c
Merge pull request #18233 from vitlibar/fix-access-rights-for-select-count 
Fix access rights for SELECT count()
 2021-01-17 00:12:08 +03:00
alexey-milovidov
7de745ce77
Merge pull request #18554 from kssenii/pg2ch 
Add PostgreSQL table function, dictionary source, database engine
 2021-01-16 23:55:05 +03:00
Azat Khuzhin
7135faf672 Cover distributed send with different headers 2021-01-16 00:45:11 +03:00
Alexey Milovidov
b293d56a63 Merge branch 'master' into kssenii-pg2ch 2021-01-15 22:32:03 +03:00
alexey-milovidov
b97beea22a
Merge pull request #19101 from ClickHouse/check_compression_codec_read 
Fix compression codec read for empty files
 2021-01-15 20:55:58 +03:00
Alexey Milovidov
a19e7edd14 Merge branch 'master' into kssenii-pg2ch 2021-01-15 17:33:19 +03:00
alexey-milovidov
ca825f36f1
Merge pull request #18853 from azat/dist-send-checksums 
Improve checksum checks for async INSERT into Distributed on the sender
 2021-01-15 17:12:54 +03:00
alesapin
d601faa669
Merge pull request #18935 from fastio/bugfix_attach_partition_does_not_reset_mutation 
Bugfix: attach partition should reset the mutation
 2021-01-15 12:21:16 +03:00
alesapin
0662d6bd7d Fix compression codec read for empty files 2021-01-15 12:04:23 +03:00
Alexander Tokmakov
f2184eea5e try update cassandra driver library 2021-01-14 21:05:08 +03:00
Pavel Kovalenko
53389f79c0 Ability to backup-restore metadata files for DiskS3 (minor fixes) 2021-01-13 15:05:32 +03:00
alesapin
7650968b1e
Fix flaky test 2021-01-13 10:19:43 +03:00
alesapin
73e536a074
Merge pull request #18928 from ClickHouse/more_checks_in_writer_wide 
More checks in merge tree writer wide
 2021-01-13 09:59:45 +03:00
Pavel Kovalenko
b09862b7b9 Ability to backup-restore metadata files for DiskS3 (fixes and tests) 2021-01-12 20:18:40 +03:00
alesapin
f3e55183ad Better test and check 2021-01-12 11:46:31 +03:00
fastio
b43bd4d900 test 2021-01-12 12:54:59 +08:00
Pavel Kovalenko
0164965bc0 Fix get_process_pid 2021-01-11 20:40:11 +03:00
Pavel Kovalenko
0856b2c514 Ability to backup-restore metadata files for DiskS3 (fixes and tests) 2021-01-11 20:37:08 +03:00
tavplubix
213c653ef8
Merge pull request #17656 from bharatnc/ncb/ddl-worker-queue-table 
add  system.distributed_ddl_queue table
 2021-01-11 14:59:26 +03:00
Azat Khuzhin
22c07e7342 Update test_check_table expectations 
Since now CompressedReadBufferBase read checksum and header at once it
will expect 25 (16+9) bytes not 16 (only checksum)
 2021-01-11 08:05:56 +03:00
Azat Khuzhin
f09a53103f Add a test for corruption during distributed send 2021-01-10 18:17:14 +03:00
kssenii
fc9de76f7d Fix incorrect getCreateTableQueryImpl with multidim arrays 2021-01-10 09:00:35 +00:00
kssenii
0088d66d59 Hopefully better array conversions for insert query 2021-01-09 22:42:42 +00:00
Azat Khuzhin
471deab63a Rename fsync_tmp_directory to fsync_directories for Distributed engine 2021-01-09 17:51:30 +03:00
Azat Khuzhin
9cdb1d4ae6 Simple coverage of fsync_after_insert/fsync_tmp_directory with batching 2021-01-09 16:31:52 +03:00
alexey-milovidov
6dcb887eed
Merge pull request #18857 from amosbird/fixmaxpartitionremotesetting 
Correctly override default settings remotely
 2021-01-08 22:25:43 +03:00
Amos Bird
a3d19fa64d
Correctly override default settings remotely 2021-01-08 12:28:09 +08:00
bharatnc
24d67082a9 few more changes and simplification to integration test 2021-01-07 11:10:41 -08:00
bharatnc
57126d1901 Add values column and fix tests 2021-01-07 11:10:41 -08:00
bharatnc
f6d33c49bb DDLWorkerQueueTable - fix integration test 2021-01-07 11:10:41 -08:00
bharatnc
b008c49bd9 DDlWorkerQueueTable - add integration test 2021-01-07 11:10:40 -08:00
Amos Bird
63f0348291
Fix test 2021-01-07 11:31:23 +08:00
alexey-milovidov
72b142a00a
Merge branch 'master' into pg2ch 2021-01-06 23:18:59 +03:00
Amos Bird
a32f6dcf1b
Apply alter settings on cluster to all replicas 2021-01-06 20:08:46 +08:00
Alexey Milovidov
c7b678b752 Fix integration test 2021-01-04 02:20:12 +03:00
Nikolai Kochetov
3a1ec56486 Revert "Merge pull request #18411 from ClickHouse/try-fix-max_result_rows" 
This reverts commit 9a2b163db7, reversing
changes made to 5e97df7c29.
 2021-01-03 21:51:57 +03:00
Nikita Mikhaylov
f27aa148e0
Merge branch 'master' into parallel-parsing-input-format 2020-12-31 06:16:43 +04:00
Nikita Mikhaylov
99b4d2f9ba
Merge pull request #18636 from ClickHouse/revert-15316-copier-segfault 
Revert "Add some extra tests to copier"
 2020-12-31 03:43:51 +04:00
alexey-milovidov
9a2b163db7
Merge pull request #18411 from ClickHouse/try-fix-max_result_rows 
Use Port::Data instead of Chunk in LazyOutputFormat.
 2020-12-31 02:24:10 +03:00
Nikita Mikhailov
b6a27de508 Merge branch 'parallel-parsing-input-format' of github.com:nikitamikhaylov/ClickHouse into parallel-parsing-input-format 2020-12-30 18:23:05 +03:00
Nikita Mikhailov
8e31ce4a5c Merge branch 'master' of github.com:ClickHouse/ClickHouse into parallel-parsing-input-format 2020-12-30 18:22:11 +03:00
Nikita Mikhaylov
797c969c4d
Revert "Add some extra tests to copier" 2020-12-30 17:25:55 +03:00
Nikita Mikhaylov
736cc6959a
remove kafka flaky fix 2020-12-30 17:24:39 +03:00
alexey-milovidov
1bcdf37c36
Merge pull request #18614 from CurtizJ/fix-empty-parts 
Fix removing of empty parts in tables with old syntax
 2020-12-30 17:20:31 +03:00
Nikita Mikhailov
cc794b7a83 Merge branch 'master' of github.com:ClickHouse/ClickHouse into parallel-parsing-input-format 2020-12-30 16:55:15 +03:00
Vitaly Baranov
235ea220ec SELECT count() FROM table now requires at least one column to be accessible in the table. 2020-12-30 15:00:08 +03:00
Vitaly Baranov
460006b502
Merge pull request #18232 from vitlibar/fix-access-rights-for-select-join 
Fix access rights for SELECT JOIN.
 2020-12-30 14:42:16 +03:00
Nikita Mikhailov
2b90b4e01d Merge branch 'master' of github.com:ClickHouse/ClickHouse into parallel-parsing-input-format 2020-12-29 22:47:06 +03:00
filimonov
e81a99156f
Attempt to prevent test flap 
That extra SELECT is executed synchronously, after that all further actions will have a more stable timing.
 2020-12-29 18:51:00 +01:00
Anton Popov
6336fbf1df fix removing of empty parts in tables with old syntax 2020-12-29 20:16:57 +03:00
kssenii
c1eced8993 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into pg2ch 2020-12-29 15:09:53 +00:00
Alexander Tokmakov
ecc0339472 add test 2020-12-28 23:21:57 +03:00
Nikita Mikhailov
c3288c3fbf Merge branch 'master' of github.com:ClickHouse/ClickHouse into parallel-parsing-input-format 2020-12-28 15:09:37 +03:00
kssenii
8f8920a7ee Add table cache, better drop table 2020-12-27 15:52:15 +00:00
kssenii
00a37404ca Add postgresql database engine 2020-12-27 12:26:29 +00:00
kssenii
d95e8e2d74 Better 2020-12-27 12:18:59 +00:00
kssenii
375e8e9736 Add postgres dictionary source 2020-12-27 12:18:09 +00:00
kssenii
9cb2c75464 Add tests for storage 2020-12-27 12:17:56 +00:00
Vitaly Baranov
9271b3d627 SELECT JOIN now requires the SELECT privilege on each of the joined tables. 2020-12-26 18:35:32 +03:00
alesapin
c9bbde649c
Merge pull request #18312 from ClickHouse/simplier_coverage 
Make single image for building coverage report
 2020-12-25 10:18:39 +03:00
Nikita Mikhaylov
7d8a307bb2
Merge pull request #15316 from nikitamikhaylov/copier-segfault 
Add some extra tests to copier
 2020-12-25 03:08:12 +03:00
alesapin
303c4f98cc Add ability to collect coverage from integration tests 2020-12-24 18:51:53 +03:00
Nikita Mikhailov
63dc8c5462 better 2020-12-24 17:24:51 +03:00
Nikolai Kochetov
34cd4fea0e Fixing integrational test. 2020-12-24 12:05:14 +03:00
alexey-milovidov
c4bbb95b0f
Merge pull request #18405 from ClickHouse/add_test_for_compact_parts 
Add test for already working code
 2020-12-24 01:24:09 +03:00
Nikita Mikhailov
7ac7d991ad replace word anime with word big 2020-12-23 22:02:53 +03:00
Nikita Mikhailov
a35ef5ace3 better 2020-12-23 21:59:27 +03:00
alesapin
e3d9f4739d
Update test.py 2020-12-23 15:06:21 +03:00
alesapin
28aef2ddd4
Update test.py 2020-12-23 15:05:55 +03:00
alesapin
af53559b4f
Update test.py 2020-12-23 15:05:25 +03:00
alesapin
5fc3da74d0
Update test.py 2020-12-23 15:04:29 +03:00
alesapin
54455b4740 Add test for already working code 2020-12-23 14:53:49 +03:00
Nikita Mikhailov
dcfbe782c6 Merge branch 'master' of github.com:ClickHouse/ClickHouse into parallel-parsing-input-format 2020-12-23 05:20:22 +03:00
Nikita Mikhaylov
1e12290e2d
Update task_many_to_one.xml 2020-12-23 04:26:23 +03:00
nikitamikhaylov
ffce2a490b done 2020-12-23 01:46:40 +03:00
Amos Bird
c974fb8948
Remove obtrusive tests 2020-12-22 18:42:18 +08:00
alexey-milovidov
7ec772f480
Merge pull request #18129 from ClickHouse/boringssl2 
Port to BoringSSL (part 2)
 2020-12-18 18:00:10 +03:00
alexey-milovidov
0d9519a0a2
Merge pull request #17567 from ClickHouse/insert_quorum_parallel-default 
Insert quorum parallel by default
 2020-12-18 08:08:26 +03:00
Alexey Milovidov
6c62301894 Merge branch 'master' of github.com:yandex/ClickHouse into boringssl2 2020-12-18 07:59:18 +03:00
Alexey Milovidov
56054b90f6 Change format of dhparam in integration test 2020-12-18 06:35:20 +03:00
Nikita Mikhailov
6a55e018e4 Merge branch 'master' of github.com:ClickHouse/ClickHouse into parallel-parsing-input-format 2020-12-18 02:25:32 +03:00
tavplubix
8bc9d8ed7e
Merge pull request #18198 from ClickHouse/materialize_mysql_optimize_on_insert 
Enable optimize_on_insert for MaterializeMySQL
 2020-12-18 01:50:32 +03:00
alesapin
799997db35
Merge pull request #16621 from arenadata/ADQM-148 
HDFS configuration and Kerberos Authenticaiton
 2020-12-17 23:16:58 +03:00
Vitaly Baranov
b9c537ac37
Merge pull request #18104 from vitlibar/fix-access-rights-for-merge-table-function-2 
Fix access rights required for the merge() table function #2.
 2020-12-17 22:59:33 +03:00
alesapin
82ed528d98
Merge pull request #18191 from ClickHouse/hard_watches_test 
Test watches for in-memory zookeeper
 2020-12-17 22:51:52 +03:00
Alexey Milovidov
e4433157e7 Merge branch 'master' into insert_quorum_parallel-default 2020-12-17 22:42:32 +03:00
Alexey Milovidov
c2b0f9d530 Update integration test 2020-12-17 22:42:15 +03:00
Nikita Mikhailov
fbf2ac35e8 fix tsan 2020-12-17 18:14:09 +03:00
Alexander Tokmakov
52ef4289fe enable optimize_on_insert for MaterializeMySQL 2020-12-17 16:05:38 +03:00
alesapin
fa266790b4 Better test 2020-12-17 14:29:29 +03:00
tavplubix
7e73b6acd8
Merge pull request #17642 from filimonov/detach-permanently 
DETACH TABLE PERMANENTLY
 2020-12-17 14:26:51 +03:00
alesapin
b6bd84df84 One more test for watches 2020-12-17 14:25:59 +03:00
Vitaly Baranov
da18af96a3 Fix access rights required for the merge() table function. 2020-12-17 12:29:07 +03:00
alesapin
66228f4054
Merge pull request #18065 from ClickHouse/fix_watch_race_testkeeper 
Remove dead list watches from TestKeeperStorage
 2020-12-17 10:15:30 +03:00
alesapin
422467628a Merge branch 'master' into fix_watch_race_testkeeper 2020-12-16 19:45:57 +03:00
Anton Ivashkin
0f0500ca0c Merge master 2020-12-16 18:31:13 +03:00
Mikhail Filimonov
f14cafee51
Fix tests 2020-12-16 16:06:43 +01:00
Pervakov Grigorii
4edbb42ba1 Use IDisk in Set and Join storages 2020-12-16 14:58:44 +03:00
Ilya Golshtein
fc0a1af214 doc minor changes, cleanup, krb5-user as a recommended package 2020-12-16 14:48:33 +03:00
Ilya Golshtein
7e97814859 cleanup, fixes, new submodules, ShellCommand, WriteBufferFromString 2020-12-16 14:48:33 +03:00
Ilya Golshtein
d1d657335b USE_INTERNAL_HDFS3_LIBRARY + bash lint 2020-12-16 14:48:33 +03:00
Ilya Golshtein
d9166a0645 HADOOP_SECURE_DN_USER way, kinit thread, docker capabilities 2020-12-16 14:48:33 +03:00
Ilya Golshtein
eb10948ca2 kerberized_hdfs cluster started 2020-12-16 14:48:33 +03:00
Ilya Golshtein
185ac744b1 kerberized hdfs compiled 2020-12-16 14:48:33 +03:00
Alexey Milovidov
62ce33153a Added valuable comment 2020-12-16 06:34:25 +03:00
alesapin
dff71850a8 Merge branch 'master' into fix_watch_race_testkeeper 2020-12-15 19:04:24 +03:00
alexey-milovidov
22aba554c0
Revert "Fix access rights required for the merge() table function." 2020-12-15 18:07:20 +03:00
Nikolai Kochetov
6defcbb662
Merge branch 'master' into optimize-data-on-insert 2020-12-15 16:50:42 +03:00
alesapin
9d17f01dc9 Merge branch 'master' into fix_watch_race_testkeeper 2020-12-15 13:41:04 +03:00
Vitaly Baranov
5a8c750b0b
Merge pull request #17983 from vitlibar/fix-access-rights-for-merge-table-function 
Fix access rights required for the merge() table function.
 2020-12-15 09:17:52 +03:00
alexey-milovidov
363ff79cca
Merge pull request #17934 from Jokser/s3-adaptive-single-part-upload 
Adaptive choose of single/multi part upload in WriteBufferFromS3
 2020-12-14 23:00:43 +03:00
alesapin
73780838a1 Remove dead list watches 2020-12-14 19:01:29 +03:00
tavplubix
dd2ae6926d
Merge pull request #14849 from ClickHouse/allow_atomic_database_inside_materialize_mysql 
Allow Atomic database inside MaterializeMySQL
 2020-12-14 16:27:13 +03:00
alexey-milovidov
d55c5bec94
Merge pull request #18053 from azat/librdkafka-snappy-UB-fix 
Fix possible corruption in librdkafka snappy decompression
 2020-12-14 13:59:11 +03:00
Vitaly Baranov
a98e2311f8
Merge pull request #17908 from vitlibar/fix-checking-introspection-grants 
Fix checking introspection grants
 2020-12-14 12:10:17 +03:00
Pavel Kovalenko
346c241c20 Merge remote-tracking branch 'origin/master' into s3-adaptive-single-part-upload 
# Conflicts:
#	src/Disks/S3/DiskS3.cpp
 2020-12-14 11:00:30 +03:00
Azat Khuzhin
2e569899d1 Add a test for kafka with snappy compression method (regression for UB in snappy) 
I've checked it manually and it works with clang build and does not with
gcc (there are NULL bytes in the middle of value).
 2020-12-14 00:38:07 +03:00
Vitaly Baranov
9310437920 Fix access rights required for the merge() table function. 2020-12-13 23:34:53 +03:00
Alexander Tokmakov
7f7eed4031 fix test 2020-12-13 17:57:15 +03:00
Alexander Tokmakov
0c80fce7f0 Merge branch 'master' into allow_atomic_database_inside_materialize_mysql 2020-12-13 17:56:50 +03:00
Pavel Kovalenko
c2c497e290 Use s3 disk explicitly for log tables in test_log_family_s3. 2020-12-12 16:44:19 +03:00
alexey-milovidov
656a9222ac
Merge pull request #18000 from ClickHouse/filimonov-kafka-flaky-test 
kafka test_premature_flush_on_eof flap
 2020-12-12 02:29:26 +03:00
Pavel Kovalenko
59a5e63417 Merge remote-tracking branch 'origin/master' into s3-adaptive-single-part-upload 
# Conflicts:
#	src/Disks/S3/DiskS3.cpp
#	src/Disks/S3/DiskS3.h
#	src/Disks/S3/registerDiskS3.cpp
#	src/IO/WriteBufferFromS3.cpp
#	src/IO/WriteBufferFromS3.h
 2020-12-11 18:28:41 +03:00
Alexander Tokmakov
ed355f8663 fix 2020-12-11 16:50:45 +03:00
Vitaly Baranov
1b3893bcab User with allow_ddl=0 cannot do DDL but can grant DDL. 2020-12-11 16:38:49 +03:00
Vitaly Baranov
648be453a4 User with allow_introspection_functions=0 cannot call introspection functions but can grant INTROSPECTION. 2020-12-11 16:38:49 +03:00
Alexander Tokmakov
58a31e4882 Merge branch 'master' into allow_atomic_database_inside_materialize_mysql 2020-12-11 16:14:03 +03:00
filimonov
8e2ca9518b
Update test.py 
adjusting timeouts a bit, in the good hope that it will prevent flakiness of the test.
 2020-12-11 10:13:03 +01:00
Kruglov Pavel
9a785dbbf5
Merge branch 'master' into disk-s3-send-metadata 2020-12-10 20:17:41 +03:00
Vladimir Chebotarev
39d867e56d
Added proper authentication for S3 client (#16856) 2020-12-10 12:19:42 +03:00
alesapin
850f903d40 Merge branch 'master' into complete_zk_api 2020-12-09 18:18:38 +03:00
Pavel Kovalenko
db7a87089b Adaptive choose of single/multi part upload in WriteBufferFromS3. 2020-12-09 17:09:04 +03:00
Pavel Kovalenko
dfbb31174e Ability to set metadata when put S3 object 2020-12-08 21:31:57 +03:00
alesapin
8b0fe1404a Tiny sleeps 2020-12-08 17:50:10 +03:00
alesapin
3d0dbbe411 Fix build 2020-12-08 17:49:18 +03:00
alesapin
91e3162e09 More correct session close 2020-12-08 17:28:51 +03:00
Ivan
0ba712a2d3
Merge branch 'master' into allow_atomic_database_inside_materialize_mysql 2020-12-08 16:45:51 +03:00
alesapin
f4231d552e Banch of fixes 2020-12-08 16:28:39 +03:00
Kruglov Pavel
e19eb6f17a
Merge branch 'master' into optimize-data-on-insert 2020-12-08 15:57:46 +03:00
Vitaly Baranov
ad01e877be Mark grpc protocol's tests as non-flaky. 2020-12-07 23:40:02 +03:00
Vitaly Baranov
559afe028f Retrieve logs from grpc library and pass them to our logging system. 2020-12-07 23:39:55 +03:00
Vitaly Baranov
b8faa1663f Fix configs in tests. 2020-12-07 22:02:18 +03:00
alesapin
b5d2559626
Merge pull request #17709 from kssenii/better-startup 
rabbitmq: fix startup with no connection
 2020-12-07 19:08:18 +03:00
alesapin
710550f8e5 Kill container with retries 2020-12-07 12:25:27 +03:00
Azat Khuzhin
ea64ec390f Fix flaky test_ttl_move 
- replace sleep() with waiting for the message in log
- due to previous paragaph, use unique table names
- increase sleep timeout in some places
 2020-12-04 21:27:50 +03:00
Pavel Kruglov
905ba78adc Merge branch 'master' of github.com:ClickHouse/ClickHouse into optimize-data-on-insert 2020-12-04 18:56:46 +03:00
alesapin
7c2a04d77d
Merge pull request #17671 from ClickHouse/update_integration_tests_image 
Update docker image in integration tests runner
 2020-12-04 15:51:08 +03:00
kssenii
ebab21178e Fix, add test 2020-12-02 18:45:30 +00:00
Alexander Tokmakov
a0ef3a113a Merge branch 'master' into allow_atomic_database_inside_materialize_mysql 2020-12-02 18:29:02 +03:00
tavplubix
7e2f7ba623
trigger CI 2020-12-02 18:03:15 +03:00
alesapin
5065d9c64b Merge branch 'master' into update_integration_tests_image 2020-12-02 13:58:24 +03:00
TCeason
08d36f862d
Merge branch 'master' into add_mysql_killed_test_for_materializemysql 2020-12-02 13:25:07 +08:00
alesapin
51f49e3d47 Check output of cluster start cmd 2020-12-01 23:23:32 +03:00
alexey-milovidov
de77715cb6
Merge pull request #17662 from vitlibar/mark-grpc-protocol-tests-as-flaky 
Mark grpc protocol's tests as flaky.
 2020-12-01 22:05:17 +03:00
Alexander Tokmakov
19c8399eb0 Merge branch 'master' into database_replicated 2020-12-01 17:33:07 +03:00
tavplubix
0b5261b1af
Merge pull request #17622 from TCeason/add_clickhouse_killed_test_for_materializemysql 
add integration test: ClickHouse killed while insert for MaterializeMySQL ENGINE
 2020-12-01 12:52:52 +03:00
Vitaly Baranov
7f093c4f9a Mark grpc protocol's tests as flaky. 2020-12-01 12:38:51 +03:00
Alexander Tokmakov
ab197a49c8 better code, fixes 2020-11-30 23:12:43 +03:00
taichong
5b9d9376c3 add integration test: ClickHouse killed while insert for MaterializeMySQL ENGINE 2020-11-30 17:33:31 +08:00
taichong
6d8cf30f5d add integration test: MySQL killed while insert for MaterializeMySQL ENGINE 2020-11-30 16:31:09 +08:00
Alexey Milovidov
1711d428eb Fix GRPC tests 2020-11-30 09:34:46 +03:00
alesapin
1d179dac22
Merge pull request #17486 from ClickHouse/fix_more_flaky_tests 
Fix more flaky integration tests
 2020-11-28 10:43:29 +03:00
tavplubix
aaaa7ad59f
Merge pull request #16806 from TCeason/add_test_for_materialize_mysql 
add network partition integration test for MaterializeMySQL
 2020-11-27 20:39:06 +03:00
Alexander Tokmakov
9e3fd3c170 Merge branch 'master' into database_replicated 2020-11-27 17:08:34 +03:00
Alexander Tokmakov
f1a52a609b separate DatabaseReplicatedDDLWorker 2020-11-27 17:04:03 +03:00
Nikita Mikhaylov
0b6f5c75b9
Merge pull request #17435 from vitlibar/grpc-protocol-2 
Implement GRPC protocol (corrections)
 2020-11-27 15:19:50 +03:00
alesapin
17fa29f44f Less pulls of network image 2020-11-27 14:38:04 +03:00
alesapin
f12ba9f2c1 Fix test 2020-11-27 14:26:42 +03:00
alesapin
50cf7fda39 Less flaky test_realod_zookeeper 2020-11-27 14:05:59 +03:00
alexey-milovidov
dfae1efbbd
Merge pull request #17070 from fastio/master 
Support multiple ZooKeeper clusters
 2020-11-27 10:38:01 +03:00
taichong
c8f7a56a25 fix CI timeout err 2020-11-27 11:34:49 +08:00
Nikita Mikhaylov
084c75fa6e
Merge pull request #17309 from nikitamikhaylov/merging-sequential-consistency 
Merging #16309
 2020-11-26 15:26:05 +03:00
Vitaly Baranov
1fc43b3c93 Remove trailing whitespaces in config.xml 2020-11-26 10:27:04 +03:00
Vitaly Baranov
49cf980761 Use port 9100 for grpc by default. 2020-11-26 10:14:27 +03:00
Nikita Mikhaylov
27acf6462f
Merge pull request #17248 from kaka11chen/15235 
Fix #15235. When clickhouse-copier handle non-partitioned table, throws segfault error.
 2020-11-25 14:31:59 +03:00
alesapin
3e1b2f515b
Merge pull request #17311 from ClickHouse/fix_integration_tests 
Fix some flaky tests
 2020-11-25 10:09:27 +03:00
chenqi
302cd55f45 Fix #15235. When clickhouse-copier handle non-partitioned table, throw segfault error. 2020-11-25 11:52:00 +08:00
Vitaly Baranov
4b3488934c Disable running test test_odbc_interaction.test_bridge_dies_with_parent with asan. 2020-11-24 17:55:02 +03:00
Vitaly Baranov
3c85165e60 Redirect stderr, stdout for clickhouse-odbc-bridge to files. 2020-11-24 17:55:02 +03:00
Vitaly Baranov
950bccb130 Add test for authentication. 2020-11-24 17:55:02 +03:00
Vitaly Baranov
a0e384b0c0 Added support for external tables. 2020-11-24 17:55:02 +03:00
Vitaly Baranov
23842e7ac6 Added support for input() function. 2020-11-24 17:55:02 +03:00
Vitaly Baranov
0e3a8840b5 Support cancellation of executing query via gRPC. 2020-11-24 17:55:02 +03:00
Vitaly Baranov
88f1eeec2f Add tests for parallel executing of queries. 2020-11-24 17:55:02 +03:00
Vitaly Baranov
eab3006a4d Support SSL and compression when using gRPC protocol. 2020-11-24 17:55:02 +03:00
Vitaly Baranov
b0cb3eb306 Extend the protocol with streaming and nonstreaming functions. 2020-11-24 17:55:01 +03:00
Vitaly Baranov
b51e14253d Added support for sessions in gRPC protocol. 2020-11-24 17:55:01 +03:00
Vitaly Baranov
9285f7edc1 Send profile info to client. 2020-11-24 17:55:01 +03:00
Vitaly Baranov
98e2cc4117 Fix sending progress. 2020-11-24 17:55:01 +03:00
Vitaly Baranov
4f0405af93 Send logs via gRPC protocol too. 2020-11-24 17:55:01 +03:00
Vitaly Baranov
218d9ea3e8 Added input_data_delimiter to protocol. 2020-11-24 17:55:01 +03:00
Vitaly Baranov
797c84889f Use ReadBuffer to join input data from multiple query infos. 
That fixes inserting of a row splitted between two query infos.
 2020-11-24 17:55:01 +03:00
Vitaly Baranov
63c8d8124a Added test for inserting to columns with defaults. 2020-11-24 17:55:01 +03:00
Vitaly Baranov
de4586739a Fix using output format. 2020-11-24 17:55:01 +03:00
Vitaly Baranov
8146093794 Provide more information about errors. 2020-11-24 17:55:01 +03:00
Vitaly Baranov
a327f24e3c Refine the protocol. Code cleanup in tests. 2020-11-24 17:53:34 +03:00
Vitaly Baranov
db9f762e73 Fix tests. 2020-11-24 17:53:34 +03:00
Vitaly Baranov
13f2352c57 Move files to right places. 2020-11-24 17:53:34 +03:00
mnkonkova
6cd1557d67 Implement GRPC protocol. 2020-11-24 17:53:34 +03:00
Alexander Tokmakov
e82c63e05c fixes 2020-11-24 15:28:54 +03:00
Alexander Tokmakov
dce0bf8efc Merge branch 'master' into allow_atomic_database_inside_materialize_mysql 2020-11-24 15:28:31 +03:00
Nikita Mikhaylov
6787f98476
Merge pull request #14958 from nikitamikhaylov/refactor_cache_dictionary 
Refactor cache dictionary
 2020-11-24 14:55:02 +03:00
nikitamikhaylov
5be300ff22 Merge branch 'master' of github.com:ClickHouse/ClickHouse into merging-sequential-consistency 2020-11-24 14:46:57 +03:00
Alexander Tokmakov
5ccf975a4a Merge branch 'master' into database_replicated 2020-11-24 14:38:02 +03:00
Alexander Tokmakov
dad21ee684 maintain metadata in zk 2020-11-24 13:24:39 +03:00
alesapin
45f09fe293
Merge pull request #17220 from ianton-ru/s3_max_redirects 
S3 max redirects
 2020-11-24 12:13:10 +03:00
alesapin
b05385cec0 Remove code from test which copy-pasted from another test 2020-11-24 11:17:37 +03:00
alesapin
cb234e28ea Fix garbage test 2020-11-24 11:09:10 +03:00
alesapin
5477984856 Longer integration tests for rabbitMQ 2020-11-24 10:33:35 +03:00
taichong
b5440882cd remove kill server while insert 2020-11-24 10:11:04 +08:00
alesapin
db1aef8994 More retries 2020-11-23 23:44:46 +03:00
alesapin
3d177d414a Merge branch 'master' into fix_integration_tests 2020-11-23 23:27:46 +03:00
alexey-milovidov
ac710ff0b7
Merge pull request #17299 from Jokser/flaky-s3-test-custom-auth-headers 
Fixed flaky test_storage_s3::test_custom_auth_headers
 2020-11-23 20:33:48 +03:00
alesapin
1c5da1c178 Better timeouts 2020-11-23 19:39:57 +03:00
alesapin
c9b382b4af Fix flaky integration tests 2020-11-23 17:40:32 +03:00
nikitamikhaylov
065cd00257 better 2020-11-23 17:24:32 +03:00
nikitamikhaylov
68bef22fda Merge branch 'master' of github.com:ClickHouse/ClickHouse into merging-sequential-consistency 2020-11-23 16:28:35 +03:00
tavplubix
7af89cba8a
Merge pull request #16715 from zhang2014/fix/ISSUES-16605 
ISSUES-16605 fix without returning affected rows when insert select query in MySQL handler
 2020-11-23 15:54:43 +03:00
Anton Ivashkin
aa208a9d9f Use only 's3_max_redirect' in params instead of all settings 2020-11-23 14:02:17 +03:00
Pavel Kovalenko
5f98d38689 Fixed flaky test_storage_s3::test_custom_auth_headers 2020-11-23 13:19:43 +03:00
taichong
a6c2a90756 modify integration test materialize mysql database 
1. fix asan test err

2. reset pymysql conn if ping err

3. finish mysql & ck killed test

4. modify check_query
 2020-11-23 17:55:07 +08:00
taichong
f99d6ea799 add ck & mysql killed while insert 2020-11-23 15:47:44 +08:00
taichong
122740767f add integration test err 2020-11-23 15:47:44 +08:00
taichong
714767f491 make it normal 2020-11-23 15:47:44 +08:00
taichong
5a50535abc add mysql kill sync id test 2020-11-23 15:47:44 +08:00
taichong
81bdf50085 add some except error test 2020-11-23 15:47:44 +08:00
taichong
e691b4a0d4 add network partition integration test for MaterializeMySQL 2020-11-23 15:47:44 +08:00
taichong
e8628f61e0 add mysql kill sync id test 2020-11-23 15:47:44 +08:00
taichong
3287f691ee add some except error test 2020-11-23 15:47:44 +08:00
taichong
5c3d4b2245 add network partition integration test for MaterializeMySQL 2020-11-23 15:47:44 +08:00
alesapin
9c8b0da382
Merge pull request #16033 from nvartolomei/nv/parts-uuid 
Add unique identifiers IMergeTreeDataPart structure
 2020-11-22 16:13:19 +03:00
zhang2014
e1e5eede86 ISSUES-16605 try fix integration failure 2020-11-22 20:13:56 +08:00
zhang2014
5b3154b298 ISSUES-16605 try fix integration test failure 2020-11-22 20:13:56 +08:00
zhang2014
a6dbba5932 ISSUES-16605 add integration test 2020-11-22 20:13:56 +08:00
Nicolae Vartolomei
7c8bc1c04e Use JSON metadata in WAL 2020-11-20 13:49:17 +00:00
Nicolae Vartolomei
94293ca3ce Assign UUIDs to parts only when configured to do so 
Avoid breaking backwards compatibility by default for now.
 2020-11-20 13:49:17 +00:00
Pavel Kruglov
e5588b94aa Fix style and tests 2020-11-20 13:38:53 +03:00
tavplubix
3e335c1e95
Merge pull request #17091 from zhang2014/fix/binlog_checksum 
Fix MaterializeMySQL SYNC failure when modify binlog_checksum
 2020-11-20 13:25:14 +03:00
Anton Ivashkin
a7d4f4be65 Add 's3_max_redirects' test 2020-11-20 11:18:44 +03:00
Pavel Kruglov
608722b6ab Fix integration tests 2020-11-20 02:59:58 +03:00
Nicolae Vartolomei
425dc4b11b Add unique identifiers IMergeTreeDataPart structure 
For now uuids are not generated at all, they are present only if the
part is updated manually (as you can see in the integration test).

The only place where they can be seen today by an end user is in
`system.parts` table. I was looking for hiding this column behind an
option but couldn't find an easy way to do that.

Likely this is also required for WAL, but need to think how not to break
compatibility.

Relates to #13574, https://github.com/ClickHouse/ClickHouse/issues/13574

Next 1: In the upcoming PR the plan is to integrate de-duplication based on
these fingerprints in the query pipeline.

Next 2: We'll enable automatic generation of uuids and come up with a
way for conditionally sending uuids when processing distributed queries
only when part movement is in progress.
 2020-11-19 13:14:25 +00:00
tavplubix
8b6fbea199
trigger CI 2020-11-19 12:47:24 +03:00
Peng Jian
3c86c8b3c9 fix test cases 2020-11-19 15:44:47 +08:00
Peng Jian
d8ae52118b add test 2020-11-19 15:44:47 +08:00
zhang2014
9df9691ccb Try fix integration test 2020-11-19 13:01:23 +08:00
nikitamikhaylov
13e711b27e rename back config 2020-11-18 16:38:14 +03:00
nikitamikhaylov
70a08608f8 add reload dictionary 2020-11-17 20:58:31 +03:00
nikitamikhaylov
663730c758 try to fix flaky test 2020-11-17 20:33:07 +03:00
nikitamikhaylov
9c6b896928 style + flaky test fix 2020-11-17 17:36:04 +03:00
nikitamikhaylov
31b1f644c1 better 2020-11-17 16:59:13 +03:00
nikitamikhaylov
fbd0d14dd6 save 2020-11-17 16:59:12 +03:00
nikitamikhaylov
9b46b53fa3 better defaults 2020-11-17 16:59:12 +03:00
nikitamikhaylov
028fc00166 fix tests 2020-11-17 16:59:12 +03:00
zhang2014
b4fc2ecc00 Try fix integration test 2020-11-17 09:41:35 +08:00
alesapin
5dd32819f5 Merge branch 'master' into fix_ddl_worker_non_leader 2020-11-16 22:34:16 +03:00
Winter Zhang
f6a205d64b
Merge branch 'master' into fix/binlog_checksum 2020-11-16 21:53:22 +08:00
zhang2014
6ef93ac73c Try fix MaterializeMySQL SYNC with modify binlog_checksum 2020-11-16 21:46:36 +08:00
alesapin
6759932c61 Remove accident changes 2020-11-16 15:49:08 +03:00
alesapin
f839742288 Add a test 2020-11-16 15:47:02 +03:00
TCeason
45bacd6f74 Merge branch 'master' into add_sync_user_privs_exception 2020-11-16 12:59:44 +08:00
ubuntu
f7b60c17f5 make test stable 2020-11-13 20:38:28 +08:00
alesapin
8d3858fc22
Merge pull request #16895 from CurtizJ/remove-empty-parts 
Remove empty parts after they were pruned by TTL [2]
 2020-11-13 10:00:18 +03:00
taichong
829037b487 Merge branch 'add_sync_user_privs_exception' of https://github.com/TCeason/ClickHouse into add_sync_user_privs_exception 2020-11-13 13:26:19 +08:00
Alexander Tokmakov
0731bfb7be Merge branch 'master' into database_replicated 2020-11-12 21:04:18 +03:00
Anton Popov
4cecd89e84 fix dropping of empty parts 2020-11-12 20:37:54 +03:00
Alexander Tokmakov
2a6c0b9180 try reuse DDLWorker in DatabaseReplicated 2020-11-12 20:35:29 +03:00
taichong
fefa2a2548 add log std out 2020-11-12 22:24:22 +08:00
Anton Popov
0aa35d53c7 Merge remote-tracking branch 'upstream/master' into HEAD 2020-11-12 14:31:58 +03:00
alesapin
a8d466a645 Merge branch 'master' into add_separate_pool_for_fetches 2020-11-12 12:51:02 +03:00
taichong
091df85cdc modify test db name 2020-11-12 09:49:12 +08:00
TCeason
3912ed4965 Merge branch 'master' into add_sync_user_privs_exception 2020-11-12 09:34:08 +08:00
taichong
e2a9fe44b0 modify test error 2020-11-12 08:17:13 +08:00
Anton Popov
2497598a49 Remove empty parts after they were pruned by TTL 2020-11-11 19:19:43 +03:00
Pavel Kovalenko
e311759c5d
Abort multipart upload if no data was written to WriteBufferFromS3. (#16840) 2020-11-11 15:15:16 +03:00
taichong
f4f4379168 modify test case add precheck 2020-11-11 19:36:09 +08:00
taichong
6c8b5b573b modify test for Integration Tests Flaky Check 2020-11-11 19:36:09 +08:00
taichong
e5da2d4086 print mysql result for test 2020-11-11 19:35:39 +08:00
taichong
64acfea79c throw exception when mysql sync user privs error. 2020-11-11 19:32:28 +08:00
taichong
5c1a01897a Revise the code according to the review 2020-11-11 19:27:37 +08:00
taichong
aecb9716e1 print mysql result for test 2020-11-11 19:27:37 +08:00
taichong
2f6510d75b try to fix ci failed 2020-11-11 19:27:37 +08:00
taichong
d907afa77e throw exception when mysql sync user privs error. 2020-11-11 19:27:37 +08:00
alesapin
637e3dc2c2
Merge pull request #16627 from amosbird/zkc 
reload auxiliary zookeepers configuration
 2020-11-11 10:00:22 +03:00
alesapin
2e357516a6 Merge branch 'master' into add_separate_pool_for_fetches 2020-11-10 13:53:08 +03:00
Vladimir Chebotarev
059357d51e
ALTER UPDATE/DELETE ... IN PARTITION with partition pruning in ReplicatedMergeTree (#13403) 
Co-authored-by: Alexander Kazakov <Akazz@users.noreply.github.com>
 2020-11-10 13:23:46 +03:00
Amos Bird
aa8e6db786
reload auxiliary zookeepers configuration 2020-11-10 15:56:37 +08:00
alesapin
a056379ec1 Remove duplicate code 2020-11-09 12:25:50 +03:00
alesapin
cedaa938f3 Add simple integration test 2020-11-09 12:10:32 +03:00
alexey-milovidov
7acfa7d407
Merge pull request #16728 from azat/enable-use_compact_format_in_distributed_parts_names-by-default 
Enable use_compact_format_in_distributed_parts_names by default
 2020-11-07 13:40:54 +03:00
alexey-milovidov
712a35bb7b
Merge pull request #16762 from filimonov/kafka-protobuf-issue12615 
Test for the issue #12615
 2020-11-07 13:40:19 +03:00
Azat Khuzhin
ac8df08186 Set use_compact_format_in_distributed_parts_names=0 for some integration tests 
To avoid depends from default.
 2020-11-06 21:02:44 +03:00
Mikhail Filimonov
b072bc7d2b
Test for the issue #12615 2020-11-06 17:54:44 +01:00
alexey-milovidov
654d127ce6
Merge pull request #16630 from sundy-li/patch-6 
better change the config
 2020-11-04 11:36:07 +03:00
alexey-milovidov
09805399d9
Merge pull request #16560 from azat/test_input_format_parallel_parsing_memory_tracking-flackiness 
Fix test_input_format_parallel_parsing_memory_tracking flackiness
 2020-11-04 01:37:25 +03:00
sundy-li
dea4bd483e remove unused codes2 2020-11-03 19:40:45 +08:00
sundy-li
9cfeb9fd32 remove unused codes 2020-11-03 18:13:48 +08:00
sundy-li
72bde1c688 better change the config 2020-11-03 17:32:31 +08:00
Anton Ivashkin
1742fb3256 Merge master 2020-11-03 12:27:16 +03:00
Alexander Kuzmenkov
de3451d9a4
Merge pull request #16411 from excitoon-favorites/fixflappyafterasyncdrops 
Remove redundant diagnostics and fixed `test_jbod_overflow`
 2020-11-02 19:26:58 +03:00
alesapin
7f8560e0c0
Merge pull request #16538 from amosbird/fp2 
Allow fetching duplicate parts to detach
 2020-11-02 16:10:42 +03:00
Amos Bird
643ee05288
add integration test 2020-11-01 16:02:09 +08:00
Azat Khuzhin
2832255164 Increase asynchronous_metrics_update_period_s to avoid syncing MemoryTracking with RSS 2020-10-30 22:02:02 +03:00
alesapin
b34960bffa Merge branch 'master' into system_fetches_table 2020-10-30 11:33:37 +03:00
Vladimir Chebotarev
4189d1f9c2 More attempt to fix test_jbod_overflow. 2020-10-29 16:15:19 +03:00
Vladimir Chebotarev
e9f5eefc8c Really fixed test_multiple_disks::test_background_move. 2020-10-29 08:28:43 +03:00
alexey-milovidov
bf3acecf6f
Merge pull request #16032 from Avogar/mysql_bug 
Don't touch MySQL database if it's unnecessary
 2020-10-29 04:14:26 +03:00
Kruglov Pavel
6eaba28e01
Trigger CI 2020-10-28 22:44:37 +03:00
alesapin
57c3935a26
Merge pull request #16426 from kssenii/rabbit-optimize 
Optimize rabbitmq engine
 2020-10-28 22:24:22 +03:00
alesapin
69b9190708
Merge pull request #16266 from ClickHouse/fix_flacky_test_multiple_disks 
Add missing __init__.py
 2020-10-28 18:18:19 +03:00
alesapin
8e8bdeb5d7
Merge pull request #16434 from ClickHouse/fix_fake_race_on_merges_list 
Fix fake race condition on system.merges merge_algorithm
 2020-10-28 15:51:53 +03:00
Alexander Tokmakov
ff68670029 add missing __init__.py 2020-10-28 13:22:10 +03:00
Vladimir Chebotarev
8154695aa2 Revert "Diagnostics (to be dropped)." 
This reverts commit fd48d10029.
 2020-10-28 13:05:48 +03:00
Vladimir Chebotarev
499b18c240 Revert "More diagnostics." 
This reverts commit dd84fb572f.
 2020-10-28 13:05:42 +03:00
Vladimir Chebotarev
a3b151ff5d Revert "Added redundant empty line." 
This reverts commit 81a5f540d7.
 2020-10-28 13:05:30 +03:00
alesapin
617e42ddb4
Merge branch 'master' into rabbit-optimize 2020-10-28 10:24:05 +03:00
alesapin
1c9e24b5e2 Merge branch 'master' into system_fetches_table 2020-10-28 10:20:04 +03:00
alesapin
2b26cbbc97 Add missed file 2020-10-28 10:01:57 +03:00
Alexander Kuzmenkov
6509f1eb39
Merge branch 'master' into minumum 2020-10-27 21:38:23 +03:00
alesapin
60f2d822d7 Fix fake race condition on system.merges merge_algorithm 2020-10-27 18:27:12 +03:00
Pavel Kruglov
2a26136c9e add __init__.py 2020-10-27 18:18:05 +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
alesapin
3d3d246bdc Rename table 2020-10-27 16:07:50 +03:00
alesapin
3824fcb076 Rename file and some tweaks 2020-10-27 15:47:42 +03:00
alesapin
dca35b1913 Add awesome test for fetch 2020-10-27 15:24:10 +03:00
Vladimir Chebotarev
791c1b6593 One more attempt to fix. 2020-10-27 14:55:57 +03:00
Mikhail Filimonov
41971e073a
Fix typos reported by codespell 2020-10-27 12:04:03 +01:00
kssenii
db03cd7dd7 Much more optimal queues setup 2020-10-27 11:00:01 +00:00
Vladimir Chebotarev
81a5f540d7 Added redundant empty line. 2020-10-27 01:44:34 +03:00
alexey-milovidov
cc5f15da29
Merge pull request #16235 from excitoon-favorites/fixflappyafterasyncdrops 
Fixed flappy `test_multiple_disks`
 2020-10-26 22:17:41 +03:00
Alexander Kuzmenkov
5a70e26c70 Merge remote-tracking branch 'origin/master' into HEAD 2020-10-26 19:21:13 +03:00
Alexander Tokmakov
cd14f095ab fix tests 2020-10-26 18:12:16 +03:00
Alexander Tokmakov
636da1318b Merge branch 'master' into database_replicated 2020-10-26 15:00:43 +03:00
hchen9
c25a3e4e7b Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into trivial_count_seq 2020-10-25 20:51:09 -07:00
Vladimir Chebotarev
dd84fb572f More diagnostics. 2020-10-26 04:33:28 +03:00
Alexey Milovidov
2e23fc242f Remove flaky LIVE VIEW test 2020-10-24 22:48:16 +03:00
alexey-milovidov
0f3caaffe4
Trigger CI 2020-10-24 07:48:15 +03:00
Azat Khuzhin
96da5f6534 Disable syncing MemoryTracking with RSS for test_MemoryTracking 2020-10-24 02:33:16 +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
hchen9
feaab260d8 Fix conflict 2020-10-23 12:54:33 -07:00