-
Notifications
You must be signed in to change notification settings - Fork 115
docs: refactor docs of loader & client for new version(1.7.0) #415
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
07213c0
fixed mvn version to 1.7.0
sadwitdastreetz 17af21d
fixed wrong formats & spellings
sadwitdastreetz 86ab30f
fixed errors && removed useless examples
sadwitdastreetz d412916
edited according to review
sadwitdastreetz 0fc05c9
fixed formats problems
sadwitdastreetz db852d6
update loader doc for loadSource(graph) && loadOptions
sadwitdastreetz cf8d674
fixed minor errors
sadwitdastreetz 5c53fcd
(fix):error in parameter description
sadwitdastreetz 13ef946
(fix): wrong countings && indentation
sadwitdastreetz acbfac9
(fix): wrong explanation for client building
sadwitdastreetz 952f68b
checked
sadwitdastreetz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 输入源,图数据源,下面分别介绍。 | ||
sadwitdastreetz marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| ###### 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:要忽略的顶点筛选规则; | ||
| - 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 | 图名称 | | ||
sadwitdastreetz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| | `-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 | | ||
sadwitdastreetz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| | `--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 | | 插入边时是否检查边所连接的顶点是否存在 | | ||
|
Member
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. 🧹 格式问题:表格末尾多余空格 这行末尾有多余的空格列分隔符,建议移除: ```suggestion |
||
| | `--print-progress` | true | | 是否在控制台实时打印导入条数 | | ||
| | `--dry-run` | false | | 打开该模式,只解析不导入,通常用于测试 | | ||
| | `--help` | false | | 打印帮助信息 | | ||
| | `--help` | false | | 打印帮助信息 | | | ||
|
|
||
| ##### 3.4.2 断点续导模式 | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
这里的缩进与上下文不一致,建议使用相同的缩进风格:
```suggestion
.configUser("username", "password")
// 这是示例,生产环境需要使用安全的凭证
.build();
```
应保持一致的缩进,使用空格对齐。