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

1047 Commits

Author SHA1 Message Date
meoww-bot
c79344373e
Fix some words 2021-12-23 23:40:01 +08:00
meoww-bot
a97633f068
Update disks.md 
Co-authored-by: Nikolay Degterinsky <43110995+evillique@users.noreply.github.com>
 2021-12-23 23:25:31 +08:00
meoww-bot
547c0f26d5
Update databases.md 2021-12-23 23:21:05 +08:00
meoww-bot
04e0bcf3fa
Update storage_policies.md 2021-12-23 21:28:46 +08:00
meoww-bot
80e109a604
Update disks.md 2021-12-23 20:34:52 +08:00
mergify[bot]
45c0093813
Merge branch 'master' into patch-5 2021-12-19 04:55:15 +00:00
meoww-bot
4e4ed6e322
fix links 2021-12-18 20:52:34 +08:00
meoww-bot
59ac72cf90
fix some words 2021-12-18 20:41:09 +08:00
meoww-bot
e0077ac264
fix full-stop 2021-12-17 14:10:28 +08:00
meoww-bot
497f8995ac
fix title 2021-12-17 10:25:08 +08:00
meoww-bot
d0d00edc05
fix title 2021-12-17 10:23:32 +08:00
meoww-bot
ff1a20e6c2
Update merge_tree_settings.md 2021-12-17 09:45:04 +08:00
meoww-bot
40a4561716
Update tables.md 2021-12-17 09:31:57 +08:00
vxider
52fa82b4d4 rename window-view function to time window function 2021-12-10 09:43:44 +00:00
Vxider
b74af1af5d fix window view docs 2021-12-10 00:51:31 +08:00
vxider
45527768b2 small update for window view doc 2021-12-09 02:34:37 +00:00
vxider
eb759c83f6 window view docs improvement 2021-12-08 14:43:26 +00:00
qianmoQ
eb9d07e40a Reset architecture.md 2021-12-01 15:40:22 +08:00
qianmoQ
355b05f4b4 Merge remote-tracking branch 'origin/master' into pr-fix 
# Conflicts:
#	docs/zh/development/continuous-integration.md
 2021-12-01 15:37:19 +08:00
Maksim Kita
91d3f4396e
Merge pull request #31611 from zpi1223/master 
docs: chinese translation for zh development & what's new
 2021-12-01 01:12:05 +03:00
木木夕120
07ad814b93
Merge branch 'ClickHouse:master' into master 2021-11-30 10:05:41 +08:00
congbaoyangrou
ed2d798b26
Update where.md 2021-11-28 17:36:18 +08:00
木木夕120
de7464e391
Create 2020.md 
Chinese translation for zh what's new
 2021-11-22 11:49:34 +08:00
木木夕120
21c2313c19
Delete 2020.md 2021-11-22 11:49:14 +08:00
木木夕120
b73de420a8
Create 2019.md 
Chinese translation for zh what's new
 2021-11-22 11:49:05 +08:00
木木夕120
f3db139953
Delete 2019.md 2021-11-22 11:48:45 +08:00
木木夕120
40bc4d3c7b
Create 2018.md 
Chinese translation for zh what's new
 2021-11-22 11:48:36 +08:00
木木夕120
d022136721
Delete 2018.md 2021-11-22 11:48:02 +08:00
木木夕120
d356180a2f
Create 2017.md 
Chinese translation for zh what's new
 2021-11-22 11:47:54 +08:00
木木夕120
db36c0697f
Delete 2017.md 2021-11-22 11:47:19 +08:00
木木夕120
a4f357b3b5
Create tests.md 
Chinese translation for zh development
 2021-11-22 11:46:48 +08:00
木木夕120
84d75e5255
Delete tests.md 2021-11-22 11:45:56 +08:00
Alexey Milovidov
d604cf5573 Remove the infamous "unbundled" build 2021-11-21 13:58:26 +03:00
SuperDJY
dd2972b8c3
return fake create query when executing show create table on system's tables. (#31391) 
* clarify that cannot show create table of system's tables

* clarify that cannot show create table of system's tables in the document

* bypass test style-check for required `database=currentDatabase()` because `show create table` do not have condition

* rename supportsShowCreateTable to isSystemStorage

* build fake create query for show create table of system's tables

* fix tests for show create table on system's table:

1. only build fake create query when cannot get real query
2. only test rocksdb when it's enabled.

* fix test for show create table system.tables

* fix test for ASTCreateQuery set table and database

* change to LOGICAL_ERROR when cannot get in_memory metadata

Co-authored-by: tavplubix <tavplubix@gmail.com>

* implement common getCreateQueryFromStorage

Co-authored-by: tavplubix <tavplubix@gmail.com>
 2021-11-19 13:25:55 +03:00
spume
4707967890
Update set.md 
Modify "设置"  to “集合”
 2021-11-16 16:24:24 +08:00
qianmoQ
96e04c62c2
Merge branch 'ClickHouse:master' into pr-fix 2021-11-16 10:34:46 +08:00
laurieliyang
058b579da5
Update 3 doc files of zh docs (#31034) 
Signed-off-by: Laurie Li <laurieliyang@outlook.com>
 2021-11-11 14:47:24 +03:00
Maksim Kita
d5639614d9
Merge pull request #30902 from laurieliyang/patch-1 
Update permissions-for-queries.md of cn
 2021-11-01 14:21:37 +03:00
qianmoQ
c04510d864 Resolve conversation 2021-11-01 13:09:11 +08:00
qianmoQ
088c969615 Merge remote-tracking branch 'origin/master' into pr-fix 2021-11-01 13:06:27 +08:00
木木夕120
554b47dc73
Update parts_columns.md 2021-11-01 09:37:59 +08:00
木木夕120
9417e10330
Merge branch 'ClickHouse:master' into master 2021-11-01 09:30:44 +08:00
laurieliyang
96ec829d87
Update permissions-for-queries.md of cn 
Update permissions-for-queries.md of Chinese
 2021-10-31 20:02:30 +08:00
alexey-milovidov
15b9d65221
Merge pull request #30662 from azat/conf-clickhouse 
Switch everything left from `<yandex>` to `<clickhouse>`
 2021-10-31 14:56:51 +03:00
mergify[bot]
65df198e9b
Merge branch 'master' into conf-clickhouse 2021-10-28 22:19:42 +00:00
Raúl Marín
d0fe359a23 Update docs to stop referencing insert_sample_with_metadata 2021-10-28 12:34:38 +02:00
木木夕120
9a70475f2b
Create zookeeper_log.md 2021-10-27 16:14:02 +08:00
木木夕120
c2bfa811ed
Delete zookeeper_log.md 2021-10-27 15:59:31 +08:00
木木夕120
30886230e9
Create row_policies.md 2021-10-27 15:59:11 +08:00
木木夕120
c2bd68cfc9
Delete row_policies.md 2021-10-27 15:53:01 +08:00
木木夕120
1daf9a9611
Create roles.md 2021-10-27 15:52:32 +08:00
木木夕120
e297c23348
Delete roles.md 2021-10-27 15:50:36 +08:00
木木夕120
0a3cb819a6
Create role-grants.md 2021-10-27 15:50:10 +08:00
木木夕120
6a2550e1f3
Delete role-grants.md 2021-10-27 15:45:29 +08:00
木木夕120
92b04c74f4
Create settings_profile_elements.md 2021-10-27 15:45:01 +08:00
木木夕120
e6fbf2f7a8
Delete settings_profile_elements.md 2021-10-27 15:37:50 +08:00
木木夕120
110e41c1ce
Create settings_profiles.md 2021-10-27 15:37:30 +08:00
木木夕120
4301f5c2a7
Delete settings_profiles.md 2021-10-27 15:30:22 +08:00
木木夕120
074a46c1d1
Create stack_trace.md 2021-10-27 15:29:50 +08:00
木木夕120
9edfcdb4bb
Delete stack_trace.md 2021-10-27 15:20:40 +08:00
木木夕120
fc02711b88
Create time_zones.md 2021-10-27 15:20:12 +08:00
木木夕120
c2d9a14887
Delete time_zones.md 2021-10-27 15:19:18 +08:00
木木夕120
217bc18a0c
Create users.md 2021-10-27 15:15:34 +08:00
木木夕120
8f4572ab81
Delete users.md 2021-10-27 15:09:22 +08:00
木木夕120
cde159a729
Update replicated_fetches.md 2021-10-27 14:49:57 +08:00
木木夕120
c2cf915391
Create replication_queue.md 2021-10-27 14:49:22 +08:00
木木夕120
87f83ecf7c
Delete replication_queue.md 2021-10-27 14:29:09 +08:00
木木夕120
e51288653f
Create replicated_fetches.md 2021-10-27 14:28:42 +08:00
木木夕120
7d97db65f6
Delete replicated_fetches.md 2021-10-27 14:20:26 +08:00
木木夕120
66ec6545bf
Create quotas_usage.md 2021-10-27 14:19:11 +08:00
木木夕120
ab8b933020
Delete quotas_usage.md 2021-10-27 14:09:33 +08:00
木木夕120
6e8db77159
Create quotas.md 2021-10-27 14:09:01 +08:00
木木夕120
05594b4ff7
Delete quotas.md 2021-10-27 13:53:42 +08:00
木木夕120
ced053d51e
Create quota_usage.md 2021-10-27 13:52:59 +08:00
木木夕120
4da75a83fc
Delete quota_usage.md 2021-10-27 13:41:11 +08:00
木木夕120
3770db6c35
Create quota_limits.md 2021-10-27 13:40:35 +08:00
木木夕120
fb6aaae7f0
Delete quota_limits.md 2021-10-27 13:29:55 +08:00
木木夕120
35672e7f6c
Create query_views_log.md 2021-10-27 13:28:24 +08:00
木木夕120
4da05888d5
Delete query_views_log.md 2021-10-27 13:07:07 +08:00
木木夕120
69459549c4
Create parts_columns.md 2021-10-27 11:01:38 +08:00
木木夕120
9031e42d5c
Delete parts_columns.md 2021-10-27 10:40:15 +08:00
木木夕120
4d2dcb6d78
Create opentelemetry_span_log.md 2021-10-27 10:28:46 +08:00
木木夕120
8c7528b0d4
Delete opentelemetry_span_log.md 2021-10-27 10:11:19 +08:00
木木夕120
6a6f7ca622
Create licenses.md 2021-10-27 10:10:33 +08:00
木木夕120
18b843be77
Delete licenses.md 2021-10-27 10:07:55 +08:00
木木夕120
96e560bcfb
Create grants.md 2021-10-27 10:06:30 +08:00
木木夕120
289dcb60c6
Delete grants.md 2021-10-27 10:01:32 +08:00
木木夕120
6f4bc11a04
Create errors.md 2021-10-27 10:00:59 +08:00
木木夕120
4b56e76c0b
Delete errors.md 2021-10-27 09:58:08 +08:00
木木夕120
1d4227aab6
Create enabled-roles.md 2021-10-27 09:57:37 +08:00
木木夕120
b7f6333219
Delete enabled-roles.md 2021-10-27 09:55:32 +08:00
木木夕120
7ca924b2f6
Create distribution_queue.md 2021-10-27 09:54:20 +08:00
木木夕120
64434fb10b
Delete distribution_queue.md 2021-10-27 09:49:18 +08:00
木木夕120
76ad1e777b
Create distributed_ddl_queue.md 2021-10-27 09:48:35 +08:00
木木夕120
ba86f0e3f4
Delete distributed_ddl_queue.md 2021-10-27 09:40:34 +08:00
木木夕120
c9e5bdf436
Create data_skipping_indices.md 2021-10-27 09:38:59 +08:00
木木夕120
386b097009
Delete data_skipping_indices.md 2021-10-27 09:33:53 +08:00
木木夕120
492ba037ec
Update crash-log.md 2021-10-27 09:33:01 +08:00
木木夕120
23640513d7
Create current-roles.md 2021-10-27 09:32:25 +08:00
木木夕120
6a633d86cc
Delete current-roles.md 2021-10-27 09:24:52 +08:00
木木夕120
cebdee8905
Modify the content 2021-10-27 09:14:10 +08:00
mergify[bot]
9a05337df3
Merge branch 'master' into pr-fix 2021-10-26 10:36:39 +00:00
木木夕120
aaa08e91b5
chinese translation for crash_log 
1.Regenerate the crash-log.md file.
2.Supplement the internal translation content
 2021-10-26 17:50:48 +08:00
木木夕120
d6b0ce1e94
delete crash-log.md symbolic link 2021-10-26 17:37:11 +08:00
Maksim Kita
12b6110495
Merge pull request #30578 from zpi1223/master 
docs: chinese translation supplement for zh module
 2021-10-26 11:27:58 +03:00
qianmoQ
4071319420 Architecture Overview 2021-10-26 15:32:58 +08:00
qianmoQ
1ce331a3c5 Add architecture 2021-10-26 15:00:01 +08:00
Azat Khuzhin
e0cd7a8304 docs: switch <yandex> to <clickhouse> 2021-10-26 08:52:29 +03:00
木木夕120
42c16f5697
Adjusting invalid links 2021-10-26 10:24:38 +08:00
木木夕120
671ed9d430
Adjusting invalid links 2021-10-26 10:23:24 +08:00
木木夕120
6abe479dd8
replace symbolic link content. 2021-10-26 09:33:53 +08:00
木木夕120
aa43127601
delete symbolic links 2021-10-26 09:33:16 +08:00
木木夕120
5dc6c7a157
adjust title level 2021-10-26 09:32:06 +08:00
木木夕120
8ec04169b6
replace symbolic links 2021-10-26 09:14:17 +08:00
木木夕120
37d7eb0cb8
replace symbolic links 2021-10-26 09:13:26 +08:00
木木夕120
6e3921f77e
delete symbolic links 2021-10-26 09:12:13 +08:00
木木夕120
171c5845ed
chinese translation 
adjust waning module
 2021-10-25 14:13:03 +08:00
木木夕120
fb4eb4cf23
chinese translation 
adjust title level
 2021-10-25 11:45:24 +08:00
木木夕120
3e6870c540
chinese translation 
Adjust 事件时间 for DateTime64 to 事件时间(微秒)
 2021-10-23 16:24:43 +08:00
木木夕120
12b378f27f
Translation for Kerberos 
Document: Chinese translation for Operations - External User Authenticators and Directories - Kerberos
 2021-10-23 15:56:25 +08:00
木木夕120
7ec3ba3593
Merge branch 'master' into patch-doc-translate 2021-10-23 13:31:12 +08:00
木木夕120
99800cc8d4
Translation for Continuous Integration Checks 2021-10-23 11:28:22 +08:00
木木夕120
40e35a4571
Archive translated documents 2021-10-22 17:58:02 +08:00
木木夕120
3c8b32dfe6
第二段翻译存档 2021-10-22 17:20:10 +08:00
木木夕120
ca6b6df93e
translation for Continuous Integration Checks 
Document: Chinese translation for Continuous Integration Checks
 2021-10-22 16:49:24 +08:00
木木夕120
4ce26e1738
Correct incorrect text 2021-10-22 15:59:17 +08:00
alexey-milovidov
a246de872f
Merge pull request #30547 from amosbird/doc 
Don't recommend `nobarrier` mount option
 2021-10-22 10:44:57 +03:00
木木夕120
bb8401546a
retranslation 2021-10-22 15:04:17 +08:00
木木夕120
1e203cb604
Retranslation 2021-10-22 14:58:10 +08:00
Amos Bird
a85e14a068
Don't recommend nobarrier mount option 2021-10-22 14:09:34 +08:00
Nikolay Degterinsky
140e304b34
Merge pull request #30386 from morozovsk/patch-9 
Docs: Remove argMin(tuple(arg, val)) due to changes in code
 2021-10-21 16:33:10 +03:00
Vladimir Goncharov
a48da62949
Update argmin.md 2021-10-21 15:21:33 +03:00
Vladimir Goncharov
a43d293d12
Update argmax.md 2021-10-21 15:20:25 +03:00
Vladimir Goncharov
2b3841f003
Update argmin.md 2021-10-19 19:14:14 +03:00
Vladimir Goncharov
f49e946943
Update argmax.md 2021-10-19 19:11:15 +03:00
Nikita Mikhaylov
4fbd332bf1 Done 2021-10-19 11:53:55 +00:00
Alexey Milovidov
2cef9983fa Remove recursive submodules 2021-10-18 02:29:04 +03:00
枢木
5dc204c716 update adopters to update Alibaba Cloud. 2021-10-13 17:44:47 +08:00
Alexey Milovidov
551c52c236 Merge remote-tracking branch 'origin/master' into yandex-to-clickhouse-in-configs 2021-09-30 17:45:14 +03:00
alexey-milovidov
1e6f9ac635
Merge branch 'master' into yandex-to-clickhouse-in-configs 2021-09-28 20:26:44 +03:00
BiteTheDDDDt
f969414ce7 update zh doc of windowfunnel 2021-09-28 21:04:58 +08:00
BiteTheDDDDt
5e8e9f4875 update zh doc of windowfunnel 2021-09-28 21:02:49 +08:00
BiteTheDDDDt
40a6271095 update zh doc of windowfunnel 2021-09-28 21:02:37 +08:00
BiteTheDDDDt
8f69cbe821 update zh doc of windowfunnel 2021-09-28 20:56:04 +08:00
Ivan Blinkov
e7a233d9ad switch to repo.clickhouse.com 2021-09-28 11:03:50 +03:00
Alexey Milovidov
8616ba62e4 repo.clickhouse.tech is not 100% ready 2021-09-24 04:41:59 +03:00
Alexey Milovidov
e9e77b4403 .tech -> .com 2021-09-22 03:22:57 +03:00
Alexey Milovidov
4ade6cc5da Merge remote-tracking branch 'origin/master' into yandex-to-clickhouse-in-configs 2021-09-22 02:08:29 +03:00
Alexey Milovidov
3fc12286e7 Fix Docs Check 2021-09-22 00:08:55 +03:00
alexey-milovidov
0880ae2883
Merge branch 'master' into yandex-to-clickhouse-in-configs 2021-09-21 20:17:28 +03:00
Alexander Tokmakov
571dd3acfb fix style check 2021-09-21 10:28:33 +03:00
Ivan Blinkov
06fd753556 remove info page 2021-09-20 11:16:00 +03:00
Ivan Blinkov
a7cbad50ed fixes and cleanup 2021-09-20 11:08:21 +03:00
Ivan Blinkov
6a293d73f9 make_links.sh 2021-09-20 09:51:41 +03:00
Alexey Milovidov
f0925b3cf6 Changed substitution path name 2021-09-20 01:50:09 +03:00
Alexey Milovidov
510540c7d7 Change Doker Hub URL 2021-09-20 01:45:18 +03:00
Alexey Milovidov
e9cc3eafaa Change repository URL in docs 2021-09-20 01:43:23 +03:00
Ivan Blinkov
f429db1ee9 find . -type f -name '*.md'| xargs -I{} perl -pi -e 's|https://clickhouse.tech|https://clickhouse.com|g' {} 2021-09-19 23:05:54 +03:00
alexey-milovidov
63acdcc85e
Merge pull request #29067 from qianmoQ/translation-docs-zh 
pr commercial
 2021-09-16 16:25:41 +03:00
Pavel Kruglov
aa3bb2f2c0 Remove VerticalRaw format from docs 2021-09-16 14:30:28 +03:00
qianmoQ
35c1e38835 fix space between Chinese and English 2021-09-16 15:42:48 +08:00
qianmoQ
51925c68f8 fix space between Chinese and English 2021-09-16 14:29:40 +08:00
qianmoQ
dc185457b9 pr adding_test_queries.md 2021-09-16 14:17:30 +08:00
qianmoQ
ce3ec5fc1f pr commercial 2021-09-16 11:17:28 +08:00
Maksim Kita
3445ae3f2c
Merge pull request #28556 from benbiti/fix-keep_alive_timeout-default-value_docs 
fix keep_alive_timeout default value (10s) in docs
 2021-09-03 13:12:43 +03:00
Pavel Kruglov
1d9ad322ae Fix format names in docs 2021-09-03 12:43:56 +03:00
benbiti
fa5db1be76 fix keep_alive_timeout default value in docs 2021-09-03 17:32:31 +08:00
Maksim Kita
741223ce52
Merge pull request #28115 from qianmoQ/translation-docs-zh 
Translate documentation for database engines
 2021-08-31 12:02:01 +03:00
qianmoQ
13a96e7819 Add dbm to gui 2021-08-31 09:59:07 +08:00
qianmoQ
dba7739f48 Fix document inline errors 2021-08-31 09:53:39 +08:00
Onehr7
87b026aa43
Update in.md 2021-08-30 20:08:33 +08:00
qianmoQ
af84be6009
Merge branch 'ClickHouse:master' into translation-docs-zh 2021-08-27 19:33:10 +08:00
qianmoQ
3153836b6a Fix file problems with bad links 2021-08-27 19:32:21 +08:00
Aimiyoo
7264efc053
Update tutorial.md (#28235) 2021-08-27 12:54:15 +03:00
qianmoQ
8205ac11e2 [Docs] Translate documentation for database engines 2021-08-25 11:51:43 +08:00
Yingfan Chen
e83675264b fix sql query 1-4.3 to be multilines 2021-08-24 22:38:33 +08:00
Yingfan Chen
fbb056e564 fix star schema zh sql 2021-08-24 08:55:27 +08:00
Maksim Kita
35fae3426b
Merge pull request #27920 from sunwenli/patch-6 
Update mysql.md
 2021-08-22 01:21:13 +03:00
igomac
91813b0110
Update docs/zh/sql-reference/functions/ym-dict-functions.md 
Co-authored-by: Alexey Boykov <33257111+mathalex@users.noreply.github.com>
 2021-08-21 00:53:19 +08:00
igomac
943008209e
Update mysql.md 
special words do not need translate
 2021-08-20 18:29:22 +08:00
igomac
1d7c58238f
Create ym-dict-functions.md 
add missing translation
 2021-08-20 12:27:19 +08:00
igomac
0a5c979907
Update docs/zh/sql-reference/functions/ym-dict-functions.md 
Co-authored-by: Alexey Boykov <33257111+mathalex@users.noreply.github.com>
 2021-08-20 12:03:57 +08:00
igomac
f5af6fae2f
Update docs/zh/sql-reference/functions/ym-dict-functions.md 
Co-authored-by: Alexey Boykov <33257111+mathalex@users.noreply.github.com>
 2021-08-20 12:03:49 +08:00
igomac
0380091be8
Update ym-dict-functions.md 
Fix mistranslated content
 2021-08-19 18:03:43 +08:00
Onehr7
bb323055c9
Update troubleshooting.md 2021-08-19 11:47:30 +08:00
Nikolay Degterinsky
0c2582d2b4
Merge pull request #27773 from sunwenli/patch-3 
Update backup.md
 2021-08-18 11:03:45 +03:00
igomac
e921cdbdbe
Update backup.md 
add toc
 2021-08-18 15:12:32 +08:00
igomac
8660b17bf4
Update data_type_families.md 
remove machine_translated mark
 2021-08-17 16:48:55 +08:00
igomac
77e8db92ba
Update backup.md 
remove  machine_translated mark
 2021-08-17 16:47:34 +08:00
igomac
c280d3ba02
Update data_type_families.md 
Special words are not translated
 2021-08-17 15:47:33 +08:00
igomac
dc884cfe05
Update backup.md 
Fix anchor link
 2021-08-17 15:45:53 +08:00
董海镔
3dcff2124c rename bitmapSubsetOffsetLimit to subBitmap and modify the rb_offset_limit function logic 2021-08-07 18:47:33 +08:00
董海镔
e8b6c0a227 add bitmapSubsetOffsetLimit function 2021-08-06 00:44:07 +08:00
Alexey Milovidov
df3be36758 Remove trailing whitespaces from docs 2021-07-29 18:27:50 +03:00
Alexey Milovidov
d87d833691 Remove trailing whitespaces from docs 2021-07-29 18:20:55 +03:00
Vitaly Baranov
67d4da224a
Merge pull request #26384 from Cas-pian/grant_by_replace 
add grant by replace support
 2021-07-23 14:40:47 +03:00
Sean Haynes
368a9cf268 Update server configuration docs to reflect Requiretls1_2 setting 
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en
 2021-07-22 16:05:34 +01:00
Caspian
eab4cb3cdc use new syntax, update docs 2021-07-21 23:08:38 +08:00
su-houzhen
412fb28d4f
Update index.md 2021-07-21 17:26:55 +08:00
Caspian
7c6dc56bcd
Merge branch 'master' into grant_by_replace 2021-07-20 17:41:12 +08:00