From db99b52ae7c69c6eef00c2dc499e34ba44ca3d31 Mon Sep 17 00:00:00 2001
From: cooper-lzy <78672629+cooper-lzy@users.noreply.github.com>
Date: Fri, 10 Sep 2021 11:38:39 +0800
Subject: [PATCH 1/3] add cn doc

---
 .../6.functions-and-expressions/13.concat.md  | 105 ++++++++++++++++++
 .../6.show/19.show-meta-leader.md             |  29 +++++
 .../1.authentication/4.ldap.md                | 103 +++++++++++++++++
 .../improve-query-by-tag-index.md             |  53 +++++++++
 mkdocs.yml                                    |   6 +
 5 files changed, 296 insertions(+)
 create mode 100644 docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md
 create mode 100644 docs-2.0/3.ngql-guide/7.general-query-statements/6.show/19.show-meta-leader.md
 create mode 100644 docs-2.0/7.data-security/1.authentication/4.ldap.md
 create mode 100644 docs-2.0/8.service-tuning/improve-query-by-tag-index.md

diff --git a/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md b/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md
new file mode 100644
index 00000000000..a17ee2c9de5
--- /dev/null
+++ b/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md
@@ -0,0 +1,105 @@
+<!--
+# concat函数
+
+`concat()`和`concat_ws()`函数返回一个或多个字符串连接产生的字符串。
+
+## concat()函数
+
+`concat()`函数至少需要两个或以上字符串参数，并将所有参数连接成一个字符串。
+- 如果字符串参数只有一个，则返回该字符串参数本身。
+- 如果任何一个的字符串参数为 `NULL`，则 `concat()` 函数返回值为`NULL`。
+
+### 语法
+```bash
+concat(string1,string2,...)
+```
+
+### 示例
+
+```bash
+//连接1，2，3
+nebula> RETURN concat("1","2","3") AS r;
++-------+
+| r     |
++-------+
+| "123" |
++-------+
+
+//字符串参数有NULL
+nebula> RETURN concat("1","2",NULL) AS r;
++----------+
+| r        |
++----------+
+| __NULL__ |
++----------+
+
+nebula> GO FROM "player100" over follow \
+        YIELD concat(follow._src, $^.player.age, $$.player.name, follow.degree) AS A;
++------------------------------+
+| A                            |
++------------------------------+
+| "player10042Tony Parker95"   |
++------------------------------+
+| "player10042Manu Ginobili95" |
++------------------------------+
+```
+
+## concat_ws()函数
+
+`concat_ws()`函数将两个或以上字符串参数与预定义的分隔符（separator）相连接。
+- 如果分隔符为`NULL`时，`concat_ws()`函数才返回`NULL`。
+- 如果分隔符不为`NULL`，字符串参数只有一个，则返回该字符串参数本身。
+- 字符串参数存在`NULL`值时，忽略`NULL`值，继续连接下一个参数。
+
+### 语法
+
+```bash
+concat_ws(separator,string1,string2,... )
+```
+
+### 示例
+
+```bash
+//分隔符为+，连接a，b，c
+nebula> RETURN concat_ws("+","a","b","c") AS r;
++---------+
+| r       |
++---------+
+| "a+b+c" |
++---------+
+
+//分隔符为 NULL
+neubla> RETURN concat_ws(NULL,"a","b","c") AS r;
++----------+
+| r        |
++----------+
+| __NULL__ |
++----------+
+
+//分隔符为+，字符串参数有NULL
+nebula> RETURN concat_ws("+","a",NULL,"b","c") AS r;
++---------+
+| r       |
++---------+
+| "a+b+c" |
++---------+
+
+//分隔符为+。字符串参数只有一个
+nebula> RETURN concat_ws("+","a") AS r;
++-----+
+| r   |
++-----+
+| "a" |
++-----+
+
+nebula> GO FROM "player100" over follow \
+        YIELD concat_ws(" ",follow._src, $^.player.age, $$.player.name, follow.degree) AS A;
++---------------------------------+
+| A                               |
++---------------------------------+
+| "player100 42 Tony Parker 95"   |
++---------------------------------+
+| "player100 42 Manu Ginobili 95" |
++---------------------------------+
+```
+-->
\ No newline at end of file
diff --git a/docs-2.0/3.ngql-guide/7.general-query-statements/6.show/19.show-meta-leader.md b/docs-2.0/3.ngql-guide/7.general-query-statements/6.show/19.show-meta-leader.md
new file mode 100644
index 00000000000..432a00f815d
--- /dev/null
+++ b/docs-2.0/3.ngql-guide/7.general-query-statements/6.show/19.show-meta-leader.md
@@ -0,0 +1,29 @@
+<!-->
+# SHOW META LEADER
+
+`SHOW META LEADER`语句显示当前Meta集群的leader信息。
+
+关于Meta服务的详细说明请参见[Meta 服务](../../../1.introduction/3.nebula-graph-architecture/2.meta-service.md)。
+
+## 语法
+
+```ngql
+SHOW META LEADER;
+```
+
+## 示例
+
+```ngql
+nebula> SHOW META LEADER;
++------------------+---------------------------+
+| Meta Leader      | secs from last heart beat |
++------------------+---------------------------+
+| "127.0.0.1:9559" | 3                         |
++------------------+---------------------------+
+```
+
+|参数|说明|
+|:---|:---|
+|`Meta Leader`|Meta集群的leader信息，包括leader所在服务器的IP地址和端口。|
+|`secs from last heart beat`|距离上次心跳的时间间隔。单位：秒。|
+-->
\ No newline at end of file
diff --git a/docs-2.0/7.data-security/1.authentication/4.ldap.md b/docs-2.0/7.data-security/1.authentication/4.ldap.md
new file mode 100644
index 00000000000..05dcd06cf9d
--- /dev/null
+++ b/docs-2.0/7.data-security/1.authentication/4.ldap.md
@@ -0,0 +1,103 @@
+<!--
+# 使用OpenLDAP进行身份验证
+
+本文介绍如何将Nebula Graph连接到OpenLDAP服务器，使用OpenLDAP中定义的DN（Distinguished Name）和密码进行身份验证。
+
+!!! enterpriseonly
+
+    仅企业版支持本功能。
+
+## 认证方式
+
+启用OpenLDAP身份验证后，输入用户的账号和密码登录Nebula Graph时，Nebula Graph会在Meta服务中查找登录账号是否存在，如果账号存在，再根据认证方式去OpenLDAP中找到对应的DN，验证密码。
+
+OpenLDAP支持的认证方式有两种：简单绑定认证和搜索绑定认证。
+
+### 简单绑定认证（SimpleBindAuth）
+
+简单绑定认证会根据登录账号和Graph服务配置信息，拼接成OpenLDAP可以识别的DN，然后根据DN和密码，在OpenLDAP上进行验证。
+
+### 搜索绑定认证（SearchBindAuth）
+
+搜索绑定认证会读取Graph服务配置信息，查询配置信息中的`uid`和登录账号是否匹配，如果匹配，就读取这个DN，然后用DN和密码，在OpenLDAP上进行验证。
+
+## 前提条件
+
+- 已安装[OpenLDAP](https://www.openldap.org/)。
+
+- 已在OpenLDAP上导入用户的账号和密码信息。
+
+- OpenLDAP所在服务器已开放相应认证端口。
+
+## 操作步骤
+
+以OpenLDAP上已存在的账号`test2`、密码`passwdtest2`为例进行演示。
+
+1. [连接Nebula Graph](../../4.deployment-and-installation/connect-to-nebula-graph.md)，创建与OpenLDAP中对应的影子账号`test2`并授权。
+
+  ```ngql
+  nebula> CREATE USER test2 WITH PASSWORD '';
+  nebula> GRANT ROLE ADMIN ON basketballplayer TO test2;
+  ```
+
+    !!! note
+
+        Nebula Graph内创建用户时，密码可以任意设置。
+
+2. 编辑配置文件`nebula-graphd.conf`（默认目录为`/usr/local/nebula/etc/`）：
+
+  - 简单绑定认证（推荐）
+
+    ```bash
+    # 是否从配置文件获取配置信息。
+    --local_config=true
+    # 是否开启身份验证
+    --enable_authorize=true
+    # 身份验证方式：password、ldap、cloud
+    --auth_type=ldap
+    # OpenLDAP服务器地址
+    --ldap_server=192.168.8.211
+    # OpenLDAP服务器端口
+    --ldap_port=389
+    # OpenLDAP中的Schema名称
+    --ldap_scheme=ldap
+    # DN前缀
+    --ldap_prefix=uid=
+    # DN后缀
+    --ldap_suffix=,ou=it,dc=sys,dc=com
+    ```
+
+  - 搜索绑定认证
+
+    ```bash
+    # 是否从配置文件获取配置信息。
+    --local_config=true
+    # 是否开启身份验证
+    --enable_authorize=true
+    # 身份验证方式：password、ldap、cloud
+    --auth_type=ldap
+    # OpenLDAP服务器地址
+    --ldap_server=192.168.8.211
+    # OpenLDAP服务器端口
+    --ldap_port=389
+    # OpenLDAP中的Schema名称
+    --ldap_scheme=ldap
+    # 绑定目标对象的DN
+    --ldap_basedn=uid=test2,ou=it,dc=sys,dc=com
+    ```
+
+3. [重启Nebula Graph服务](../../4.deployment-and-installation/manage-service.md)，让新配置生效。
+
+4. 进行登录测试。
+
+  ```bash
+  $ ./nebula-console --addr 127.0.0.1 --port 9669 -u test2 -p passwdtest2
+  2021/09/08 03:49:39 [INFO] connection pool is initialized successfully
+
+  Welcome to Nebula Graph!
+  ```
+
+    !!! note
+
+        使用OpenLDAP进行身份验证后，本地用户（包括`root`）无法正常登录。
+-->
\ No newline at end of file
diff --git a/docs-2.0/8.service-tuning/improve-query-by-tag-index.md b/docs-2.0/8.service-tuning/improve-query-by-tag-index.md
new file mode 100644
index 00000000000..2fdfab05049
--- /dev/null
+++ b/docs-2.0/8.service-tuning/improve-query-by-tag-index.md
@@ -0,0 +1,53 @@
+<!-->
+# 增加和删除标签
+
+在openCypher中，有增加标签（`SET label`）和移除标签（`REMOVE label`）的功能，可以用于加速查询或者标记过程。
+
+在Nebula Graph中，可以通过Tag变相实现相同操作，创建Tag并将Tag插入到已有的点上，就可以根据Tag名称快速查找点，也可以通过`DELETE TAG`删除某些点上不再需要的Tag。
+
+!!! caution
+
+    请确保点上已经有另一个Tag，否则删除点上最后一个Tag时，会导致点也被删除。
+
+## 示例
+
+例如在basketballplayer数据集中，部分篮球运动员同时也是球队股东，可以为股东Tag`shareholder`创建索引，方便快速查找。如果不再是股东，可以通过`DELETE TAG`语句删除相应运动员的股东Tag。
+
+```ngql
+//创建股东Tag和索引
+nebula> CREATE TAG shareholder();
+nebula> CREATE TAG INDEX shareholder_tag on shareholder();
+//为点添加Tag
+nebula> INSERT VERTEX shareholder() VALUES "player100":();
+nebula> INSERT VERTEX shareholder() VALUES "player101":();
+//快速查询所有股东
+nebula> MATCH (v:shareholder) RETURN v;
++---------------------------------------------------------------------+
+| v                                                                   |
++---------------------------------------------------------------------+
+| ("player100" :player{age: 42, name: "Tim Duncan"} :shareholder{})  |
++---------------------------------------------------------------------+
+| ("player101" :player{age: 36, name: "Tony Parker"} :shareholder{}) |
++---------------------------------------------------------------------+
+nebula> LOOKUP ON shareholder;
++-------------+
+| VertexID    |
++-------------+
+| "player100" |
++-------------+
+| "player101" |
++-------------+
+//如果player100不再是股东
+nebula> DELETE TAG shareholder FROM "player100";
+nebula> LOOKUP ON shareholder;
++-------------+
+| VertexID    |
++-------------+
+| "player101" |
++-------------+
+```
+
+!!! note
+
+    如果插入测试数据后才创建索引，请用`REBUILD TAG INDEX <index_name_list>;`语句重建索引。
+-->
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 6ccdb377de6..2dc1f0ab258 100755
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -162,6 +162,7 @@ nav:
           - collect(): 3.ngql-guide/6.functions-and-expressions/10.collect.md
           - reduce(): 3.ngql-guide/6.functions-and-expressions/11.reduce.md
           - hash(): 3.ngql-guide/6.functions-and-expressions/12.hash.md
+          - concat(): 3.ngql-guide/6.functions-and-expressions/13.concat.md
           - Predicate functions: 3.ngql-guide/6.functions-and-expressions/8.predicate.md
           - User-defined functions: 3.ngql-guide/6.functions-and-expressions/9.user-defined-functions.md
 
@@ -189,6 +190,7 @@ nav:
             - SHOW USERS: 3.ngql-guide/7.general-query-statements/6.show/16.show-users.md
             - SHOW SESSIONS: 3.ngql-guide/7.general-query-statements/6.show/17.show-sessions.md
             - SHOW QUERIES: 3.ngql-guide/7.general-query-statements/6.show/18.show-queries.md
+            - SHOW META LEADER: 3.ngql-guide/7.general-query-statements/6.show/19.show-meta-leader.md
 
       - Clauses and options:
           - GROUP BY: 3.ngql-guide/8.clauses-and-options/group-by.md
@@ -213,6 +215,8 @@ nav:
           - ALTER TAG: 3.ngql-guide/10.tag-statements/3.alter-tag.md
           - SHOW TAGS: 3.ngql-guide/10.tag-statements/4.show-tags.md
           - DESCRIBE TAG: 3.ngql-guide/10.tag-statements/5.describe-tag.md
+          - DELETE TAG: 3.ngql-guide/10.tag-statements/6.delete-tag.md
+
       - Edge type statements:
           - CREATE EDGE: 3.ngql-guide/11.edge-type-statements/1.create-edge.md
           - DROP EDGE: 3.ngql-guide/11.edge-type-statements/2.drop-edge.md
@@ -295,6 +299,7 @@ nav:
           - Authentication: 7.data-security/1.authentication/1.authentication.md
           - User management: 7.data-security/1.authentication/2.management-user.md
           - Roles and privileges: 7.data-security/1.authentication/3.role-list.md
+          - OpenLDAP authentication: 7.data-security/1.authentication/4.ldap.md
 #      - Backup & Restore:
 #          - What is Backup & Restore: 7.data-security/2.backup-restore/1.what-is-br.md
 #          - Compile BR: 7.data-security/2.backup-restore/2.compile-br.md
@@ -309,6 +314,7 @@ nav:
     - System design suggestions: 8.service-tuning/3.system-design.md
     - Execution plan: 8.service-tuning/4.plan.md
     - Processing super vertices: 8.service-tuning/super-node.md
+    - Add or delete tag: 8.service-tuning/improve-query-by-tag-index.md
 
   - Client:
     - Clients overview: 14.client/1.nebula-client.md

From 3ccc15d2103ef1ed729b9ec6bb2419947d836c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E6=99=93=E9=9D=92?=
 <86282370+izhuxiaoqing@users.noreply.github.com>
Date: Fri, 10 Sep 2021 18:03:24 +0800
Subject: [PATCH 2/3] concat and show meta leader

---
 .../6.functions-and-expressions/13.concat.md  | 50 ++++++++++---------
 .../6.show/19.show-meta-leader.md             | 16 +++---
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md b/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md
index a17ee2c9de5..f506fe7bdb6 100644
--- a/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md
+++ b/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md
@@ -1,23 +1,25 @@
-<!--
-# concat函数
+# concat function
 
-`concat()`和`concat_ws()`函数返回一个或多个字符串连接产生的字符串。
+The `concat()` and `concat_ws()` functions return strings concatenated by one or more strings.
 
-## concat()函数
+## concat() function
 
-`concat()`函数至少需要两个或以上字符串参数，并将所有参数连接成一个字符串。
-- 如果字符串参数只有一个，则返回该字符串参数本身。
-- 如果任何一个的字符串参数为 `NULL`，则 `concat()` 函数返回值为`NULL`。
+The `concat()` function requires at least two or more strings. All the parameters are concatenated into one string.
+
+- If there is only one string, the string itself is returned.
+
+- If any one of the string is `NULL`, `NULL` is returned.
+
+### Syntax
 
-### 语法
 ```bash
 concat(string1,string2,...)
 ```
 
-### 示例
+### Examples
 
 ```bash
-//连接1，2，3
+//This example concatenates 1, 2, and 3.
 nebula> RETURN concat("1","2","3") AS r;
 +-------+
 | r     |
@@ -25,7 +27,7 @@ nebula> RETURN concat("1","2","3") AS r;
 | "123" |
 +-------+
 
-//字符串参数有NULL
+//In this example, one of the string is NULL.
 nebula> RETURN concat("1","2",NULL) AS r;
 +----------+
 | r        |
@@ -44,23 +46,26 @@ nebula> GO FROM "player100" over follow \
 +------------------------------+
 ```
 
-## concat_ws()函数
+## concat_ws() function
+
+The `concat_ws()` function connects two or more strings with a predefined separator.
+
+- If the separator is `NULL`, the `concat_ws()` function returns `NULL`.
+
+- If the separator is not `NULL` and there is only one string, the string itself is returned.
 
-`concat_ws()`函数将两个或以上字符串参数与预定义的分隔符（separator）相连接。
-- 如果分隔符为`NULL`时，`concat_ws()`函数才返回`NULL`。
-- 如果分隔符不为`NULL`，字符串参数只有一个，则返回该字符串参数本身。
-- 字符串参数存在`NULL`值时，忽略`NULL`值，继续连接下一个参数。
+- If the separator is not `NULL` and there is a `NULL` in the strings, `NULL` is ignored during the concatenation.
 
-### 语法
+### Syntax
 
 ```bash
 concat_ws(separator,string1,string2,... )
 ```
 
-### 示例
+### Examples
 
 ```bash
-//分隔符为+，连接a，b，c
+//This example concatenates a, b, and c with the separator +.
 nebula> RETURN concat_ws("+","a","b","c") AS r;
 +---------+
 | r       |
@@ -68,7 +73,7 @@ nebula> RETURN concat_ws("+","a","b","c") AS r;
 | "a+b+c" |
 +---------+
 
-//分隔符为 NULL
+//In this example, the separator is NULL.
 neubla> RETURN concat_ws(NULL,"a","b","c") AS r;
 +----------+
 | r        |
@@ -76,7 +81,7 @@ neubla> RETURN concat_ws(NULL,"a","b","c") AS r;
 | __NULL__ |
 +----------+
 
-//分隔符为+，字符串参数有NULL
+//In this example, the separator is + and there is a NULL in the strings.
 nebula> RETURN concat_ws("+","a",NULL,"b","c") AS r;
 +---------+
 | r       |
@@ -84,7 +89,7 @@ nebula> RETURN concat_ws("+","a",NULL,"b","c") AS r;
 | "a+b+c" |
 +---------+
 
-//分隔符为+。字符串参数只有一个
+//In this example, the separator is + and there is only one string.
 nebula> RETURN concat_ws("+","a") AS r;
 +-----+
 | r   |
@@ -102,4 +107,3 @@ nebula> GO FROM "player100" over follow \
 | "player100 42 Manu Ginobili 95" |
 +---------------------------------+
 ```
--->
\ No newline at end of file
diff --git a/docs-2.0/3.ngql-guide/7.general-query-statements/6.show/19.show-meta-leader.md b/docs-2.0/3.ngql-guide/7.general-query-statements/6.show/19.show-meta-leader.md
index 432a00f815d..60f9afaad56 100644
--- a/docs-2.0/3.ngql-guide/7.general-query-statements/6.show/19.show-meta-leader.md
+++ b/docs-2.0/3.ngql-guide/7.general-query-statements/6.show/19.show-meta-leader.md
@@ -1,17 +1,16 @@
-<!-->
 # SHOW META LEADER
 
-`SHOW META LEADER`语句显示当前Meta集群的leader信息。
+The `SHOW META LEADER` statement shows the information of the leader in the current Meta cluster.
 
-关于Meta服务的详细说明请参见[Meta 服务](../../../1.introduction/3.nebula-graph-architecture/2.meta-service.md)。
+For more information about the Meta service, see [Meta service](../../../1.introduction/3.nebula-graph-architecture/2.meta-service.md).
 
-## 语法
+## Syntax
 
 ```ngql
 SHOW META LEADER;
 ```
 
-## 示例
+## Example
 
 ```ngql
 nebula> SHOW META LEADER;
@@ -22,8 +21,7 @@ nebula> SHOW META LEADER;
 +------------------+---------------------------+
 ```
 
-|参数|说明|
+|Parameter|Description|
 |:---|:---|
-|`Meta Leader`|Meta集群的leader信息，包括leader所在服务器的IP地址和端口。|
-|`secs from last heart beat`|距离上次心跳的时间间隔。单位：秒。|
--->
\ No newline at end of file
+|`Meta Leader`|Shows the information of the leader in the Meta cluster, including the IP address and port of the server where the leader is located.|
+|`secs from last heart beat`|Indicates the time interval since the last heartbeat. This parameter is measured in seconds.|

From 273f1c2021b186788cb4a52074a8bd02b68f8df7 Mon Sep 17 00:00:00 2001
From: "max.zhu@vesoft.com" <86282370+izhuxiaoqing@users.noreply.github.com>
Date: Mon, 13 Sep 2021 10:53:33 +0800
Subject: [PATCH 3/3] Update 13.concat.md

---
 docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md b/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md
index f506fe7bdb6..7be8e392f96 100644
--- a/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md
+++ b/docs-2.0/3.ngql-guide/6.functions-and-expressions/13.concat.md
@@ -8,7 +8,7 @@ The `concat()` function requires at least two or more strings. All the parameter
 
 - If there is only one string, the string itself is returned.
 
-- If any one of the string is `NULL`, `NULL` is returned.
+- If any one of the strings is `NULL`, `NULL` is returned.
 
 ### Syntax