Repository navigation
[feat](paimon) support paimon dlf rest catalog #54523
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 all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
369c4b5
[begin] dlf25
morningman 106b046
add regression test
morningman 3bd20a4
fix glue
morningman 6044320
add ut
morningman 9883017
fix style
morningman 1e92187
fix test
morningman e0c7073
1
morningman e7dd08a
fix
morningman bb717ad
fix
morningman a9a0b59
add new_catalog_property
morningman 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
41 changes: 41 additions & 0 deletions
41
fe/fe-core/src/main/java/org/apache/doris/datasource/credentials/CredentialExtractor.java
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 |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // 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.doris.datasource.credentials; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Interface for future FileIO-based credential extraction. | ||
| * This interface is designed to be compatible with Iceberg/Paimon FileIO | ||
| */ | ||
| public interface CredentialExtractor { | ||
| // AWS credential property keys for backend | ||
| String BACKEND_AWS_ACCESS_KEY = "AWS_ACCESS_KEY"; | ||
| String BACKEND_AWS_SECRET_KEY = "AWS_SECRET_KEY"; | ||
| String BACKEND_AWS_TOKEN = "AWS_TOKEN"; | ||
| String BACKEND_AWS_ENDPOINT = "AWS_ENDPOINT"; | ||
| String BACKEND_AWS_REGION = "AWS_REGION"; | ||
|
|
||
| /** | ||
| * Extract credentials from a generic properties map. | ||
| * | ||
| * @param properties properties map from any source (FileIO, Table IO, etc.) | ||
| * @return extracted credentials as backend properties | ||
| */ | ||
| Map<String, String> extractCredentials(Map<String, String> properties); | ||
| } |
38 changes: 38 additions & 0 deletions
38
fe/fe-core/src/main/java/org/apache/doris/datasource/credentials/CredentialUtils.java
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 |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // 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.doris.datasource.credentials; | ||
|
|
||
| import com.google.common.annotations.VisibleForTesting; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| public class CredentialUtils { | ||
| /** | ||
| * Future method for FileIO-based credential extraction. | ||
| * This method signature is designed to be compatible with future FileIO implementations. | ||
| * | ||
| * @param fileIoProperties properties from FileIO (reserved for future use) | ||
| * @param extractor custom credential extractor | ||
| * @return extracted credentials | ||
| */ | ||
| @VisibleForTesting | ||
| public static Map<String, String> extractCredentialsFromFileIO(Map<String, String> fileIoProperties, | ||
| CredentialExtractor extractor) { | ||
| return extractor.extractCredentials(fileIoProperties); | ||
| } | ||
| } | ||
53 changes: 53 additions & 0 deletions
53
...-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergS3CredentialExtractor.java
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 |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // 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.doris.datasource.iceberg; | ||
|
|
||
| import org.apache.doris.datasource.credentials.CredentialExtractor; | ||
|
|
||
| import com.google.common.collect.Maps; | ||
| import org.apache.iceberg.aws.s3.S3FileIOProperties; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Default credential extractor for S3 credentials. | ||
| */ | ||
| public class IcebergS3CredentialExtractor implements CredentialExtractor { | ||
|
|
||
| @Override | ||
| public Map<String, String> extractCredentials(Map<String, String> properties) { | ||
| Map<String, String> credentials = Maps.newHashMap(); | ||
|
|
||
| if (properties == null || properties.isEmpty()) { | ||
| return credentials; | ||
| } | ||
|
|
||
| // Extract AWS credentials from Iceberg S3 FileIO format | ||
| if (properties.containsKey(S3FileIOProperties.ACCESS_KEY_ID)) { | ||
| credentials.put(BACKEND_AWS_ACCESS_KEY, properties.get(S3FileIOProperties.ACCESS_KEY_ID)); | ||
| } | ||
| if (properties.containsKey(S3FileIOProperties.SECRET_ACCESS_KEY)) { | ||
| credentials.put(BACKEND_AWS_SECRET_KEY, properties.get(S3FileIOProperties.SECRET_ACCESS_KEY)); | ||
| } | ||
| if (properties.containsKey(S3FileIOProperties.SESSION_TOKEN)) { | ||
| credentials.put(BACKEND_AWS_TOKEN, properties.get(S3FileIOProperties.SESSION_TOKEN)); | ||
| } | ||
|
|
||
| return credentials; | ||
| } | ||
| } |
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.