Merge 3.3 to master

docs-2.0/2.quick-start/4.nebula-graph-crud.md

@@ -85,6 +85,10 @@ In this topic, we will use the following dataset to demonstrate basic CRUD opera
     nebula> CREATE SPACE basketballplayer(partition_num=15, replica_factor=1, vid_type=fixed_string(30));
     ```
 
+  !!! note
+
+        If the system returns the error `[ERROR (-1005)]: Host not enough!`, check whether [registered the Storage Service](../2.quick-start/3.1add-storage-hosts.md).
+
 2. Check the partition distribution with `SHOW HOSTS` to make sure that the partitions are distributed in a balanced way.
 
     ```ngql

docs-2.0/2.quick-start/6.cheatsheet-for-ngql.md

@@ -31,7 +31,7 @@
   | bit_and()                               | Bitwise AND.                                                 |
   | bit_or()                                | Bitwise OR.                                                  |
   | bit_xor()                               | Bitwise XOR.                                                 |
-  | int size()                              | Returns the number of elements in a list or a map.           |
+  | int size()                              | Returns the number of elements in a list or a map or the length of a string.           |
   | int range(int start, int end, int step) | Returns a list of integers from `[start,end]` in the specified steps. `step` is 1 by default. |
   | int sign(double x)                      | Returns the signum of the given number.<br/>If the number is `0`, the system returns `0`.<br/>If the number is negative, the system returns `-1`.<br/>If the number is positive, the system returns `1`. |
   | double e()                              | Returns the base of the natural logarithm, e (2.718281828459045). |
@@ -60,7 +60,7 @@
   |string toLower(string a) | The same as `lower()`. |
   |string upper(string a) | Returns the argument in uppercase. |
   |string toUpper(string a) | The same as `upper()`. |
-  |int length(string a) | Returns the length of the given string in bytes. |
+  |int length(a) | Returns the length of the given string in bytes or the length of a path in hops. |
   |string trim(string a) | Removes leading and trailing spaces. |
   |string ltrim(string a) | Removes leading spaces. |
   |string rtrim(string a) | Removes trailing spaces. |
@@ -82,13 +82,13 @@
 
   |Function| Description |
   |----  |  ----|
-  |int now()  | Returns the current date and time of the system timezone. |
-  |timestamp timestamp() | Returns the current date and time of the system timezone. |
+  |int now()  | Returns the current timestamp of the system. |
+  |timestamp timestamp() | Returns the current timestamp of the system. |
   |date date() | Returns the current UTC date based on the current system. |
   |time time() | Returns the current UTC time based on the current system. |
   |datetime datetime() | Returns the current UTC date and time based on the current system. |  
 
-* [Schema functions](../3.ngql-guide/6.functions-and-expressions/4.schema.md)
+* [Schema-related functions](../3.ngql-guide/6.functions-and-expressions/4.schema.md)
 
   * For nGQL statements
 
@@ -185,14 +185,14 @@
   | Match vertices                      | `(v)`                                                        | You can use a user-defined variable in a pair of parentheses to represent a vertex in a pattern. For example: `(v)`. |
   | Match tags                     | `MATCH (v:player) RETURN v`                                  | You can specify a tag with `:<tag_name>` after the vertex in a pattern.           |
   | Match multiple tags | `MATCH (v:player:team) RETURN v LIMIT 10` | To match vertices with multiple tags, use colons (:). |
-  | Match vertex properties                | `MATCH (v:player{name:"Tim Duncan"}) RETURN v`               | You can specify a vertex property with `{<prop_name>: <prop_value>}` after the tag in a pattern. |
+  | Match vertex properties                | `MATCH (v:player{name:"Tim Duncan"}) RETURN v`  <br><br>`MATCH (v) WITH v, properties(v) as props, keys(properties(v)) as kk LIMIT 10000 WHERE [i in kk where props[i] == "Tim Duncan"] RETURN v`             | You can specify a vertex property with `{<prop_name>: <prop_value>}` after the tag in a pattern; or use a vertex property value to get vertices directly. |
   | Match a VID.                  | `MATCH (v) WHERE id(v) == 'player101' RETURN v`              | You can use the VID to match a vertex. The `id()` function can retrieve the VID of a vertex.         |
   | Match multiple VIDs.                  | `MATCH (v:player { name: 'Tim Duncan' })--(v2) WHERE id(v2) IN ["player101", "player102"] RETURN v2` | To match multiple VIDs, use `WHERE id(v) IN [vid_list]`.        |
   | Match connected vertices                | `MATCH (v:player{name:"Tim Duncan"})--(v2) RETURN v2.player.name AS Name` | You can use the `--` symbol to represent edges of both directions and match vertices connected by these edges. You can add a `>` or `<` to the `--` symbol to specify the direction of an edge. |
   | Match paths                    | `MATCH p=(v:player{name:"Tim Duncan"})-->(v2) RETURN p`      | Connected vertices and edges form a path. You can use a user-defined variable to name a path as follows. |
   | Match edges                      | `MATCH (v:player{name:"Tim Duncan"})-[e]-(v2) RETURN e`<br>`MATCH ()<-[e]-() RETURN e LIMIT 3`      | Besides using `--`, `-->`, or `<--` to indicate a nameless edge, you can use a user-defined variable in a pair of square brackets to represent a named edge. For example: `-[e]-`. |
   | Match an edge type              | `MATCH ()-[e:follow]-() RETURN e LIMIT 5`                            |Just like vertices, you can specify an edge type with `:<edge_type>` in a pattern. For example: `-[e:follow]-`. |
-  | Match edge type properties                | ` MATCH (v:player{name:"Tim Duncan"})-[e:follow{degree:95}]->(v2) RETURN e` | You can specify edge type properties with `{<prop_name>: <prop_value>}` in a pattern. For example: `[e:follow{likeness:95}]`. |
+  | Match edge type properties                | ` MATCH (v:player{name:"Tim Duncan"})-[e:follow{degree:95}]->(v2) RETURN e` <br><br>`MATCH ()-[e]->() WITH e, properties(e) as props, keys(properties(e)) as kk LIMIT 10000 WHERE [i in kk where props[i] == 90] RETURN e`| You can specify edge type properties with `{<prop_name>: <prop_value>}` in a pattern. For example: `[e:follow{likeness:95}]`; or use an edge type property value to get edges directly. |
   | Match multiple edge types           | `MATCH (v:player{name:"Tim Duncan"})-[e:follow | :serve]->(v2) RETURN e` | The `|` symbol can help matching multiple edge types. For example: `[e:follow|:serve]`. The English colon (:) before the first edge type cannot be omitted, but the English colon before the subsequent edge type can be omitted, such as `[e:follow|serve]`. |
   | Match multiple edges                  | `MATCH (v:player{name:"Tim Duncan"})-[]->(v2)<-[e:serve]-(v3) RETURN v2, v3` | You can extend a pattern to match multiple edges in a path.                       |
   | Match fixed-length paths               | `MATCH p=(v:player{name:"Tim Duncan"})-[e:follow*2]->(v2) RETURN DISTINCT v2 AS Friends` | You can use the `:<edge_type>*<hop>` pattern to match a fixed-length path. `hop` must be a non-negative integer. The data type of `e` is the list.|

docs-2.0/20.appendix/0.FAQ.md

@@ -166,7 +166,7 @@ The reason for this error may be that the amount of data to be queried is too la
 
 - When importing data, set [Compaction](../8.service-tuning/compaction.md) manually to make read faster.
 
-- Extend the RPC connection timeout of the Graph service and the Storage service. Modify the value of `--storage_client_timeout_ms` in the `nebula-storaged.conf` file. This configuration is measured in milliseconds (ms). The default value is 60000ms.
+- Extend the RPC connection timeout of the Graph service and the Storage service. Modify the value of `--storage_client_timeout_ms` in the `nebula-graphd.conf` file. This configuration is measured in milliseconds (ms). The default value is 60000ms.
 <!--Tip: Add `--local_config=true` at the beginning of the configuration file and restart the service.-->
 
 ### "How to resolve the error `MetaClient.cpp:65] Heartbeat failed, status:Wrong cluster!` in `nebula-storaged.INFO`, or `HBProcessor.cpp:54] Reject wrong cluster host "x.x.x.x":9771!` in `nebula-metad.INFO`?"
@@ -293,7 +293,7 @@ Or get vertices by each tag, and then group them by yourself.
 
 Yes, for more information, see [Keywords and reserved words](../3.ngql-guide/1.nGQL-overview/keywords-and-reserved-words.md).
 
-### "How to get the out-degree/the in-degree of a vertex with a given name?"
+### "How to get the out-degree/the in-degree of a given vertex?"
 
 The out-degree of a vertex refers to the number of edges starting from that vertex, while the in-degree refers to the number of edges pointing to that vertex.
 
@@ -388,9 +388,9 @@ If you have not modified the predefined ports in the [Configurations](../5.confi
 
 | Service | Port                      |
 |---------|---------------------------|
-| Meta    | 9559, 9560, 19559, 19560  |
-| Graph   | 9669, 19669, 19670        |
-| Storage | 9777 ~ 9780, 19779, 19780 |
+| Meta    | 9559, 9560, 19559  |
+| Graph   | 9669, 19669   |
+| Storage | 9777 ~ 9780, 19779|
 
 If you have customized the configuration files and changed the predefined ports, find the port numbers in your configuration files and open them on the firewalls.
 

docs-2.0/20.appendix/6.eco-tool-version.md

@@ -146,6 +146,18 @@ Docker Compose can quickly deploy NebulaGraph clusters. For how to use it, pleas
 |:---|:---|
 | {{ nebula.tag }}  | {{br.tag}}|
 
+
+{{ent.ent_begin}}
+## Backup & Restore Enterprise Edition
+
+Backup Restore (BR for short) Enterprise Edition is a Command-Line Interface (CLI) tool. With BR Enterprise Edition, you can back up and restore NebulaGraph Enterprise Edition data.
+
+|NebulaGraph version|BR version|
+|:---|:---|
+| {{ nebula.tag }}  | {{br_ent.tag}}|
+
+{{ent.ent_end}}
+
 ## NebulaGraph Bench
 
 [NebulaGraph Bench](https://github.com/vesoft-inc/nebula-bench/releases/tag/{{bench.tag}}) is used to test the baseline performance data of NebulaGraph. It uses the standard data set of LDBC.