From 0b34aa8575b1ed3ed1149cbd06c721f42ecf4bc9 Mon Sep 17 00:00:00 2001 From: meegoo Date: Thu, 5 Sep 2024 14:05:27 +0800 Subject: [PATCH 1/3] [Doc] Update System_limit.md (#50542) Signed-off-by: meegoo (cherry picked from commit a97db920bc6f92606a780643534f9ab62651f21d) # Conflicts: # docs/en/reference/System_limit.md # docs/zh/reference/System_limit.md --- docs/en/reference/System_limit.md | 4 ++++ docs/zh/reference/System_limit.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/en/reference/System_limit.md b/docs/en/reference/System_limit.md index 91124ff2cc217..b3e885f54a072 100644 --- a/docs/en/reference/System_limit.md +++ b/docs/en/reference/System_limit.md @@ -19,7 +19,11 @@ This topic describes the rules and limits that apply when you use StarRocks. - Column name (column alias), partition name, and index name are **not** case-sensitive. Other names are **case-sensitive**. - Naming conventions for labels: +<<<<<<< HEAD:docs/en/reference/System_limit.md You can specify the label of a job when you import data. The label name can consist of underscores (\_), letters (a-z or A-Z), and digits (0-9), and cannot exceed 128 characters in length. The label name has no requirement for the starting character. +======= + You can specify the label of a job when you load data. The label name can consist of digits (0-9), letters (a-z or A-Z), and underscores (\_), and cannot exceed 128 characters in length. Label names can start with a letter or an underscore (\_). +>>>>>>> a97db920bc ([Doc] Update System_limit.md (#50542)):docs/en/sql-reference/System_limit.md - When you create a table, the key column cannot be of the FLOAT or DOUBLE type. You can use the DECIMAL type to represent decimals. diff --git a/docs/zh/reference/System_limit.md b/docs/zh/reference/System_limit.md index c99f63a57c894..e6afd6f254da1 100644 --- a/docs/zh/reference/System_limit.md +++ b/docs/zh/reference/System_limit.md @@ -18,8 +18,12 @@ displayed_sidebar: docs - 列名（包括列别名）、分区名、索引名大小写**不敏感**，其他名称大小写**敏感**。 - 对标签（Label）名的要求： +<<<<<<< HEAD:docs/zh/reference/System_limit.md 导入数据时可指定任务的标签（Label）。标签名可由数字 (0-9)、字母（a-z或A-Z），以及下划线(\_)组成，且长度不能超过 128 个字符。标签名对起始字符无要求。 +======= + 导入数据时可指定任务的标签（Label）。标签名可由数字 (0-9)、字母（a-z或A-Z），以及下划线(\_)组成，且长度不能超过 128 个字符。标签名以字母或下划线开头。 +>>>>>>> a97db920bc ([Doc] Update System_limit.md (#50542)):docs/zh/sql-reference/System_limit.md - 建表时，Key 列不能使用 FLOAT 或者 DOUBLE 类型，可用 DECIMAL 类型表示小数。 From ca31aa2dfe864677cce2928e6126e89e462b4fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B5=B5=E7=A9=BA=E4=BA=8B=E3=82=B9=E3=83=94=E3=83=AA?= =?UTF-8?q?=E3=83=83=E3=83=88?= Date: Thu, 5 Sep 2024 14:12:30 +0800 Subject: [PATCH 2/3] Update System_limit.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 絵空事スピリット --- docs/en/reference/System_limit.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/en/reference/System_limit.md b/docs/en/reference/System_limit.md index b3e885f54a072..bad3e6e1b527f 100644 --- a/docs/en/reference/System_limit.md +++ b/docs/en/reference/System_limit.md @@ -19,11 +19,8 @@ This topic describes the rules and limits that apply when you use StarRocks. - Column name (column alias), partition name, and index name are **not** case-sensitive. Other names are **case-sensitive**. - Naming conventions for labels: -<<<<<<< HEAD:docs/en/reference/System_limit.md - You can specify the label of a job when you import data. The label name can consist of underscores (\_), letters (a-z or A-Z), and digits (0-9), and cannot exceed 128 characters in length. The label name has no requirement for the starting character. -======= + You can specify the label of a job when you load data. The label name can consist of digits (0-9), letters (a-z or A-Z), and underscores (\_), and cannot exceed 128 characters in length. Label names can start with a letter or an underscore (\_). ->>>>>>> a97db920bc ([Doc] Update System_limit.md (#50542)):docs/en/sql-reference/System_limit.md - When you create a table, the key column cannot be of the FLOAT or DOUBLE type. You can use the DECIMAL type to represent decimals. From 3aaa5c82d8976afaa49cbd9c8d02ed8087c70b64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B5=B5=E7=A9=BA=E4=BA=8B=E3=82=B9=E3=83=94=E3=83=AA?= =?UTF-8?q?=E3=83=83=E3=83=88?= Date: Thu, 5 Sep 2024 14:12:52 +0800 Subject: [PATCH 3/3] Update System_limit.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 絵空事スピリット --- docs/zh/reference/System_limit.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/zh/reference/System_limit.md b/docs/zh/reference/System_limit.md index e6afd6f254da1..c5a821640eef9 100644 --- a/docs/zh/reference/System_limit.md +++ b/docs/zh/reference/System_limit.md @@ -18,12 +18,8 @@ displayed_sidebar: docs - 列名（包括列别名）、分区名、索引名大小写**不敏感**，其他名称大小写**敏感**。 - 对标签（Label）名的要求： -<<<<<<< HEAD:docs/zh/reference/System_limit.md - 导入数据时可指定任务的标签（Label）。标签名可由数字 (0-9)、字母（a-z或A-Z），以及下划线(\_)组成，且长度不能超过 128 个字符。标签名对起始字符无要求。 -======= 导入数据时可指定任务的标签（Label）。标签名可由数字 (0-9)、字母（a-z或A-Z），以及下划线(\_)组成，且长度不能超过 128 个字符。标签名以字母或下划线开头。 ->>>>>>> a97db920bc ([Doc] Update System_limit.md (#50542)):docs/zh/sql-reference/System_limit.md - 建表时，Key 列不能使用 FLOAT 或者 DOUBLE 类型，可用 DECIMAL 类型表示小数。