From 86c3df9cd1adcfdf291ea7c0a2f3721da7a00b36 Mon Sep 17 00:00:00 2001 From: cooper-lzy <78672629+cooper-lzy@users.noreply.github.com> Date: Sun, 28 Apr 2024 15:22:48 +0800 Subject: [PATCH] update connector and exchange (#2551) * update connector and exchange update connector and exchange * exchange supports filter (#467) --- .../connector/nebula-flink-connector.md | 1 + .../connector/nebula-spark-connector.md | 9 +++++++++ .../connector/nebula-flink-connector.md | 3 ++- .../connector/nebula-spark-connector.md | 9 +++++++++ mkdocs.yml | 18 +++++++++--------- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/docs-2.0-en/connector/nebula-flink-connector.md b/docs-2.0-en/connector/nebula-flink-connector.md index 4c24fc5758a..2c0f2d2f8f4 100644 --- a/docs-2.0-en/connector/nebula-flink-connector.md +++ b/docs-2.0-en/connector/nebula-flink-connector.md @@ -24,6 +24,7 @@ The correspondence between the NebulaGraph Flink Connector version and the Nebul | Flink Connector version | NebulaGraph version | |:----------|:-----------| | 3.0-SNAPSHOT | nightly | +| 3.8.0 | 3.x.x | | 3.5.0 | 3.x.x | | 3.3.0 | 3.x.x | | 3.0.0 | 3.x.x | diff --git a/docs-2.0-en/connector/nebula-spark-connector.md b/docs-2.0-en/connector/nebula-spark-connector.md index 2b97e17a17f..f6f18d25cd1 100644 --- a/docs-2.0-en/connector/nebula-spark-connector.md +++ b/docs-2.0-en/connector/nebula-spark-connector.md @@ -21,6 +21,9 @@ The correspondence between the NebulaGraph Spark Connector version, the NebulaGr |nebula-spark-connector_3.0-3.0-SNAPSHOT.jar| nightly| 3.x| |nebula-spark-connector_2.2-3.0-SNAPSHOT.jar| nightly| 2.2.x| |nebula-spark-connector-3.0-SNAPSHOT.jar| nightly| 2.4.x| +|nebula-spark-connector_3.0-3.8.0.jar| 3.x | 3.x | +|nebula-spark-connector_2.2-3.8.0.jar| 3.x | 2.2.x | +|nebula-spark-connector-3.8.0.jar | 3.x | 2.4.x | |nebula-spark-connector_3.0-3.6.0.jar| 3.x | 3.x | |nebula-spark-connector_2.2-3.6.0.jar| 3.x | 2.2.x | |nebula-spark-connector-3.6.0.jar | 3.x | 2.4.x | @@ -148,6 +151,8 @@ val config = NebulaConnectionConfig val nebulaReadVertexConfig: ReadNebulaConfig = ReadNebulaConfig .builder() + .withUser("root") + .withPasswd("nebula") .withSpace("test") .withLabel("person") .withNoColumn(false) @@ -159,6 +164,8 @@ val vertex = spark.read.nebula(config, nebulaReadVertexConfig).loadVerticesToDF( val nebulaReadEdgeConfig: ReadNebulaConfig = ReadNebulaConfig .builder() + .withUser("root") + .withPasswd("nebula") .withSpace("test") .withLabel("knows") .withNoColumn(false) @@ -182,6 +189,8 @@ val edge = spark.read.nebula(config, nebulaReadEdgeConfig).loadEdgesToDF() |Parameter|Required|Description| |:---|:---|:---| + |`withUser` |No| NebulaGraph username. This parameter is required when the Storage services require authentication. This parameter is only supported in NebulaGraph Enterprise Edition. | + |`withPasswd` |No| The password for the NebulaGraph username. This parameter is required when the Storage services require authentication. This parameter is only supported in NebulaGraph Enterprise Edition. | |`withSpace` |Yes| NebulaGraph space name. | |`withLabel` |Yes| The Tag or Edge type name within the NebulaGraph space. | |`withNoColumn` |No| Whether the property is not read. The default value is `false`, read property. If the value is `true`, the property is not read, the `withReturnCols` configuration is invalid. | diff --git a/docs-2.0-zh/connector/nebula-flink-connector.md b/docs-2.0-zh/connector/nebula-flink-connector.md index fb34344f605..a13fa26caa3 100644 --- a/docs-2.0-zh/connector/nebula-flink-connector.md +++ b/docs-2.0-zh/connector/nebula-flink-connector.md @@ -20,7 +20,8 @@ NebulaGraph Flink Connector 和{{nebula.name}}内核版本对应关系如下。 | Flink Connector 版本 | {{nebula.name}}版本 | |:----------|:-----------| -| 3.0-SNAPSHOT | nightly | +| 3.0-SNAPSHOT | nightly | +| 3.8.0 | 3.x.x | | 3.5.0 | 3.x.x | | 3.3.0 | 3.x.x | | 3.0.0 | 3.x.x | diff --git a/docs-2.0-zh/connector/nebula-spark-connector.md b/docs-2.0-zh/connector/nebula-spark-connector.md index 33edc42f379..1d0907bdfe8 100644 --- a/docs-2.0-zh/connector/nebula-spark-connector.md +++ b/docs-2.0-zh/connector/nebula-spark-connector.md @@ -21,6 +21,9 @@ NebulaGraph Spark Connector、 {{nebula.name}} 内核版本和 Spark 版本对 |nebula-spark-connector_3.0-3.0-SNAPSHOT.jar| nightly| 3.x| |nebula-spark-connector_2.2-3.0-SNAPSHOT.jar| nightly| 2.2.x| |nebula-spark-connector-3.0-SNAPSHOT.jar| nightly| 2.4.x| +|nebula-spark-connector_3.0-3.8.0.jar| 3.x | 3.x | +|nebula-spark-connector_2.2-3.8.0.jar| 3.x | 2.2.x | +|nebula-spark-connector-3.8.0.jar | 3.x | 2.4.x | |nebula-spark-connector_3.0-3.6.0.jar| 3.x | 3.x | |nebula-spark-connector_2.2-3.6.0.jar| 3.x | 2.2.x | |nebula-spark-connector-3.6.0.jar | 3.x | 2.4.x | @@ -148,6 +151,8 @@ val config = NebulaConnectionConfig val nebulaReadVertexConfig: ReadNebulaConfig = ReadNebulaConfig .builder() + .withUser("root") + .withPasswd("nebula") .withSpace("test") .withLabel("person") .withNoColumn(false) @@ -159,6 +164,8 @@ val vertex = spark.read.nebula(config, nebulaReadVertexConfig).loadVerticesToDF( val nebulaReadEdgeConfig: ReadNebulaConfig = ReadNebulaConfig .builder() + .withUser("root") + .withPasswd("nebula") .withSpace("test") .withLabel("knows") .withNoColumn(false) @@ -182,6 +189,8 @@ val edge = spark.read.nebula(config, nebulaReadEdgeConfig).loadEdgesToDF() |参数|是否必须|说明| |:---|:---|:---| + |`withUser` |否| {{nebula.name}}用户名。Storage 服务要求身份认证时，需要填写该参数。仅 {{nebula.name}} 企业版支持该参数。 | + |`withPasswd` |否| {{nebula.name}}用户名对应的密码。Storage 服务要求身份认证时，需要填写该参数。仅 {{nebula.name}} 企业版支持该参数。 | |`withSpace` |是| {{nebula.name}} 图空间名称。 | |`withLabel` |是| {{nebula.name}} 图空间内的 Tag 或 Edge type 名称。 | |`withNoColumn` |否| 是否不读取属性。默认值为`false`，表示读取属性。取值为`true`时，表示不读取属性，此时`withReturnCols`配置无效。 | diff --git a/mkdocs.yml b/mkdocs.yml index d83d1cb1479..3b1660991f1 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -288,9 +288,9 @@ extra: release: 3.9.0 tag: v3.9.0 exchange: - release: 3.7.0 - branch: release-3.7 - tag: v3.7.0 + release: 3.8.0 + branch: release-3.8 + tag: v3.8.0 importer: release: 4.1.0 branch: release-4.1 @@ -300,13 +300,13 @@ extra: branch: v3.0.0 tag: v3.0.0 sparkconnector: - release: 3.6.0 - branch: release-3.6 - tag: v3.6.0 + release: 3.8.0 + branch: release-3.8 + tag: v3.8.0 flinkconnector: - release: 3.5.0 - branch: release-3.5 - tag: v3.5.0 + release: 3.8.0 + branch: release-3.8 + tag: v3.8.0 dockercompose: release: 3.6.0 branch: release-3.6