[#4938]feat(lakehouse-paimon): Support S3 filesystem for Paimon catalog. #4939
There are no files selected for viewing
This file contains 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 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 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 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 |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.gravitino.catalog.lakehouse.paimon.filesystem; | ||
|
|
||
| public enum FileSystemType { | ||
|
There was a problem hiding this comment. please remove this class if not used |
||
| LOCAL_FILE, | ||
| HDFS, | ||
| S3, | ||
|
There was a problem hiding this comment. is the rename in There was a problem hiding this comment. https://github.com/apache/hadoop/blob/ea6e0f7cd58d0129897dfc7870aee188be80a904/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java#L2365-L2385 There was a problem hiding this comment.
I don't have much knowledge about it. let me verify this. |
||
| OSS; | ||
|
There was a problem hiding this comment. If we do not plan to support oss in this pr, it have better to remove it first to avoid confusion for other users There was a problem hiding this comment. @FANNG1 Do you have any other suggestions? There was a problem hiding this comment. seems reasonable to remove OSS, since it's not supported. |
||
|
|
||
| public static FileSystemType fromString(String type) { | ||
| for (FileSystemType fileSystemType : FileSystemType.values()) { | ||
| if (fileSystemType.name().equalsIgnoreCase(type)) { | ||
| return fileSystemType; | ||
| } | ||
| } | ||
|
|
||
| throw new IllegalArgumentException("Unsupported file system type: " + type); | ||
| } | ||
|
|
||
| public static FileSystemType fromStoragePath(String storagePath) { | ||
FANNG1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (storagePath.startsWith("s3://")) { | ||
|
There was a problem hiding this comment. let me check it for Paimon, the value is There was a problem hiding this comment. Is the value There was a problem hiding this comment. shoud we consider upper cases like There was a problem hiding this comment. HDFS only support lower case 'hdfs', if we use |
||
| return S3; | ||
| } else if (storagePath.startsWith("oss://")) { | ||
| return OSS; | ||
| } else if (storagePath.startsWith("hdfs://")) { | ||
| return HDFS; | ||
| } else if (storagePath.startsWith("/")) { | ||
| return LOCAL_FILE; | ||
| } | ||
|
|
||
| throw new IllegalArgumentException("Unsupported storage path: " + storagePath); | ||
| } | ||
| } | ||
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.gravitino.catalog.lakehouse.paimon.filesystem.s3; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import java.util.Map; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.gravitino.Config; | ||
| import org.apache.gravitino.config.ConfigBuilder; | ||
| import org.apache.gravitino.config.ConfigConstants; | ||
| import org.apache.gravitino.config.ConfigEntry; | ||
| import org.apache.gravitino.connector.PropertyEntry; | ||
|
|
||
| public class PaimonS3FileSystemConfig extends Config { | ||
|
There was a problem hiding this comment. I wonder if it is possible to merge the same configurations of iceberg to provide a common configurations. There was a problem hiding this comment. The keys for S3 in Iceberg are not the same as those here, please see #4939 (comment) |
||
| // S3 related properties | ||
| public static final String S3_ENDPOINT = "s3.endpoint"; | ||
| public static final String S3_ACCESS_KEY = "s3.access-key"; | ||
| public static final String S3_SECRET_KEY = "s3.secret-key"; | ||
|
|
||
| public PaimonS3FileSystemConfig(Map<String, String> properties) { | ||
| super(false); | ||
| loadFromMap(properties, k -> true); | ||
| } | ||
|
|
||
| public static final ConfigEntry<String> PAIMON_S3_ENDPOINT_ENTRY = | ||
| new ConfigBuilder(S3_ENDPOINT) | ||
| .doc("The endpoint of the AWS s3") | ||
| .version(ConfigConstants.VERSION_0_7_0) | ||
| .stringConf() | ||
| .checkValue(StringUtils::isNotBlank, ConfigConstants.NOT_BLANK_ERROR_MSG) | ||
| .create(); | ||
|
|
||
| public static final ConfigEntry<String> PAIMON_S3_ACCESS_KEY_ENTRY = | ||
| new ConfigBuilder(S3_ACCESS_KEY) | ||
| .doc("The access key of the AWS s3") | ||
| .version(ConfigConstants.VERSION_0_7_0) | ||
| .stringConf() | ||
| .checkValue(StringUtils::isNotBlank, ConfigConstants.NOT_BLANK_ERROR_MSG) | ||
| .create(); | ||
|
|
||
| public static final ConfigEntry<String> PAIMON_S3_SECRET_KEY_ENTRY = | ||
| new ConfigBuilder(S3_SECRET_KEY) | ||
| .doc("The secret key of the AWS s3") | ||
| .version(ConfigConstants.VERSION_0_7_0) | ||
| .stringConf() | ||
| .checkValue(StringUtils::isNotBlank, ConfigConstants.NOT_BLANK_ERROR_MSG) | ||
| .create(); | ||
|
|
||
| public String getS3Endpoint() { | ||
| return get(PAIMON_S3_ENDPOINT_ENTRY); | ||
| } | ||
|
|
||
| public String getS3AccessKey() { | ||
| return get(PAIMON_S3_ACCESS_KEY_ENTRY); | ||
| } | ||
|
|
||
| public String getS3SecretKey() { | ||
| return get(PAIMON_S3_SECRET_KEY_ENTRY); | ||
| } | ||
|
|
||
| public static final Map<String, PropertyEntry<?>> S3_FILESYSTEM_PROPERTY_ENTRIES = | ||
| new ImmutableMap.Builder<String, PropertyEntry<?>>() | ||
| .put( | ||
| S3_ENDPOINT, | ||
| PropertyEntry.stringOptionalPropertyEntry( | ||
| S3_ENDPOINT, | ||
| "The endpoint of the AWS s3", | ||
| false /* immutable */, | ||
| null /* defaultValue */, | ||
| false /* hidden */)) | ||
| .put( | ||
| S3_ACCESS_KEY, | ||
| PropertyEntry.stringOptionalPropertyEntry( | ||
| S3_ACCESS_KEY, | ||
| "The access key of the AWS s3", | ||
| false /* immutable */, | ||
| null /* defaultValue */, | ||
| false /* hidden */)) | ||
| .put( | ||
| S3_SECRET_KEY, | ||
| PropertyEntry.stringOptionalPropertyEntry( | ||
| S3_SECRET_KEY, | ||
| "The secret key of the AWS s3", | ||
| false /* immutable */, | ||
| null /* defaultValue */, | ||
| false /* hidden */)) | ||
| .build(); | ||
| } | ||
This file contains 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 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.
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.
I prefer to use the properties defined in
S3Propertiesto unify the storage configuration for GravitinoThere 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.
Please see #4939 (comment)