-
Notifications
You must be signed in to change notification settings - Fork 2
docs: refactor docs of loader & client for new version(1.7.0) #4
Changes from all commits
07213c0
17af21d
86ab30f
d412916
0fc05c9
db852d6
cf8d674
5c53fcd
13ef946
acbfac9
952f68b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,12 +13,13 @@ weight: 2 | |
|
|
||
| HugeGraph-Client 是操作 graph 的总入口,用户必须先创建出 HugeGraph-Client 对象,与 HugeGraph-Server 建立连接(伪连接)后,才能获取到 schema、graph 以及 gremlin 的操作入口对象。 | ||
|
|
||
| 目前 HugeGraph-Client 只允许连接服务端已存在的图,无法自定义图进行创建。其创建方法如下: | ||
| 目前 HugeGraph-Client 只允许连接服务端已存在的图,无法自定义图进行创建。1.7.0 版本后,client 支持 graphSpace 设置,默认为DEFAULT。其创建方法如下: | ||
|
|
||
| ```java | ||
| // HugeGraphServer 地址:"http://localhost:8080" | ||
| // 图的名称:"hugegraph" | ||
| HugeClient hugeClient = HugeClient.builder("http://localhost:8080", "hugegraph") | ||
| //.builder("http://localhost:8080", "graphSpaceName", "hugegraph") | ||
| .configTimeout(20) // 默认 20s 超时 | ||
| .configUser("**", "**") // 默认未开启用户权限 | ||
| .build(); | ||
|
|
@@ -455,6 +456,40 @@ Edge knows1 = marko.addEdge("knows", vadas, "city", "Beijing"); | |
|
|
||
| **注意:当 frequency 为 multiple 时必须要设置 sortKeys 对应属性类型的值。** | ||
|
|
||
| ### 4 简单示例 | ||
| ### 4 图管理 | ||
| client支持一个物理部署中多个 GraphSpace,每个 GraphSpace 下可以含多个图(graph)。 | ||
| - 兼容:不指定 GraphSpace 时,默认使用 "DEFAULT" 空间 | ||
|
|
||
| #### 4.1 创建GraphSpace | ||
|
|
||
| ```java | ||
| GraphSpaceManager spaceManager = hugeClient.graphSpace(); | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 创建 GraphSpace 的示例代码过于简化: GraphSpaceManager spaceManager = hugeClient.graphSpace();
GraphSpace graphSpace = new GraphSpace();
graphSpace.setName("myGraphSpace");
spaceManager.createGraphSpace(graphSpace);问题:
建议补充完整示例: try {
GraphSpaceManager spaceManager = hugeClient.graphSpace();
// 检查是否已存在
if (spaceManager.getGraphSpace("myGraphSpace") != null) {
System.out.println("GraphSpace already exists");
return;
}
GraphSpace graphSpace = new GraphSpace();
graphSpace.setName("myGraphSpace");
graphSpace.setDescription("Business data graph space");
graphSpace.setMaxGraphNumber(10);
graphSpace.setMaxRoleNumber(100);
spaceManager.createGraphSpace(graphSpace);
System.out.println("GraphSpace created successfully");
} catch (Exception e) {
System.err.println("Failed to create GraphSpace: " + e.getMessage());
}
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这部分有些冗余了,没有必要吧 |
||
| // 定义 GraphSpace 配置 | ||
| GraphSpace graphSpace = new GraphSpace(); | ||
| graphSpace.setName("myGraphSpace"); | ||
| graphSpace.setDescription("Business data graph space"); | ||
| graphSpace.setMaxGraphNumber(10); // 最大图数量 | ||
| graphSpace.setMaxRoleNumber(100); // 最大角色数量 | ||
|
|
||
| // 创建 GraphSpace | ||
| spaceManager.createGraphSpace(graphSpace); | ||
| ``` | ||
| #### 4.2 GraphSpace 接口汇总 | ||
sadwitdastreetz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
sadwitdastreetz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| | 类别 | 接口 | 描述 | | ||
| |------|------|------| | ||
| | Manager - 查询 | listGraphSpace() | 获取所有 GraphSpace 列表 | | ||
| | | getGraphSpace(String name) | 获取指定 GraphSpace | | ||
| | Manager - 创建/更新 | createGraphSpace(GraphSpace) | 创建 GraphSpace | | ||
| | | updateGraphSpace(String, GraphSpace) | 更新配置 | | ||
| | Manager - 删除 | removeGraphSpace(String) | 删除指定 GraphSpace | | ||
| | GraphSpace - 属性 | getName() / getDescription() | 获取名称/描述 | | ||
| | | getGraphNumber() | 获取图数量 | | ||
| | GraphSpace - 配置 | setDescription(String) | 设置描述 | | ||
| | | setMaxGraphNumber(int) | 设置最大图数量 | | ||
|
|
||
|
Comment on lines
+482
to
+491
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 接口表方法名不一致且表格不完整 第 481 行显示
另外,为提高表格清晰度,建议在 GraphSpace 对象方法行中补全 getter 方法列表,并确保所有在示例中出现过的方法都被文档化。 建议修正为: -| Manager - 查询 | listGraphSpace() | 获取所有 GraphSpace 列表 |
+| Manager - 查询 | listGraphSpaces() | 获取所有 GraphSpace 列表 |
| | getGraphSpace(String name) | 获取指定 GraphSpace |
| Manager - 创建/更新 | createGraphSpace(GraphSpace) | 创建 GraphSpace |
| | updateGraphSpace(String, GraphSpace) | 更新配置 |
| Manager - 删除 | removeGraphSpace(String) | 删除指定 GraphSpace |
+| | removeGraphSpace(String name, boolean force) | 强制删除 GraphSpace(包含所有图数据) |
| GraphSpace - 属性 | getName() / getDescription() | 获取名称/描述 |
| | getGraphNumber() | 获取图数量 |
+| | getMaxGraphNumber() / getMaxRoleNumber() | 获取最大图/角色数量 |
| GraphSpace - 配置 | setDescription(String) | 设置描述 |
| | setMaxGraphNumber(int) | 设置最大图数量 |
+| | setMaxRoleNumber(int) | 设置最大角色数量 | |
||
|
|
||
| ### 5 简单示例 | ||
|
|
||
| 简单示例见[HugeGraph-Client](/cn/docs/quickstart/client/hugegraph-client) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,7 +48,7 @@ weight: 1 | |
| <groupId>org.apache.hugegraph</groupId> | ||
| <artifactId>hugegraph-client</artifactId> | ||
| <!-- Update to the latest release version --> | ||
| <version>1.5.0</version> | ||
| <version>1.7.0</version> | ||
| </dependency> | ||
| </dependencies> | ||
| ``` | ||
|
|
@@ -79,7 +79,10 @@ public class SingleExample { | |
| public static void main(String[] args) throws IOException { | ||
| // If connect failed will throw a exception. | ||
| HugeClient hugeClient = HugeClient.builder("http://localhost:8080", | ||
| "DEFAULT", | ||
| "hugegraph") | ||
sadwitdastreetz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .configUser("username", "password") | ||
sadwitdastreetz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // 这是示例,生产环境需要使用安全的凭证 | ||
| .build(); | ||
|
|
||
| SchemaManager schema = hugeClient.schema(); | ||
|
|
@@ -224,7 +227,10 @@ public class BatchExample { | |
| public static void main(String[] args) { | ||
| // If connect failed will throw a exception. | ||
| HugeClient hugeClient = HugeClient.builder("http://localhost:8080", | ||
| "hugegraph") | ||
| "DEFAULT", | ||
| "hugegraph") | ||
| .configUser("username", "password") | ||
| // 这是示例,生产环境需要使用安全的凭证 | ||
| .build(); | ||
|
|
||
| SchemaManager schema = hugeClient.schema(); | ||
|
|
@@ -348,12 +354,11 @@ public class BatchExample { | |
| } | ||
| ``` | ||
|
|
||
| ### 4.4 运行 Example | ||
| #### 4.4 运行 Example | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧹 Minor: 标题层级调整不一致 在 quickstart 文档中:
问题: 建议:
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 为了和之前小节的等级保持一致 |
||
|
|
||
| 运行 Example 之前需要启动 Server, | ||
| 启动过程见[HugeGraph-Server Quick Start](/cn/docs/quickstart/hugegraph-server) | ||
|
|
||
| ### 4.5 详细 API 说明 | ||
| #### 4.5 详细 API 说明 | ||
|
|
||
| 示例说明见[HugeGraph-Client 基本 API 介绍](/cn/docs/clients/hugegraph-client) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -601,7 +601,7 @@ bin/mapping-convert.sh struct.json | |
|
|
||
| ##### 3.3.2 输入源 | ||
|
|
||
| 输入源目前分为四类:FILE、HDFS、JDBC、KAFKA,由`type`节点区分,我们称为本地文件输入源、HDFS 输入源、JDBC 输入源和 KAFKA 输入源,下面分别介绍。 | ||
| 输入源目前分为五类:FILE、HDFS、JDBC、KAFKA 和 GRAPH,由`type`节点区分,我们称为本地文件输入源、HDFS 输入源、JDBC 输入源和 KAFKA 输入源,图数据源,下面分别介绍。 | ||
|
|
||
| ###### 3.3.2.1 本地文件输入源 | ||
|
|
||
|
|
@@ -705,6 +705,22 @@ schema: 必填 | |
| - skipped_line:想跳过的行,复合结构,目前只能配置要跳过的行的正则表达式,用子节点 regex 描述,默认不跳过任何行,选填; | ||
| - early_stop:某次从 Kafka broker 拉取的记录为空,停止任务,默认为 false,仅用于调试,选填; | ||
|
|
||
| ###### 3.3.2.5 GRAPH 输入源 | ||
|
|
||
| - type:输入源类型,必须填 `graph` 或 `GRAPH`,必填; | ||
| - graphspace:源图空间名称,默认为 `DEFAULT`; | ||
| - graph: 源图名称,必填; | ||
| - username:HugeGraph 用户名; | ||
| - password:HugeGraph 密码; | ||
| - selected_vertices:要同步的顶点筛选规则; | ||
| - ignored_vertices:要忽略的顶点筛选规则; | ||
sadwitdastreetz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| - selected_edges:要同步的边筛选规则; | ||
| - ignored_edges:要忽略的边筛选规则; | ||
| - pd-peers:HugeGraph-PD 节点地址; | ||
| - meta-endpoints:源集群 Meta服务端点; | ||
| - cluster:源集群名称; | ||
| - batch_size:批量读取源图数据的批次大小,默认为500; | ||
|
|
||
| ##### 3.3.3 顶点和边映射 | ||
|
|
||
| 顶点和边映射的节点(JSON 文件中的一个 key)有很多相同的部分,下面先介绍相同部分,再分别介绍`顶点映射`和`边映射`的特有节点。 | ||
|
|
@@ -790,20 +806,29 @@ schema: 必填 | |
| | 参数 | 默认值 | 是否必传 | 描述信息 | | ||
| |---------------------------|-----------|------|-------------------------------------------------------------------| | ||
| | `-f` 或 `--file` | | Y | 配置脚本的路径 | | ||
| | `-g` 或 `--graph` | | Y | 图数据库空间 | | ||
| | `-s` 或 `--schema` | | Y | schema 文件路径 | | | ||
| | `-h` 或 `--host` | localhost | | HugeGraphServer 的地址 | | ||
| | `-g` 或 `--graph` | | Y | 图名称 | | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
问题:
建议:
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这个是之前写错了,改成图名称 |
||
| | `-gs` 或 `--graphspace` | DEFAULT | | 图空间 | | ||
| | `-s` 或 `--schema` | | Y | schema 文件路径 | | ||
| | `-h` 或 `--host` 或 `-i` | localhost | | HugeGraphServer 的地址 | | ||
| | `-p` 或 `--port` | 8080 | | HugeGraphServer 的端口号 | | ||
| | `--username` | null | | 当 HugeGraphServer 开启了权限认证时,当前图的 username | | ||
| | `--password` | null | | 当 HugeGraphServer 开启了权限认证时,当前图的 password | | ||
| | `--create-graph` | false | | 是否在图不存在时自动创建 | | ||
| | `--token` | null | | 当 HugeGraphServer 开启了权限认证时,当前图的 token | | ||
| | `--protocol` | http | | 向服务端发请求的协议,可选 http 或 https | | ||
| | `--pd-peers` | | | PD 服务节点地址 | | ||
| | `--pd-token` | | | 访问 PD 服务的 token | | ||
| | `--meta-endpoints` | | | 元信息存储服务地址 | | ||
| | `--direct` | false | | 是否直连 HugeGraph-Store | | ||
| | `--route-type` | NODE_PORT | | 路由选择方式(可选值:NODE_PORT / DDS / BOTH) | | ||
| | `--cluster` | hg | | 集群名 | | ||
| | `--trust-store-file` | | | 请求协议为 https 时,客户端的证书文件路径 | | ||
| | `--trust-store-password` | | | 请求协议为 https 时,客户端证书密码 | | ||
| | `--clear-all-data` | false | | 导入数据前是否清除服务端的原有数据 | | ||
| | `--clear-timeout` | 240 | | 导入数据前清除服务端的原有数据的超时时间 | | ||
| | `--incremental-mode` | false | | 是否使用断点续导模式,仅输入源为 FILE 和 HDFS 支持该模式,启用该模式能从上一次导入停止的地方开始导 | | ||
| | `--incremental-mode` | false | | 是否使用断点续导模式,仅输入源为 FILE 和 HDFS 支持该模式,启用该模式能从上一次导入停止的地方开始导入 | | ||
| | `--failure-mode` | false | | 失败模式为 true 时,会导入之前失败了的数据,一般来说失败数据文件需要在人工更正编辑好后,再次进行导入 | | ||
| | `--batch-insert-threads` | CPUs | | 批量插入线程池大小 (CPUs 是当前 OS 可用可用**逻辑核**个数) | | ||
| | `--batch-insert-threads` | CPUs | | 批量插入线程池大小 (CPUs 是当前 OS 可用**逻辑核**个数) | | ||
| | `--single-insert-threads` | 8 | | 单条插入线程池的大小 | | ||
| | `--max-conn` | 4 * CPUs | | HugeClient 与 HugeGraphServer 的最大 HTTP 连接数,**调整线程**的时候建议同时调整此项 | | ||
| | `--max-conn-per-route` | 2 * CPUs | | HugeClient 与 HugeGraphServer 每个路由的最大 HTTP 连接数,**调整线程**的时候建议同时调整此项 | | ||
|
|
@@ -817,7 +842,7 @@ schema: 必填 | |
| | `--check-vertex` | false | | 插入边时是否检查边所连接的顶点是否存在 | | ||
| | `--print-progress` | true | | 是否在控制台实时打印导入条数 | | ||
| | `--dry-run` | false | | 打开该模式,只解析不导入,通常用于测试 | | ||
| | `--help` | false | | 打印帮助信息 | | ||
| | `--help` | false | | 打印帮助信息 | | ||
|
|
||
| ##### 3.4.2 断点续导模式 | ||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧹 Minor: 中英文文档表述不一致
中文版:
英文版:
问题:
建议统一表述:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
表述是一致的其实