This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch iotdb-1620 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e404c29e40d8477099a55511c6718da372bf45c6 Author: Steve Yurong Su <[email protected]> AuthorDate: Thu Oct 7 17:49:43 2021 +0800 remove & / % from ID_CHAR --- antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 3 --- docs/UserGuide/Data-Concept/Data-Model-and-Terminology.md | 2 +- docs/zh/UserGuide/Data-Concept/Data-Model-and-Terminology.md | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 index 58b7eb8..d18acfb 100644 --- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 +++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 @@ -1411,12 +1411,9 @@ fragment ID_CHAR | 'a'..'z' | '0'..'9' | '_' - | '/' | '@' | '#' | '$' - | '%' - | '&' | '{' | '}' | CN_CHAR diff --git a/docs/UserGuide/Data-Concept/Data-Model-and-Terminology.md b/docs/UserGuide/Data-Concept/Data-Model-and-Terminology.md index d8a7b04..4f5a7ef 100644 --- a/docs/UserGuide/Data-Concept/Data-Model-and-Terminology.md +++ b/docs/UserGuide/Data-Concept/Data-Model-and-Terminology.md @@ -82,7 +82,7 @@ The following are the constraints on the layer (`layer_name`): * Except for the beginning layer (`root`) of the time series, the characters supported in other layers are as follows: * Chinese characters: `"\u2E80"` to `"\u9FFF"` - * `"_"，"/"，"@"，"#"，"$"，"%"，"&"，"{"，"}"` + * `"_"，"@"，"#"，"$"，"{"，"}"` * `"A"` to `"Z"`, `"a"` to `"z"`, `"0"` to `"9"` * In addition to the beginning layer (`root`) of the time series and the storage group layer, other layers also support the use of special strings referenced by \` or `" ` as its name. It should be noted that the quoted string cannot contain `.` characters. Here are some legal examples: diff --git a/docs/zh/UserGuide/Data-Concept/Data-Model-and-Terminology.md b/docs/zh/UserGuide/Data-Concept/Data-Model-and-Terminology.md index 3bbf694..c40a89a 100644 --- a/docs/zh/UserGuide/Data-Concept/Data-Model-and-Terminology.md +++ b/docs/zh/UserGuide/Data-Concept/Data-Model-and-Terminology.md @@ -83,7 +83,7 @@ layer_name : identifier * 除了时间序列的开头的层级（`root`）外，其他的层级支持的字符如下： * 中文字符`"\u2E80"`到`"\u9FFF"` - * `"_"，"/"，"@"，"#"，"$"，"%"，"&"，"{"，"}"` + * `"_"，"@"，"#"，"$"，"{"，"}"` * `"A"`到`"Z"`，`"a"`到`"z"`，`"0"`到`"9"` * 除了时间序列的开头的层级（`root`）和存储组层级外，层级还支持使用被 \` 或者 ` " ` 符号引用的特殊字符串作为其名称。需要注意的是，被引用的字符串不可带有 `.` 字符。下面是一些合法的例子： * root.sg.select."+-\`from\`".""""."\$"，6 个层级分别为 root, sg, select, +-\`\from`, "", \$
