Mikhail f. Shiryaev
96859ec678
Remove unused packager code for deb packages
2022-05-18 01:38:43 +02:00
Mikhail f. Shiryaev
d2e5ab0f6c
Improve packager script a little bit
2022-05-18 01:38:42 +02:00
tchepavel
2692d88a42
Merge branch 'master' into nats-integration
2022-05-17 16:59:57 +03:00
tchepavel
a3af94d49e
Documentation; integration tests; subscribe on startup
2022-05-17 16:58:09 +03:00
Kseniia Sumarokova
94683786dc
Merge branch 'master' into MeiliSearch
2022-05-16 22:42:09 +02:00
tchepavel
35cbe48ca3
Fixing; preparing test
2022-05-16 13:03:28 +03:00
Nikolai Kochetov
f1bc2bc615
Merge branch 'master' into llvm-14
2022-05-16 12:03:26 +02:00
tchepavel
7317c76d3c
Merge branch 'master' into nats-integration
2022-05-15 14:41:22 +03:00
jasperzhu
5e607e6cf5
Merge branch 'master' into dev_intel_iaa_deflate
2022-05-15 10:59:07 +08:00
Alexey Milovidov
7ce409da52
Merge branch 'master' into allow-setuid-inside-clickhouse
2022-05-15 04:33:59 +03:00
tchepavel
cc94378698
Add nats-io cmake; finally fix publishing
2022-05-12 19:11:32 +03:00
Mikhail Artemenko
12717f2417
fix <Breaking changes> in Meilisearch v0.27.0
2022-05-12 16:51:00 +03:00
jasperzhu
c74732ae79
Merge branch 'master' into dev_intel_iaa_deflate
2022-05-12 21:28:13 +08:00
Alexander Gololobov
b34a55c9e9
Merge branch 'master' into array-distance-functions
2022-05-11 16:55:02 +02:00
Yakov Olkhovskiy
6d3a54a044
Merge pull request #36467 from olevino/wyhash
...
Wyhash
2022-05-11 09:57:09 -04:00
qieqieplus
6903b3d33c
fix ci fast test
2022-05-11 17:16:23 +08:00
Mikhail f. Shiryaev
3fa955aec1
Merge pull request #37057 from ClickHouse/changelog
...
Changelog script
2022-05-11 10:54:29 +02:00
mergify[bot]
0e2a86dcee
Merge branch 'master' into MeiliSearch
2022-05-11 08:49:19 +00:00
Mikhail f. Shiryaev
d5b1e39bb9
Merge pull request #36866 from ClickHouse/integration-tests
...
Fix using proper image for integration tests; improve logging; fix docker volume cleaning in integration-tests-runner.
2022-05-11 10:46:51 +02:00
Alexey Milovidov
e40396a0e5
Fix Docker
2022-05-11 03:21:08 +02:00
Alexey Milovidov
f3c3935df3
Fix shellcheck
2022-05-11 03:18:28 +02:00
Alexey Milovidov
a8506f6604
Merge branch 'master' into allow-setuid-inside-clickhouse
2022-05-11 03:14:28 +02:00
alesapin
3cc8e2af51
Merge pull request #37079 from ClickHouse/disable_thread_fuzzer
...
Disable thread fuzzer after server restart
2022-05-10 23:24:34 +02:00
Mikhail f. Shiryaev
3802944cc0
Merge pull request #36863 from ClickHouse/tests-result-for-not-finished
...
Replace `Timeout` with `Tests not finished`
2022-05-10 19:23:34 +02:00
Mikhail f. Shiryaev
e31ac2e717
Fix cleaning up integration-runner docker volume
2022-05-10 17:41:49 +02:00
alesapin
af99183950
Disable thread fuzzer after server restart
2022-05-10 15:16:21 +02:00
Alexander Tokmakov
9346c9363a
Merge pull request #37052 from ClickHouse/fix_server_termination_stress_tests
...
Print stacks if we cannot terminate server in stress tests
2022-05-10 13:12:44 +03:00
Alexander Tokmakov
17c954bea7
fix shellcheck
2022-05-10 11:48:55 +02:00
Mikhail f. Shiryaev
d78709c656
Add dependencies and CI for changelogs generator
2022-05-10 11:25:38 +02:00
Alexander Tokmakov
92d423c478
print stacks if wa cannot terminate server in stress tests
2022-05-09 19:43:51 +02:00
Alexander Tokmakov
b647f8f9bf
Update run.sh
2022-05-09 17:48:10 +03:00
Alexey Milovidov
419687ac50
Update run.sh
2022-05-09 10:17:49 +02:00
Mikhail f. Shiryaev
b14dca2fac
Improve stress tests report a little bit
2022-05-09 10:17:40 +02:00
Alexey Milovidov
c95f22e64d
Merge branch 'master' into allow-setuid-inside-clickhouse
2022-05-07 00:21:47 +03:00
Mikhail f. Shiryaev
cad69ad30d
Rebuild docs-builder
2022-05-06 14:53:33 +02:00
jinjunzh
fd5085c290
Merge branch 'dev_intel_iaa_deflate' of https://github.com/jinjunzh/ClickHouse into dev_intel_iaa_deflate
2022-05-05 12:00:30 -04:00
jinjunzh
c4bce5234e
add nasm source into contrib for nasm compiler
2022-05-05 11:56:11 -04:00
Mikhail f. Shiryaev
37533eb14b
Improve comment FIXME for errors report
2022-05-04 16:56:43 +02:00
Mikhail f. Shiryaev
2b67208dea
Ignore slow query as errors in performance tests report
2022-05-04 13:02:48 +02:00
Alexander Tokmakov
c3f177f0ac
Merge pull request #36885 from ClickHouse/fix_system_logs_saving
...
Save system logs in functionsl tests if server crashed
2022-05-04 01:12:41 +03:00
Alexander Tokmakov
7a9c9da0bd
Update run.sh
2022-05-04 01:10:40 +03:00
Alexander Tokmakov
193a50a688
Update run.sh
2022-05-03 23:17:03 +03:00
Alexander Tokmakov
3baf72f1d4
save system logs in func tests if server crashed
2022-05-03 20:10:07 +02:00
Mikhail f. Shiryaev
6197934e14
Replace Timeout
with Tests not finished
2022-05-03 10:45:29 +02:00
jasperzhu
7f47e9b934
Merge branch 'master' into dev_intel_iaa_deflate
2022-05-03 15:47:57 +08:00
Alexey Milovidov
88826e2da5
Remove "preconditions" from performance tests (overengineering, unneeded feature)
2022-05-02 02:33:22 +02:00
Mikhail Artemenko
6830b74925
fix ref after merge & change runner dockerfile
2022-05-01 23:57:44 +03:00
Mikhail Artemenko
41f657d8ed
Merge branch 'master' into MeiliSearch
2022-05-01 10:01:56 +03:00
jinjunzh
34934b80a9
update qpl deflate supporting test script and docs
2022-04-29 11:40:08 -04:00
Mikhail f. Shiryaev
5a8fcafc5e
Fix GIT_DOCS_BRANCH with the same branch as checked out
2022-04-29 15:23:25 +02:00
Alexey Milovidov
1dc56e39fc
black .
2022-04-29 04:39:21 +02:00
Alexey Milovidov
2a3a2184ec
Refinement
2022-04-29 04:37:57 +02:00
Alexey Milovidov
2d7d67e7bc
Remove special handling of "short" queries - the logic is too ad-hoc, it pollutes the code and is difficult to handle
2022-04-29 04:27:57 +02:00
Mikhail f. Shiryaev
a2dc780174
Make backward compatible integration tests runner
2022-04-25 21:16:02 +02:00
Mikhail f. Shiryaev
f53040b95e
Merge pull request #36559 from ClickHouse/performance-rebalance
...
Use just index to split performance tests by group
2022-04-25 14:15:23 +02:00
Alexey Milovidov
bdf86f3b7a
Merge pull request #36554 from ClickHouse/snyk-fixes
...
Snyk fixes
2022-04-23 22:51:56 +03:00
Mikhail f. Shiryaev
04a8955427
fixup! Update golang-mysql integration image
2022-04-23 15:24:42 +02:00
Mikhail f. Shiryaev
e434d78e68
fixup! Update golang-mysql integration image
2022-04-22 23:02:22 +02:00
alesapin
7380a71333
Merge pull request #31833 from ClickHouse/musl-check
...
Build clickhouse-keeper with Musl
2022-04-22 22:41:16 +02:00
Mikhail f. Shiryaev
74a755d170
Use just index to split tests by group
2022-04-22 20:34:34 +02:00
Mikhail f. Shiryaev
11694459f3
Update mysql_php_client php version
2022-04-22 18:22:14 +02:00
Mikhail f. Shiryaev
d4e8c6fb44
Update golang-mysql integration image
2022-04-22 18:22:12 +02:00
alesapin
18d094d79d
Merge pull request #35865 from azat/clickhouse-test-left-queries
...
clickhouse-test: fix left-queries-check, to fix test log parser
2022-04-22 15:59:38 +02:00
Mikhail f. Shiryaev
bf41199cc3
Fix issue with broken git ownership
2022-04-22 14:56:34 +02:00
alesapin
c2a881decd
Update docker/packager/packager
...
Co-authored-by: Mikhail f. Shiryaev <felixoid@clickhouse.com>
2022-04-22 11:30:22 +02:00
Mikhail f. Shiryaev
382c717d09
Speed-up fetching submodules
2022-04-21 20:08:55 +02:00
olevino999
a32aa93b50
wyhash
2022-04-21 19:36:47 +03:00
Mikhail f. Shiryaev
fc83f5e96c
Get ccache status before build
2022-04-21 17:18:43 +02:00
Mikhail f. Shiryaev
7dd2fdb47c
Try to minimize linking for keeper
2022-04-21 16:11:43 +02:00
Mikhail f. Shiryaev
619d2703f0
Simplify build.sh for binary packager
2022-04-21 14:15:24 +02:00
Mikhail f. Shiryaev
49a572e00c
Build only clickhouse-keeper with musl
2022-04-21 13:43:24 +02:00
alesapin
48f1ce96e7
AA
2022-04-21 00:04:49 +02:00
alesapin
9815b4bea4
Followup
2022-04-20 22:42:26 +02:00
alesapin
b8021be891
Perfect cmake
2022-04-20 21:19:43 +02:00
tavplubix
06de1adebc
Merge pull request #36450 from ClickHouse/Avogar-patch-4
...
Fix stress test
2022-04-20 21:42:24 +03:00
tavplubix
2d34d46b28
Update entrypoint.sh
2022-04-20 21:38:49 +03:00
Azat Khuzhin
08e74b98f5
tests: do not check queries after tests for replicated database
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-04-20 21:34:31 +03:00
Kruglov Pavel
4e2b1cd981
Update run.sh
2022-04-20 16:48:54 +02:00
Kruglov Pavel
cd77f927b6
Fix putting logs into test_output
2022-04-20 15:06:09 +02:00
Kruglov Pavel
6bcdf21801
Fix stress test
2022-04-20 13:53:16 +02:00
alesapin
ba81816dc1
Better cmake
2022-04-20 12:11:55 +02:00
mergify[bot]
0df5fda6ed
Merge branch 'master' into musl-check
2022-04-20 09:28:40 +00:00
Mikhail f. Shiryaev
8e2874328f
Prepare docs_check.py to be used in docs-clickhouse
2022-04-19 23:35:39 +02:00
Mikhail f. Shiryaev
7925d925a9
Merge branch 'master' into docs-staging
2022-04-19 11:00:03 +02:00
Mikhail f. Shiryaev
ffbf05c4bd
Merge lang directories in clickhouse-docs repo
2022-04-19 10:43:14 +02:00
Mikhail f. Shiryaev
fe8bbbadcc
Decrease image size by removal cache
2022-04-19 10:43:13 +02:00
Mikhail f. Shiryaev
cc3a9586d0
Fail DocsCheck on markdown symlinks
2022-04-19 10:43:12 +02:00
Mikhail f. Shiryaev
7a7a5a72cb
Intermediate step of migration to docusaurus
2022-04-19 10:43:10 +02:00
Alexey Milovidov
88f98443bd
Merge branch 'master' into allow-setuid-inside-clickhouse
2022-04-18 07:06:02 +03:00
Alexey Milovidov
543e5d7242
Merge branch 'master' into musl-check
2022-04-18 02:40:13 +02:00
Azat Khuzhin
8d87e48cb4
Simplify perf scripts by using schema inference
2022-04-17 09:01:15 +03:00
Alexey Milovidov
e0121dfe6f
Remove old comment
2022-04-17 00:33:58 +02:00
Alexey Milovidov
b7e5a81215
Allow to drop privileges at startup
2022-04-17 00:24:47 +02:00
Alexey Milovidov
dda060063b
Remove trash
2022-04-17 00:14:27 +02:00
Alexey Milovidov
b5c64244c9
Merge branch 'llvm-14' of github.com:ClickHouse/ClickHouse into llvm-14
2022-04-16 01:15:27 +02:00
Alexey Milovidov
73b52859df
Merge branch 'master' into llvm-14
2022-04-16 00:46:58 +02:00
alesapin
be5b75b567
Reverse
2022-04-14 15:44:09 +02:00
alesapin
774e01bf13
Hacky hack
2022-04-14 15:43:36 +02:00
tavplubix
5f31185125
Update stress
2022-04-14 14:35:46 +03:00
alesapin
b27070856e
Fix
2022-04-14 12:27:13 +02:00
alesapin
7521aecdf5
Debug why we have dynamic binary
2022-04-14 12:23:09 +02:00
alesapin
7c11abb995
Followup
2022-04-13 21:33:34 +02:00
alesapin
aba2b77972
Fix order
2022-04-13 17:45:34 +02:00
mergify[bot]
ea3afd4c6c
Merge branch 'master' into musl-check
2022-04-13 12:28:34 +00:00
Mikhail f. Shiryaev
51685e0956
Dirty fix fasttest after addressing CVE-2022-24765
2022-04-13 13:36:28 +02:00
alesapin
1a88143468
Fix build
2022-04-13 11:49:56 +02:00
Mikhail Artemenko
2fd86cc564
Merge branch 'master' into MeiliSearch
2022-04-13 12:05:46 +03:00
alesapin
b8389d48b4
Fix packager
2022-04-12 18:51:35 +02:00
alesapin
f011864386
Build clickhouse-keeper with musl
2022-04-12 18:48:16 +02:00
Kruglov Pavel
5b46e9655a
Merge pull request #36067 from ClickHouse/Avogar-patch-4
...
Try to turn off always green backward compatibility checks
2022-04-12 16:20:07 +02:00
tavplubix
ccb45ae943
Update stress
2022-04-12 12:42:45 +03:00
tavplubix
48f9b61bdb
Update stress
2022-04-12 12:22:03 +03:00
tavplubix
f7c17a8e86
Update stress
2022-04-11 18:03:19 +03:00
mergify[bot]
df81e8d60c
Merge branch 'master' into Avogar-patch-4
2022-04-11 14:37:28 +00:00
Mikhail f. Shiryaev
08e518a821
Merge branch 'master' into llvm-14
2022-04-08 13:57:44 +02:00
Kruglov Pavel
eaad99bd48
Try to turn off always green backward compatibility checks
2022-04-08 13:55:10 +02:00
Mikhail f. Shiryaev
20aee231bd
Improve codebrowser image, use a temporary branch as source
2022-04-08 13:44:25 +02:00
Alexander Tokmakov
49c35f3261
Merge branch 'master' into mvcc_prototype
2022-04-08 13:34:40 +02:00
tavplubix
6868223af0
Merge pull request #36026 from ClickHouse/tavplubix-patch-2
...
Fix Backward comapatibility check
2022-04-08 13:10:59 +03:00
alesapin
8ec802bc62
Merge pull request #35475 from kssenii/remote-fs-cache-improvements
...
Allow to write remote fs cache on all write operations. Add `system.remote_filesystem_cache` table. Add `drop remote filesystem cache (<path>)` query. Add `system.remote_data_paths` table.
2022-04-08 12:06:26 +02:00
Alexander Tokmakov
6a46da93ae
Merge branch 'master' into mvcc_prototype
2022-04-07 23:22:19 +02:00
Mikhail f. Shiryaev
dd4bd4abba
Simplify and fix coverity
2022-04-07 18:35:58 +02:00
Kruglov Pavel
9fa6e6e7df
Make backward compatibility check always green
2022-04-07 17:42:33 +02:00
Mikhail f. Shiryaev
8111010815
Rebuild a builder for test
2022-04-07 17:16:44 +02:00
Mikhail f. Shiryaev
5b69caf383
Update codebrowser clang to 14
2022-04-07 15:18:26 +02:00
Alexander Tokmakov
7f54e7b422
Merge branch 'master' into mvcc_prototype
2022-04-07 15:14:06 +02:00
Alexander Tokmakov
8290ffa88d
Merge branch 'master' into mvcc_prototype
2022-04-07 13:50:42 +02:00
Vladimir C
a2aec793d1
Merge pull request #35985 from azat/stress-improve-checks
2022-04-07 12:42:57 +02:00
tavplubix
b32800420c
Update stress
2022-04-07 13:30:11 +03:00
Mikhail f. Shiryaev
2d87e3587d
Merge pull request #34895 from DevTeamBK/coverity_scan
...
Attempt at Nightly Coverity Scan and upload
2022-04-06 19:07:00 +02:00
Mikhail Artemenko
151eeb1a27
Merge branch 'master' into MeiliSearch
2022-04-06 17:07:55 +03:00
Azat Khuzhin
2fb6d6acb4
stress: use more meaningful names for clickhouse-server.log
...
But note, that stderr.log/stdout.log/clickhouse-server.err.log still not separated.
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-04-06 14:09:53 +03:00
Azat Khuzhin
058cde820f
test/stress: improve error checks for backward compatiblity check
...
Before the log was analyzed only after the server had been restarted
after stressing, and hence it cannot find anything in case of error,
like here [1].
[1]: https://s3.amazonaws.com/clickhouse-test-reports/34355/acd48ebe2d51d20d0c2a5bc545d46d27f9bf7904/stress_test__thread__actions_.html
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-04-06 14:09:52 +03:00
Kruglov Pavel
ab5c912ad4
Merge pull request #35613 from ClickHouse/Avogar-patch-3
...
Check all logs for crashes, logical errors, etc in backward compatibility check
2022-04-06 12:58:37 +02:00
Kseniia Sumarokova
0e1637dfaf
Merge pull request #35354 from kssenii/enable-testmode-by-default
...
Remove testmode option, enable it unconditionally
2022-04-06 10:06:08 +02:00
kssenii
d59d4eda4f
Fix tests
2022-04-06 01:58:16 +02:00
Boris Kuschel
2298b80ed8
Add coverity scan
...
Signed-off-by: Boris Kuschel <Boris.Kuschel@ibm.com>
2022-04-05 19:52:33 +02:00
Alexey Milovidov
1d02f9e296
Merge pull request #35942 from ClickHouse/snyk-fix-d2de427965e212a701b47d65ca7642bc
...
[Snyk] Security upgrade node from 8 to 16.14.2
2022-04-05 19:21:43 +03:00
Alexander Tokmakov
1fe50ad201
Merge branch 'master' into mvcc_prototype
2022-04-05 14:38:02 +02:00
Alexander Tokmakov
da00beaf7f
Merge branch 'master' into mvcc_prototype
2022-04-05 11:14:42 +02:00
Mikhail f. Shiryaev
12ac4cc731
Merge pull request #35945 from ClickHouse/keeper-docker-image
...
Fix keeper image for `arm64`
2022-04-05 10:48:37 +02:00
Nikita Mikhaylov
61183ac07b
Done
2022-04-04 22:24:39 +00:00
Mikhail f. Shiryaev
4d7618585b
Fix WORKDIR issue after upgrading npm
2022-04-05 00:10:33 +02:00
snyk-bot
e78ff3ea7b
fix: docker/test/integration/mysql_js_client/Dockerfile to reduce vulnerabilities
...
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-DEBIAN9-PYTHON27-341379
- https://snyk.io/vuln/SNYK-DEBIAN9-PYTHON35-1063181
- https://snyk.io/vuln/SNYK-DEBIAN9-PYTHON35-340072
- https://snyk.io/vuln/SNYK-DEBIAN9-PYTHON35-453739
- https://snyk.io/vuln/SNYK-DEBIAN9-PYTHON35-584435
2022-04-04 21:20:18 +00:00
Mikhail f. Shiryaev
d475ce5d16
Fix building ubuntu image from deb-repo
2022-04-04 18:50:50 +02:00
Alexander Tokmakov
a2167f12b8
Merge branch 'master' into mvcc_prototype
2022-04-04 14:24:23 +02:00
kssenii
6c8e073a61
Merge master
2022-04-01 16:48:29 +02:00
Nikita Mikhaylov
279defbe9f
Add clickhouse-keeper Dockerfile
2022-04-01 12:32:26 +02:00
Mikhail f. Shiryaev
b950b53156
Make multiarch clickhouse-server Dockerfiles
2022-04-01 11:59:49 +02:00
Mikhail f. Shiryaev
c053f1cb1d
Rewrite alpine building to pure Dockerfile
2022-04-01 11:59:46 +02:00
Mikhail f. Shiryaev
1b53993560
Make Dockerfile.ubuntu a default image definition
2022-04-01 11:59:46 +02:00
Mikhail f. Shiryaev
fbb6787a45
Rename Dockerfile to Dockerfile.ubuntu
2022-04-01 11:59:45 +02:00
Mikhail f. Shiryaev
4cc37ae9f3
Clean stale code
2022-04-01 11:59:44 +02:00
Alexey Milovidov
93edf05259
Merge branch 'master' into llvm-14
2022-04-01 04:49:03 +03:00
Nikita Mikhaylov
5f27f690f4
Revert "Added support for schema inference for hdfsCluster
( #35602 )"
...
This reverts commit f6bfdcc0c9
.
2022-03-31 14:19:56 +02:00
mergify[bot]
f9a0692e2c
Merge branch 'master' into Avogar-patch-3
2022-03-31 11:45:31 +00:00
Nikita Mikhaylov
f6bfdcc0c9
Added support for schema inference for hdfsCluster
( #35602 )
2022-03-31 12:47:36 +02:00
Alexander Tokmakov
5a50ad9de3
Merge branch 'master' into mvcc_prototype
2022-03-31 11:35:04 +02:00
tavplubix
5680f53ed4
Merge pull request #35773 from azat/stateless-tests-artifacts
...
ci: replace directory system log tables artifacts with tsv
2022-03-31 12:16:48 +03:00
Azat Khuzhin
8b84829e93
ci: replace directory system log tables artifacts with tsv
...
Changelog:
- remove query_thread_log (query_log should be enough)
- for s3 storage there /var/lib/clickhouse/data/system/*_log cannot be
used, replace them with plain TSVWithNamesAndTypes, also note, that
after schema inference it is even pretty easy to use
- support replicated database env correctly
Co-authored-by: tavplubix <tavplubix@clickhouse.com>
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-03-30 21:50:55 +03:00
kssenii
0fc92fe2aa
Get rid of all "remote" mentions
2022-03-30 17:15:29 +02:00
mergify[bot]
9a391f2fed
Merge branch 'master' into parallel_stateful
2022-03-30 09:40:12 +00:00
Nikolai Kochetov
3849e63ab1
Change database
2022-03-29 19:06:50 +00:00
Alexander Tokmakov
287d858fda
Merge branch 'master' into mvcc_prototype
2022-03-29 16:24:12 +02:00
Alexander Tokmakov
c37945b2c8
run stateful tests in parallel
2022-03-29 15:24:29 +02:00
Nikita Mikhaylov
85282f1b4d
Made schema inference work with s3Cluster
table function ( #35544 )
2022-03-29 00:46:35 +02:00
alesapin
a38f63af2d
Merge pull request #35676 from ClickHouse/remove_outdated_links
...
Remove outdated links from CI
2022-03-28 21:24:45 +02:00
alesapin
7ab8d7178c
Merge pull request #35308 from ClickHouse/clickhouse-keeper
...
New package clickhouse-keeper
2022-03-28 21:23:17 +02:00
Alexander Tokmakov
208b242188
Merge branch 'master' into mvcc_prototype
2022-03-28 19:58:06 +02:00
tavplubix
239be83757
Merge pull request #35669 from ClickHouse/fast_test_disable_rand_settings
...
Disable random settings in Fast Test
2022-03-28 17:06:12 +03:00
alesapin
b838a7dcb0
Remove outdated links from CI
2022-03-28 15:53:22 +02:00
Alexander Tokmakov
e795b83148
disable random settings in fast test
2022-03-28 14:56:23 +02:00
Mikhail Artemenko
1886d9c2ea
refactor parseTypeOfField & fix tests
2022-03-27 23:00:28 +03:00
Kruglov Pavel
18ab49e788
Check all logs for crashes, logical errors, etc in backward compatibility check
2022-03-25 11:59:50 +01:00
alesapin
c95a9971bc
Merge branch 'master' into clickhouse-keeper
2022-03-25 11:22:57 +01:00
Mikhail f. Shiryaev
b2863d4cea
Rebuild docs-check for a test
2022-03-24 16:24:07 +01:00
mergify[bot]
03c8a59a57
Merge branch 'master' into stress-test
2022-03-23 17:37:05 +00:00
Alexander Tokmakov
bcec53aadc
Merge branch 'master' into mvcc_prototype
2022-03-23 11:28:43 +01:00
Kruglov Pavel
5efad9699c
Update run.sh
2022-03-23 11:28:40 +01:00
Kruglov Pavel
8ef2f13524
Update run.sh
2022-03-23 11:26:31 +01:00
Kruglov Pavel
034d92d817
Fix removing empty files
2022-03-22 18:06:35 +01:00
Mikhail f. Shiryaev
e6f5a3f98b
Apply black formatter to all *.py files in the repo
2022-03-22 17:39:58 +01:00
Mikhail f. Shiryaev
5fea6d24fa
Add black formatting check
2022-03-22 17:38:48 +01:00
Mikhail f. Shiryaev
1e0ad94d67
Add a stand alone clickhouse-keeper package
2022-03-22 15:05:29 +01:00
alesapin
0ab9a9c0f6
Merge pull request #33664 from ClickHouse/release-steps
...
Refactor releasing process
2022-03-22 14:43:18 +01:00
avogar
c5245c1ad1
Improve backward compatibility check and stress test
2022-03-22 12:00:20 +00:00
Mikhail f. Shiryaev
b9cb64a4a1
Add apk package and reports
2022-03-22 11:11:38 +01:00
Mikhail f. Shiryaev
d55785156b
Fix always success builds by move ts to build.sh
2022-03-22 11:10:03 +01:00
Mikhail f. Shiryaev
9ad31e983c
Fix compiler interpolation
2022-03-22 11:10:02 +01:00
Mikhail f. Shiryaev
0dd1f4af76
Rename alien arguments and parameters
2022-03-22 11:10:01 +01:00
Mikhail f. Shiryaev
70945764e5
Fix a tiny typo
2022-03-22 11:10:00 +01:00
Mikhail f. Shiryaev
342f7ba567
Migrate to nfpm
2022-03-22 11:09:59 +01:00
Mikhail f. Shiryaev
04e9d1b9f6
Add default values for some arguments of packager
2022-03-22 11:09:58 +01:00
Mikhail f. Shiryaev
2bed5ba0ad
Fix pylint issues
2022-03-22 11:09:57 +01:00
Mikhail f. Shiryaev
f4f60311ce
Apply black to docker packager
2022-03-22 11:09:55 +01:00
Alexander Tokmakov
3c762f566d
Merge branch 'master' into mvcc_prototype
2022-03-21 20:16:29 +01:00
avogar
288d08f3f2
Add retries in backward compatibility check
2022-03-21 17:26:24 +00:00
Alexey Milovidov
159a73b6d5
Merge branch 'master' into llvm-14
2022-03-20 22:50:20 +01:00
mergify[bot]
5295dd0ef2
Merge branch 'master' into stress-test
2022-03-17 11:10:37 +00:00
Alexander Tokmakov
4b3e13a4fe
Merge branch 'master' into mvcc_prototype
2022-03-16 21:06:19 +01:00
Kruglov Pavel
fa6d963f83
Update run.sh
2022-03-16 12:30:45 +01:00
Kruglov Pavel
6b3a25e20d
Update run.sh
2022-03-15 17:15:17 +01:00
Alexander Tokmakov
9702b5177d
Merge branch 'master' into mvcc_prototype
2022-03-14 21:45:38 +01:00
alesapin
1edd4347fc
Hope I'll fix it
2022-03-14 21:43:51 +01:00
avogar
b9496af3b3
Fix tests
2022-03-14 16:40:17 +00:00
alesapin
2f8da04891
Fix timezones
2022-03-14 13:46:45 +01:00
Alexey Milovidov
d0716b035f
Revert "Change timezone in Docker"
2022-03-13 04:03:06 +03:00
Alexey Milovidov
6b9129c494
Change timezone in Docker
2022-03-11 23:21:45 +01:00
Kruglov Pavel
3d36eced2d
Update run.sh
2022-03-10 17:55:45 +03:00
Kruglov Pavel
91b9c11939
Increase the number of attempts to start server
2022-03-10 14:38:39 +03:00
mergify[bot]
78c8029aeb
Merge branch 'master' into stress-test
2022-03-09 16:22:45 +00:00
kssenii
5260822964
Merge master
2022-03-08 18:21:28 +01:00
Alexander Tokmakov
8acfb8d27f
Merge branch 'master' into mvcc_prototype
2022-03-07 17:40:15 +01:00
Kseniia Sumarokova
28b9ec01c0
Merge pull request #34945 from bigo-sg/hive_bug_fixed
...
unexpected result when use `in` in hive query
2022-03-07 17:13:11 +01:00
Mikhail f. Shiryaev
ef4a969ed9
Merge pull request #34850 from ClickHouse/new-packages-url
...
New packages url
2022-03-07 13:34:58 +01:00
lgbo-ustc
68fb92edf2
update hive server image
2022-03-07 10:36:12 +08:00
Kruglov Pavel
dbba752398
Merge branch 'master' into stress-test
2022-03-04 18:33:37 +03:00
Kruglov Pavel
0f90996bb8
Update run.sh
2022-03-04 14:24:24 +03:00
Azat Khuzhin
15bbc5537b
fasttest: add --print-time for "Test time" column in the results table
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-03-03 15:44:41 +03:00
Azat Khuzhin
b2ed5552cc
fasttest: use bash arrays over wrap lines with backslash
...
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-03-03 15:44:41 +03:00
lgbo-ustc
21c164ad2c
update tests
2022-03-02 14:20:59 +08:00
lgbo-ustc
2ff7ff90fa
update tests
2022-03-02 14:17:04 +08:00
kssenii
a594f388a4
Merge master
2022-03-01 19:43:45 +01:00
Kruglov Pavel
8f6ba99fec
Update run.sh
2022-03-01 15:20:02 +03:00
kssenii
9983a5d802
Add test for profile events
2022-02-28 15:47:12 +01:00
lgbo-ustc
24caa70243
remove meaningless codes
2022-02-28 20:23:00 +08:00
lgbo-ustc
b8a2deba0f
update tests
2022-02-28 20:11:59 +08:00
mergify[bot]
b4574a777f
Merge branch 'master' into mvcc_prototype
2022-02-28 11:24:39 +00:00
Kruglov Pavel
6252588922
Update run.sh
2022-02-28 13:33:10 +03:00
lgbo-ustc
aa8db563d6
update test
2022-02-28 18:02:37 +08:00
lgbo-ustc
5885cfd869
fixed bug : unexpected result when using in clause for filtering partitions
2022-02-28 16:47:50 +08:00
alexey-milovidov
c39efd8006
Update README.md
2022-02-25 16:13:32 +03:00
kssenii
725f967ac6
Add stress test
2022-02-24 07:54:58 +01:00
Alexander Tokmakov
aa6b9a2abc
Merge branch 'master' into mvcc_prototype
2022-02-23 23:22:03 +03:00
Mikhail f. Shiryaev
dd37b237ab
Changing repository url to packages.clickhouse.com
2022-02-23 20:54:16 +01:00
kssenii
36a76d6a75
Fix test
2022-02-22 15:18:28 +01:00
kssenii
c637385dd0
Merge master
2022-02-22 13:17:51 +01:00
kssenii
26f58274b6
Fix stateful test
2022-02-22 12:05:43 +01:00
kssenii
4543513a5d
Add comments
2022-02-21 13:54:03 +01:00
kssenii
009e71e273
Fix tests
2022-02-21 11:43:03 +01:00
Alexey Milovidov
aa8f282ad9
Switch to clang/llvm 14
2022-02-19 18:43:02 +01:00
Kruglov Pavel
500ed56061
Update docker/test/stress/run.sh
...
Co-authored-by: Vladimir C <vdimir@clickhouse.com>
2022-02-18 16:36:48 +03:00
Kruglov Pavel
de888db506
Update docker/test/stress/stress
...
Co-authored-by: Vladimir C <vdimir@clickhouse.com>
2022-02-18 16:36:38 +03:00
Kruglov Pavel
10c45bef67
Remove clickhouse-test package
2022-02-18 13:03:23 +03:00
Kruglov Pavel
71e7668fa6
Remove downloading clickhouse-test
2022-02-18 13:02:49 +03:00
Kruglov Pavel
74087470c2
Update run.sh
2022-02-18 12:52:56 +03:00
kssenii
353ffacca3
Add test
2022-02-17 19:57:04 +01:00
Kruglov Pavel
e77319bf01
Merge branch 'master' into stress-test
2022-02-17 20:28:46 +03:00
alesapin
8a0153b6d3
Merge pull request #34606 from qoega/no-clickhouse-test-deb
...
Remove clickhouse-test deb completely
2022-02-17 18:13:44 +03:00
Mikhail f. Shiryaev
c3bf9eb2f9
Remove PVS test
2022-02-17 12:59:47 +01:00
Alexander Tokmakov
dae044f86b
Merge branch 'master' into mvcc_prototype
2022-02-17 13:49:37 +03:00
alesapin
6df2c9c2d8
Merge pull request #34433 from ClickHouse/s3-fix-content-type
...
Workaround for bug when AWS mistakenly set Content-Type to XML
2022-02-17 13:11:14 +03:00
alesapin
0b099b140f
Fix
2022-02-17 10:39:33 +03:00
kssenii
47f94120da
Merge master
2022-02-16 14:43:28 +01:00
kssenii
f9622d44f0
Try add stateful tests
2022-02-16 14:18:55 +01:00
alesapin
bc2d0ee7c7
Merge pull request #34215 from ClickHouse/revert-34211-revert-34153-add_func_tests_over_s3
...
Add func tests run with s3 and fix several bugs
2022-02-15 19:07:11 +03:00
alesapin
3b531e43b7
Setup credentials
2022-02-15 16:12:08 +03:00
Yatsishin Ilya
bbe2c07a7b
remove clickhouse-test deb completely
2022-02-15 12:03:51 +00:00
alesapin
e1fb220bb7
Fix test
2022-02-15 13:31:41 +03:00
Alexander Tokmakov
1e4e569151
Merge branch 'master' into mvcc_prototype
2022-02-15 02:26:47 +03:00
Mikhail f. Shiryaev
23546ab825
Use the current kerberized-haddop image
2022-02-13 22:01:45 +01:00
Mikhail f. Shiryaev
0ae948866a
Create symlink hadoop -> ./hadoop-2.7.0
2022-02-13 19:10:11 +01:00
alesapin
89373155fc
Merge branch 'master' into revert-34211-revert-34153-add_func_tests_over_s3
2022-02-13 21:07:54 +03:00
Azat Khuzhin
4965586e7e
More gdb introspection on CI ( #34517 )
...
* test/fuzzer: preserve core
This may help to capture things like in [1]:
Failed assertion: "bin->low_bits_full > bin->low_bits_empty" Received signal 6 Received signal Aborted (6)
[1]: https://s3.amazonaws.com/clickhouse-test-reports/33057/19216f4c0ae0f72108c147f958a708b521ad27dc/fuzzer_astfuzzerdebug,actions//report.html
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
* test: do not run 'info locals' since 'backtrace full' includes it
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
* test: try capture backtrace from all threads
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
* test/stress: fix path for core artifacts
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
Fixes : #33389
* test/fuzzer: store core file in artifacts
v2: fix report, because of undefined variable CORE_LINK
v3: fix case when there is no core file
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-02-13 15:02:15 +03:00
Mikhail f. Shiryaev
ac459dccd8
Force update kerberized hadoop
2022-02-11 18:26:49 +01:00
Mikhail f. Shiryaev
65e8605af1
Make testflows aarch64 compatible
2022-02-11 18:26:48 +01:00
Mikhail f. Shiryaev
0f21981694
Add a flag for images architecture
2022-02-11 18:26:45 +01:00
Mikhail f. Shiryaev
7ca684aa9c
Revert checks for architectures in Dockerfiles
2022-02-11 18:26:44 +01:00
Mikhail f. Shiryaev
bd3812a462
Add a comment
2022-02-11 18:26:44 +01:00
Mikhail f. Shiryaev
c19d0a3494
Update performance-comparison, fix x86 hard-code
2022-02-11 18:26:41 +01:00
Mikhail f. Shiryaev
2d02eab750
Revert "Merge pull request #34373 from ClickHouse/docker-tz"
...
This reverts commit efd8044ab7
, reversing
changes made to 4bb69bcb15
.
2022-02-08 15:34:01 +01:00
Mikhail f. Shiryaev
c7ba5204b3
Make testflows a multiarch image
2022-02-07 13:21:51 +01:00
Mikhail f. Shiryaev
4a1e84306a
Update performance comparison OS version
2022-02-07 12:57:58 +01:00
Mikhail f. Shiryaev
4a857d7d18
Use UTC in docker images
2022-02-07 12:35:32 +01:00
Alexander Tokmakov
45be75b4db
Merge branch 'master' into mvcc_prototype
2022-02-06 23:36:08 +03:00
alesapin
06499ce847
Revert "Remove docker change"
...
This reverts commit 3c80e0bff8
.
2022-02-04 14:32:11 +03:00
Alexander Tokmakov
fe30e0f162
fixes
2022-02-03 21:57:09 +03:00
Mikhail f. Shiryaev
a7325bbe32
Fix check-workflows in style check, iterate over checks
2022-02-03 18:36:01 +01:00
Mikhail f. Shiryaev
37179bbc9c
Add verbosity to stylecheck
2022-02-03 17:50:35 +01:00
Alexander Tokmakov
ca5f951558
Merge branch 'master' into mvcc_prototype
2022-02-03 18:56:44 +03:00
Mikhail f. Shiryaev
75adf5d12d
Merge pull request #33948 from qoega/no-clickhouse-test-deb-in-stateless
...
Do not use clickhouse-test.deb in stateless CI checks
2022-02-02 10:23:33 +01:00
alexey-milovidov
cbfcd45be3
Revert "Add func tests run with s3"
2022-02-01 05:46:13 +03:00
alesapin
b6828f1b4a
Supress some tests for S3
2022-01-31 19:09:25 +03:00
Alexander Tokmakov
fb9b2d5326
Merge branch 'master' into mvcc_prototype
2022-01-28 21:18:36 +03:00
Kruglov Pavel
e004dae25b
Update run.sh
2022-01-27 18:15:03 +03:00
Constantine Peresypkin
f5787ff0a9
docker: fix root squashed data dirs
...
if we use some root squashed volume mappings in docker
uid=0 is actually uid=nobody
thus FS operations with uid=0 will fail miserably
and overall it's a strange idea to create dirs under root when
DO_NOT_CHOWN is in effect...
2022-01-26 14:29:27 +02:00
Kruglov Pavel
b54bf18b27
Merge branch 'master' into stress-test
2022-01-25 14:35:42 +03:00
Yatsishin Ilya
3a55f7a7d6
Do not use clickhouse-test.deb in stateless
2022-01-24 11:53:42 +00:00
Alexander Tokmakov
0ea0a8ccc7
Merge branch 'master' into mvcc_prototype
2022-01-20 17:05:55 +03:00
Kruglov Pavel
d5bde26bc1
Update run.sh
2022-01-20 15:22:00 +03:00
Azat Khuzhin
616fd5dda9
docker/packager/other/fuzzer: cleanup USE_INTERNAL_XXX
2022-01-20 10:02:01 +03:00
Azat Khuzhin
7496ed7fde
Remove unbundled gtest support
...
v2: Fix unit tests (do not rely on USE_GTEST)
2022-01-20 10:01:54 +03:00
Alexander Tokmakov
e9a5a64a71
Merge branch 'master' into mvcc_prototype
2022-01-19 21:41:23 +03:00
Yatsishin Ilya
e64351de37
Disable dh_update_autotools_config
2022-01-18 20:10:38 +00:00
mergify[bot]
23f09bd25a
Merge branch 'master' into fix-mongo2-compose
2022-01-17 11:52:48 +00:00
alexey-milovidov
e0d1b13402
Update Dockerfile
2022-01-16 00:15:19 +03:00
Alexander Tokmakov
d237099729
rebuild docker image
2022-01-15 22:38:25 +03:00
Alexey Milovidov
a967f90ef7
Add comments
2022-01-15 22:28:08 +03:00
Alexey Milovidov
dce1269b2a
Merge branch 'master' of github.com:yandex/ClickHouse into merge-33563-2
2022-01-15 22:27:20 +03:00
Alexey Milovidov
7e266387b1
Merge #33563
2022-01-15 22:25:05 +03:00
mergify[bot]
17f17c13f5
Merge branch 'master' into fix-mongo2-compose
2022-01-15 13:50:03 +00:00
Alexander Tokmakov
9a518d789f
rebuild docker image
2022-01-15 16:21:43 +03:00
Alexander Tokmakov
5132411e00
rebuild docker image
2022-01-15 14:07:40 +03:00
Alexey Milovidov
a4e8e61d57
Update "gosu" version
2022-01-15 02:59:28 +03:00
alexey-milovidov
c3972f000d
Merge pull request #33614 from ClickHouse/safe-names-in-blog
...
Use safe page URL for a blog post
2022-01-15 02:29:37 +03:00
Alexander Tokmakov
7feb014804
rebuild docker image
2022-01-14 23:26:18 +03:00
mergify[bot]
4ffc3bb589
Merge branch 'master' into fix-mongo2-compose
2022-01-14 18:36:37 +00:00
Alexander Tokmakov
c1c3f25c10
Merge branch 'master' into mvcc_prototype
2022-01-14 21:03:58 +03:00
Mikhail Artemenko
698364f7b0
add tests
2022-01-14 20:58:56 +03:00
Mikhail f. Shiryaev
fdb88b75ec
Don't build integration tests on arm64 yet
2022-01-14 15:48:43 +01:00
Alexander Tokmakov
4dd216ce8f
Merge branch 'master' into mvcc_prototype
2022-01-14 17:11:32 +03:00
Mikhail f. Shiryaev
73f06421b1
Use automatic architecture for docker repo
2022-01-14 15:03:43 +01:00
Alexander Tokmakov
e1a41fc694
add system log for introspection
2022-01-14 17:03:00 +03:00
Mikhail f. Shiryaev
97e4151aff
Remove broken editing of /etc/hosts
2022-01-14 14:46:14 +01:00
Yatsishin Ilya
2fe8f6c60b
Fix ports allocated for mongo2 that is w/o creds
2022-01-14 13:00:38 +00:00
alesapin
d7a7926610
Update version to 22.1 not 21.13
2022-01-14 15:10:45 +03:00
Mikhail f. Shiryaev
cdb3a51438
Fix virtualenv in docker docks-builder
2022-01-14 09:54:23 +01:00
alesapin
5257b413d4
Merge pull request #33612 from ClickHouse/workflow-linting
...
Add actionlint configuration and fix all issues
2022-01-14 11:41:48 +03:00
Kseniia Sumarokova
5da673c3a5
Merge pull request #31104 from bigo-sg/hive_table
...
Implement hive table engine
2022-01-14 09:39:17 +03:00
alexey-milovidov
438519aeec
Merge pull request #33389 from azat/stress-core-dumps
...
tests/stress: add core dumps into artifacts
2022-01-14 01:26:35 +03:00
Mikhail f. Shiryaev
49fa1a1cd3
Add linter and checker for workflow files
2022-01-13 21:40:21 +01:00
Mikhail f. Shiryaev
55032a0286
Fix wrong variables in processing results
2022-01-13 21:36:34 +01:00
Mikhail f. Shiryaev
0edb80939f
Apply black to process_style_check_result.py
2022-01-13 20:59:36 +01:00
Mikhail f. Shiryaev
c465593706
Force rebuild images once again in master
2022-01-13 19:03:34 +01:00
Mikhail f. Shiryaev
e314eed992
Force rebuild images in CI
2022-01-13 17:49:23 +01:00
Mikhail f. Shiryaev
651b22f611
Add necessary MLIR dependency for codebrowser
2022-01-12 17:07:58 +01:00
Mikhail f. Shiryaev
8779b6763d
Use architecture specific version of minio
2022-01-12 17:07:56 +01:00
Mikhail f. Shiryaev
d1b14d5ee0
Use a library with proper architecture for mysql odbc
2022-01-12 17:07:54 +01:00
Mikhail f. Shiryaev
7a369837c3
Improve integration tests image
...
- Order packages
- Add rpm2cpio package
- Clean cache
- Use apache CDN for zookeeper
2022-01-12 17:07:54 +01:00
Mikhail f. Shiryaev
18a9aac61e
Use mysql-client-8.0 from ubuntu original repo
2022-01-12 17:07:53 +01:00
Mikhail f. Shiryaev
565e469b19
Don't build image for arm64 pvs-sturio
2022-01-12 17:07:53 +01:00
Mikhail f. Shiryaev
2a83a1c05d
Build dependent images from the current version
2022-01-12 17:07:52 +01:00
Mikhail f. Shiryaev
624dfda931
Fix dpkg-deb architecture-dependent artifact
2022-01-12 17:07:51 +01:00
Anselmo D. Adams
f81dbfd09c
Update Dockerfile
2022-01-12 11:21:16 -03:00
taiyang-li
66813a3aa9
merge master
2022-01-12 16:56:29 +08:00
alexey-milovidov
27dac209dc
Merge pull request #33368 from ClickHouse/dotnet-integration-test
...
Trying to merge #23230
2022-01-07 08:43:52 +03:00
Alexey Milovidov
adc577c52f
Remove obsolete and unsupported Docker Builder #33345
2022-01-04 20:03:59 +03:00
Azat Khuzhin
ebed6193b4
tests/stress: add core dumps into artifacts
...
gcore is used here because:
- default kernel.core_pattern is "|/usr/share/apport/apport %p %s %c %d %P %E" [1]
and so to make it work you need to install apport into container and
configure it propertly -- to complex
[1]: https://s3.amazonaws.com/clickhouse-test-reports/33389/204e459d259570e6bc7fe2903f7e516094a916ca/stress_test__address__actions_/runlog.log
- kernel.core_pattern cannot be changed, since proc is mounted in
read-only mode in non --privileged containers [2]
[2]: https://s3.amazonaws.com/clickhouse-test-reports/33389/dab3afbd94558f9654bf0aa1e06e06e2962f3bb0/stress_test__address__actions_/runlog.log
v2: change kernel.core_pattern
v3: use gcore, since you are not allowed to change kernel.core_pattern
in container (only under --privileged)
2022-01-04 14:03:40 +03:00
Alexey Milovidov
2c7a8db58c
Add test output and compare to reference
2022-01-03 03:36:23 +03:00
Alexey Milovidov
268842afa8
Add a comment
2022-01-03 03:07:25 +03:00
Alexey Milovidov
c3ab18d1b0
Merge branch 'feature/dotnet-integration-test' of github.com:DarkWanderer/ClickHouse into dotnet-integration-test
2022-01-03 03:00:01 +03:00
alexey-milovidov
f1b6bc1074
Update docker_compose_dotnet_client.yml
2022-01-03 02:55:49 +03:00
alexey-milovidov
04a293a6ae
Update images.json
2022-01-03 02:55:30 +03:00
alexey-milovidov
7d52ba4576
Update Dockerfile
2022-01-03 02:54:43 +03:00
alexey-milovidov
817bb0ee6d
Update docker_compose_dotnet_client.yml
2022-01-03 02:46:08 +03:00
alexey-milovidov
57926cf366
Update Dockerfile
2022-01-03 02:45:46 +03:00
alexey-milovidov
3333c36df3
Update images.json
2022-01-03 02:45:20 +03:00
taiyang-li
1e102bc1b2
merge master
2022-01-01 09:01:06 +08:00
alesapin
333dfab6a6
Add retries to AST fuzzer
2021-12-28 16:12:51 +03:00
taiyang-li
aa97634d9b
merge master
2021-12-28 18:38:50 +08:00