-
Notifications
You must be signed in to change notification settings - Fork 265
Remove circular dependency between entity and api schema #1990
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
Open
gfakbar20
wants to merge
3
commits into
apache:main
Choose a base branch
from
gfakbar20:remove-circular-dependency-entity-and-api-schema
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+345
−214
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
177 changes: 177 additions & 0 deletions
177
polaris-core/src/main/java/org/apache/polaris/core/entity/EntityConverter.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,177 @@ | ||
| /* | ||
| * 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.polaris.core.entity; | ||
|
|
||
| import static org.apache.polaris.core.admin.model.StorageConfigInfo.StorageTypeEnum.AZURE; | ||
| import static org.apache.polaris.core.entity.CatalogEntity.CATALOG_TYPE_PROPERTY; | ||
| import static org.apache.polaris.core.entity.CatalogEntity.DEFAULT_BASE_LOCATION_KEY; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import org.apache.iceberg.catalog.Namespace; | ||
| import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; | ||
| import org.apache.polaris.core.admin.model.AzureStorageConfigInfo; | ||
| import org.apache.polaris.core.admin.model.Catalog; | ||
| import org.apache.polaris.core.admin.model.CatalogProperties; | ||
| import org.apache.polaris.core.admin.model.CatalogRole; | ||
| import org.apache.polaris.core.admin.model.ConnectionConfigInfo; | ||
| import org.apache.polaris.core.admin.model.ExternalCatalog; | ||
| import org.apache.polaris.core.admin.model.FileStorageConfigInfo; | ||
| import org.apache.polaris.core.admin.model.GcpStorageConfigInfo; | ||
| import org.apache.polaris.core.admin.model.PolarisCatalog; | ||
| import org.apache.polaris.core.admin.model.Principal; | ||
| import org.apache.polaris.core.admin.model.PrincipalRole; | ||
| import org.apache.polaris.core.admin.model.StorageConfigInfo; | ||
| import org.apache.polaris.core.connection.ConnectionConfigInfoDpo; | ||
| import org.apache.polaris.core.entity.table.federated.FederatedEntities; | ||
| import org.apache.polaris.core.storage.FileStorageConfigurationInfo; | ||
| import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; | ||
| import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo; | ||
| import org.apache.polaris.core.storage.azure.AzureStorageConfigurationInfo; | ||
| import org.apache.polaris.core.storage.gcp.GcpStorageConfigurationInfo; | ||
|
|
||
| public final class EntityConverter { | ||
|
|
||
| public static Catalog toCatalog(CatalogEntity entity) { | ||
| Map<String, String> internalProperties = entity.getInternalPropertiesAsMap(); | ||
| Catalog.TypeEnum catalogType = | ||
| Optional.ofNullable(internalProperties.get(CATALOG_TYPE_PROPERTY)) | ||
| .map(Catalog.TypeEnum::valueOf) | ||
| .orElseGet( | ||
| () -> entity.getName().equalsIgnoreCase("ROOT") ? Catalog.TypeEnum.INTERNAL : null); | ||
| Map<String, String> propertiesMap = entity.getPropertiesAsMap(); | ||
| CatalogProperties catalogProps = | ||
| CatalogProperties.builder(propertiesMap.get(DEFAULT_BASE_LOCATION_KEY)) | ||
| .putAll(propertiesMap) | ||
| .build(); | ||
| return catalogType == Catalog.TypeEnum.INTERNAL | ||
| ? PolarisCatalog.builder() | ||
| .setType(Catalog.TypeEnum.INTERNAL) | ||
| .setName(entity.getName()) | ||
| .setProperties(catalogProps) | ||
| .setCreateTimestamp(entity.getCreateTimestamp()) | ||
| .setLastUpdateTimestamp(entity.getLastUpdateTimestamp()) | ||
| .setEntityVersion(entity.getEntityVersion()) | ||
| .setStorageConfigInfo(getEntityStorageInfo(internalProperties, entity)) | ||
| .build() | ||
| : ExternalCatalog.builder() | ||
| .setType(Catalog.TypeEnum.EXTERNAL) | ||
| .setName(entity.getName()) | ||
| .setProperties(catalogProps) | ||
| .setCreateTimestamp(entity.getCreateTimestamp()) | ||
| .setLastUpdateTimestamp(entity.getLastUpdateTimestamp()) | ||
| .setEntityVersion(entity.getEntityVersion()) | ||
| .setStorageConfigInfo(getEntityStorageInfo(internalProperties, entity)) | ||
| .setConnectionConfigInfo(getEntityConnectionInfo(internalProperties, entity)) | ||
| .build(); | ||
| } | ||
|
|
||
| public static CatalogRole toCatalogRole(CatalogRoleEntity entity) { | ||
| return new CatalogRole( | ||
| entity.getName(), | ||
| entity.getPropertiesAsMap(), | ||
| entity.getCreateTimestamp(), | ||
| entity.getLastUpdateTimestamp(), | ||
| entity.getEntityVersion()); | ||
| } | ||
|
|
||
| public static Namespace toNamespace(NamespaceEntity entity) { | ||
| Namespace parent = entity.getParentNamespace(); | ||
| String[] levels = new String[parent.length() + 1]; | ||
| for (int i = 0; i < parent.length(); ++i) { | ||
| levels[i] = parent.level(i); | ||
| } | ||
| levels[levels.length - 1] = entity.getName(); | ||
| return Namespace.of(levels); | ||
| } | ||
|
|
||
| public static Principal toPrincipal(PrincipalEntity entity) { | ||
| return new Principal( | ||
| entity.getName(), | ||
| entity.getClientId(), | ||
| entity.getPropertiesAsMap(), | ||
| entity.getCreateTimestamp(), | ||
| entity.getLastUpdateTimestamp(), | ||
| entity.getEntityVersion()); | ||
| } | ||
|
|
||
| public static PrincipalRole toPrincipalRole(PrincipalRoleEntity entity) { | ||
| return new PrincipalRole( | ||
| entity.getName(), | ||
| FederatedEntities.isFederated(entity), | ||
| entity.getPropertiesAsMap(), | ||
| entity.getCreateTimestamp(), | ||
| entity.getLastUpdateTimestamp(), | ||
| entity.getEntityVersion()); | ||
| } | ||
|
|
||
| private static StorageConfigInfo getEntityStorageInfo( | ||
| Map<String, String> internalProperties, CatalogEntity entity) { | ||
| if (internalProperties.containsKey(PolarisEntityConstants.getStorageConfigInfoPropertyName())) { | ||
| PolarisStorageConfigurationInfo configInfo = entity.getStorageConfigurationInfo(); | ||
| if (configInfo instanceof AwsStorageConfigurationInfo) { | ||
| AwsStorageConfigurationInfo awsConfig = (AwsStorageConfigurationInfo) configInfo; | ||
| return AwsStorageConfigInfo.builder() | ||
| .setRoleArn(awsConfig.getRoleARN()) | ||
| .setExternalId(awsConfig.getExternalId()) | ||
| .setUserArn(awsConfig.getUserARN()) | ||
| .setStorageType(StorageConfigInfo.StorageTypeEnum.S3) | ||
| .setAllowedLocations(awsConfig.getAllowedLocations()) | ||
| .setRegion(awsConfig.getRegion()) | ||
| .build(); | ||
| } | ||
| if (configInfo instanceof AzureStorageConfigurationInfo) { | ||
| AzureStorageConfigurationInfo azureConfig = (AzureStorageConfigurationInfo) configInfo; | ||
| return AzureStorageConfigInfo.builder() | ||
| .setTenantId(azureConfig.getTenantId()) | ||
| .setMultiTenantAppName(azureConfig.getMultiTenantAppName()) | ||
| .setConsentUrl(azureConfig.getConsentUrl()) | ||
| .setStorageType(AZURE) | ||
| .setAllowedLocations(azureConfig.getAllowedLocations()) | ||
| .build(); | ||
| } | ||
| if (configInfo instanceof GcpStorageConfigurationInfo) { | ||
| GcpStorageConfigurationInfo gcpConfigModel = (GcpStorageConfigurationInfo) configInfo; | ||
| return GcpStorageConfigInfo.builder() | ||
| .setGcsServiceAccount(gcpConfigModel.getGcpServiceAccount()) | ||
| .setStorageType(StorageConfigInfo.StorageTypeEnum.GCS) | ||
| .setAllowedLocations(gcpConfigModel.getAllowedLocations()) | ||
| .build(); | ||
| } | ||
| if (configInfo instanceof FileStorageConfigurationInfo) { | ||
| FileStorageConfigurationInfo fileConfigModel = (FileStorageConfigurationInfo) configInfo; | ||
| return new FileStorageConfigInfo( | ||
| StorageConfigInfo.StorageTypeEnum.FILE, fileConfigModel.getAllowedLocations()); | ||
| } | ||
| return null; | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| private static ConnectionConfigInfo getEntityConnectionInfo( | ||
| Map<String, String> internalProperties, CatalogEntity entity) { | ||
| if (internalProperties.containsKey( | ||
| PolarisEntityConstants.getConnectionConfigInfoPropertyName())) { | ||
| ConnectionConfigInfoDpo configInfo = entity.getConnectionConfigInfoDpo(); | ||
| return configInfo.asConnectionConfigInfoModel(); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
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.
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.
Does this actually remove the circular dependency? The old
CatalogEntity.asCatalog()method and this method do the same thing and exist in the case package 🤔