This is an automated email from the ASF dual-hosted git repository.
zclll pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git
The following commit(s) were added to refs/heads/master by this push:
new 4c50b41563a fix wrong doc content of some string functions (#3148)
4c50b41563a is described below
commit 4c50b41563a7ac9c5c6edd6930d4360c189125c5
Author: zclllyybb <[email protected]>
AuthorDate: Tue Dec 2 19:00:12 2025 +0800
fix wrong doc content of some string functions (#3148)
## Versions
- [ ] dev
- [ ] 4.x
- [ ] 3.x
- [ ] 2.1
## Languages
- [ ] Chinese
- [ ] English
## Docs Checklist
- [ ] Checked by AI
- [ ] Test Cases Built
---
.../string-functions/mask-first-n.md | 8 ++-----
.../string-functions/mask-last-n.md | 8 ++-----
.../scalar-functions/string-functions/mask.md | 10 +++-----
.../scalar-functions/string-functions/substring.md | 28 +++++++++-------------
.../string-functions/mask-first-n.md | 8 ++-----
.../string-functions/mask-last-n.md | 8 ++-----
.../scalar-functions/string-functions/mask.md | 10 +++-----
.../scalar-functions/string-functions/substring.md | 28 +++++++++-------------
8 files changed, 36 insertions(+), 72 deletions(-)
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask-first-n.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask-first-n.md
index 940860d5dcb..7322e431821 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask-first-n.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask-first-n.md
@@ -26,16 +26,12 @@ MASK_FIRST_N(<str>[, <n>])
返回 VARCHAR 类型，为前 N 个字节被脱敏后的字符串。
-<<<<<<< Updated upstream
-- 任意参数中有一个为 NULL，则返回 NULL
-- 非字母和数字会原样返回
-- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
-=======
特殊情况：
+
- 如果任意参数为 NULL，返回 NULL
- 非字母和数字字符保持不变
- 如果 `<n>` 大于字符串长度，脱敏整个字符串
->>>>>>> Stashed changes
+- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
## 示例
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask-last-n.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask-last-n.md
index 6d54322026c..2b4c1cc36fb 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask-last-n.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask-last-n.md
@@ -26,16 +26,12 @@ MASK_LAST_N(<str>[, <n>])
返回 VARCHAR 类型，为后 N 个字节被脱敏后的字符串。
-<<<<<<< Updated upstream
-- 任意参数中有一个为 NULL，则返回 NULL
-- 非字母和数字会原样返回
-- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
-=======
特殊情况：
+
- 如果任意参数为 NULL，返回 NULL
- 非字母和数字字符保持不变
- 如果 `<n>` 大于字符串长度，脱敏整个字符串
->>>>>>> Stashed changes
+- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
## 示例
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask.md
index 3519c997605..0cdae998fd6 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/mask.md
@@ -28,16 +28,12 @@ MASK(<str>[, <upper>[, <lower>[, <number>]]])
返回 VARCHAR 类型，为字母和数字被替换后的字符串。
-<<<<<<< Updated upstream
+特殊情况：
+
- 任意参数中有一个为 NULL，则返回 NULL
- 非字母和数字会原样返回
-- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
-=======
-特殊情况：
-- 如果任意参数为 NULL，返回 NULL
-- 非字母和数字字符保持不变
- 替换字符参数如果包含多个字符，只取第一个字符
->>>>>>> Stashed changes
+- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
## 示例
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/substring.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/substring.md
index b2393ad5e9e..67b57d5c690 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/substring.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-functions/scalar-functions/string-functions/substring.md
@@ -127,19 +127,6 @@ SELECT substring('foobarbar' FROM 4);
+-------------------------------+
```
-<<<<<<< Updated upstream
-8. 使用别名MID, 且返回结果为 NULL
-```sql
-SELECT MID(NULL, 2);
-```
-```text
-+--------------+
-| MID(NULL, 2) |
-+--------------+
-| NULL |
-+--------------+
-```
-=======
8. UTF-8 特殊字符支持
```sql
SELECT substring('ṭṛì ḍḍumai test', 5, 7);
@@ -176,7 +163,14 @@ SELECT substring('', 1, 3);
+---------------------+
```
-### Keywords
-
- SUBSTRING,SUBSTR
->>>>>>> Stashed changes
+11. 使用别名MID, 且返回结果为 NULL
+```sql
+SELECT MID(NULL, 2);
+```
+```text
++--------------+
+| MID(NULL, 2) |
++--------------+
+| NULL |
++--------------+
+```
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask-first-n.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask-first-n.md
index 940860d5dcb..7322e431821 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask-first-n.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask-first-n.md
@@ -26,16 +26,12 @@ MASK_FIRST_N(<str>[, <n>])
返回 VARCHAR 类型，为前 N 个字节被脱敏后的字符串。
-<<<<<<< Updated upstream
-- 任意参数中有一个为 NULL，则返回 NULL
-- 非字母和数字会原样返回
-- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
-=======
特殊情况：
+
- 如果任意参数为 NULL，返回 NULL
- 非字母和数字字符保持不变
- 如果 `<n>` 大于字符串长度，脱敏整个字符串
->>>>>>> Stashed changes
+- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
## 示例
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask-last-n.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask-last-n.md
index 6d54322026c..2b4c1cc36fb 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask-last-n.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask-last-n.md
@@ -26,16 +26,12 @@ MASK_LAST_N(<str>[, <n>])
返回 VARCHAR 类型，为后 N 个字节被脱敏后的字符串。
-<<<<<<< Updated upstream
-- 任意参数中有一个为 NULL，则返回 NULL
-- 非字母和数字会原样返回
-- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
-=======
特殊情况：
+
- 如果任意参数为 NULL，返回 NULL
- 非字母和数字字符保持不变
- 如果 `<n>` 大于字符串长度，脱敏整个字符串
->>>>>>> Stashed changes
+- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
## 示例
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask.md
index 3519c997605..0cdae998fd6 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/mask.md
@@ -28,16 +28,12 @@ MASK(<str>[, <upper>[, <lower>[, <number>]]])
返回 VARCHAR 类型，为字母和数字被替换后的字符串。
-<<<<<<< Updated upstream
+特殊情况：
+
- 任意参数中有一个为 NULL，则返回 NULL
- 非字母和数字会原样返回
-- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
-=======
-特殊情况：
-- 如果任意参数为 NULL，返回 NULL
-- 非字母和数字字符保持不变
- 替换字符参数如果包含多个字符，只取第一个字符
->>>>>>> Stashed changes
+- 仅支持ASCII字母的替换，非ASCII字母（如带重音的拉丁字母）会原样保留
## 示例
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/substring.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/substring.md
index b2393ad5e9e..67b57d5c690 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/substring.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-functions/scalar-functions/string-functions/substring.md
@@ -127,19 +127,6 @@ SELECT substring('foobarbar' FROM 4);
+-------------------------------+
```
-<<<<<<< Updated upstream
-8. 使用别名MID, 且返回结果为 NULL
-```sql
-SELECT MID(NULL, 2);
-```
-```text
-+--------------+
-| MID(NULL, 2) |
-+--------------+
-| NULL |
-+--------------+
-```
-=======
8. UTF-8 特殊字符支持
```sql
SELECT substring('ṭṛì ḍḍumai test', 5, 7);
@@ -176,7 +163,14 @@ SELECT substring('', 1, 3);
+---------------------+
```
-### Keywords
-
- SUBSTRING,SUBSTR
->>>>>>> Stashed changes
+11. 使用别名MID, 且返回结果为 NULL
+```sql
+SELECT MID(NULL, 2);
+```
+```text
++--------------+
+| MID(NULL, 2) |
++--------------+
+| NULL |
++--------------+
+```
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
