Skip to content

[enhancement](paimon)add obs filesystem for paimon for 2.0 #31089

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.

Sign up for GitHub

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
xiaokang merged 1 commit into from
Feb 19, 2024
Merged

[enhancement](paimon)add obs filesystem for paimon for 2.0 #31089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions docs/en/docs/lakehouse/multi-catalog/paimon.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,24 @@ CREATE CATALOG `paimon_s3` PROPERTIES (
"s3.secret_key" = "sk"
);

```
#### OBS

> Note that.
>
> user need download [paimon-s3-0.6.0-incubating.jar](https://repo.maven.apache.org/maven2/org/apache/paimon/paimon-s3/0.6.0-incubating/paimon-s3-0.6.0-incubating.jar)
>
> Place it in directory `${DORIS_HOME}/be/lib/java_extensions/preload-extensions` and restart be
>
> Starting from version 2.0.2, this file can be placed in BE's `custom_lib/` directory (if it does not exist, just create it manually) to prevent the file from being lost due to the replacement of the lib directory when upgrading the cluster.
```sql
CREATE CATALOG `paimon_obs` PROPERTIES (
"type" = "paimon",
"warehouse" = "obs://bucket_name/paimon",
"obs.endpoint"="obs.cn-north-4.myhuaweicloud.com",
"obs.access_key"="ak",
"obs.secret_key"="sk"
);
```

#### COS
Expand Down
17 changes: 17 additions & 0 deletions docs/zh-CN/docs/lakehouse/multi-catalog/paimon.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,23 @@ CREATE CATALOG `paimon_s3` PROPERTIES (
"s3.secret_key" = "sk"
);

```
#### OBS

> 注意：
>
> 用户需要手动下载[paimon-s3-0.6.0-incubating.jar](https://repo.maven.apache.org/maven2/org/apache/paimon/paimon-s3/0.6.0-incubating/paimon-s3-0.6.0-incubating.jar)
> 放在 `${DORIS_HOME}/be/lib/java_extensions/preload-extensions` 目录下并重启be。
>
> 从 2.0.2 版本起，可以将这个文件放置在BE的 `custom_lib/` 目录下（如不存在，手动创建即可），以防止升级集群时因为 lib 目录被替换而导致文件丢失。
```sql
CREATE CATALOG `paimon_obs` PROPERTIES (
"type" = "paimon",
"warehouse" = "obs://bucket_name/paimon",
"obs.endpoint"="obs.cn-north-4.myhuaweicloud.com",
"obs.access_key"="ak",
"obs.secret_key"="sk"
);
```

#### COS
Expand Down
10 changes: 10 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonFileExternalCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.doris.datasource.CatalogProperty;
import org.apache.doris.datasource.property.PropertyConverter;
import org.apache.doris.datasource.property.constants.CosProperties;
import org.apache.doris.datasource.property.constants.ObsProperties;
import org.apache.doris.datasource.property.constants.PaimonProperties;

import org.apache.logging.log4j.LogManager;
Expand Down Expand Up @@ -68,6 +69,15 @@ protected void setPaimonCatalogOptions(Map<String, String> properties, Map<Strin
properties.get(CosProperties.SECRET_KEY));
options.put(PaimonProperties.WAREHOUSE,
options.get(PaimonProperties.WAREHOUSE).replace("cosn://", "s3://"));
} else if (properties.containsKey(ObsProperties.ENDPOINT)) {
options.put(PaimonProperties.PAIMON_S3_ENDPOINT,
properties.get(ObsProperties.ENDPOINT));
options.put(PaimonProperties.PAIMON_S3_ACCESS_KEY,
properties.get(ObsProperties.ACCESS_KEY));
options.put(PaimonProperties.PAIMON_S3_SECRET_KEY,
properties.get(ObsProperties.SECRET_KEY));
options.put(PaimonProperties.WAREHOUSE,
options.get(PaimonProperties.WAREHOUSE).replace("obs://", "s3://"));
}

if (properties.containsKey(PropertyConverter.USE_PATH_STYLE)) {
Expand Down