Modularize federation (Option 2) #2332
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| plugins { | ||
| id("polaris-client") | ||
| alias(libs.plugins.jandex) | ||
| } | ||
|
|
||
| dependencies { | ||
| // Polaris dependencies | ||
| implementation(project(":polaris-core")) | ||
|
|
||
| implementation(platform(libs.iceberg.bom)) | ||
| implementation("org.apache.iceberg:iceberg-api") | ||
| implementation("org.apache.iceberg:iceberg-core") | ||
| implementation("org.apache.iceberg:iceberg-common") | ||
|
|
||
| // Hadoop dependencies (for Hadoop catalog support) | ||
| implementation(libs.hadoop.common) { | ||
| exclude("org.slf4j", "slf4j-reload4j") | ||
| exclude("org.slf4j", "slf4j-log4j12") | ||
| exclude("ch.qos.reload4j", "reload4j") | ||
| exclude("log4j", "log4j") | ||
| exclude("org.apache.zookeeper", "zookeeper") | ||
| exclude("org.apache.hadoop.thirdparty", "hadoop-shaded-protobuf_3_25") | ||
| exclude("com.github.pjfanning", "jersey-json") | ||
| exclude("com.sun.jersey", "jersey-core") | ||
| exclude("com.sun.jersey", "jersey-server") | ||
| exclude("com.sun.jersey", "jersey-servlet") | ||
| exclude("io.dropwizard.metrics", "metrics-core") | ||
| } | ||
| implementation(libs.hadoop.client.api) | ||
| implementation(libs.hadoop.client.runtime) | ||
|
|
||
| // CDI dependencies for runtime discovery | ||
| implementation(libs.jakarta.enterprise.cdi.api) | ||
| implementation(libs.smallrye.common.annotation) | ||
|
|
||
| // Logging | ||
| implementation(libs.slf4j.api) | ||
| } |
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,61 @@ | ||
| /* | ||
| * 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.extensions.federation.hadoop; | ||
|
|
||
| import io.smallrye.common.annotation.Identifier; | ||
| import jakarta.enterprise.context.ApplicationScoped; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.iceberg.catalog.Catalog; | ||
| import org.apache.iceberg.hadoop.HadoopCatalog; | ||
| import org.apache.polaris.core.catalog.ExternalCatalogFactory; | ||
| import org.apache.polaris.core.connection.AuthenticationParametersDpo; | ||
| import org.apache.polaris.core.connection.AuthenticationType; | ||
| import org.apache.polaris.core.connection.ConnectionConfigInfoDpo; | ||
| import org.apache.polaris.core.connection.ConnectionType; | ||
| import org.apache.polaris.core.connection.hadoop.HadoopConnectionConfigInfoDpo; | ||
| import org.apache.polaris.core.secrets.UserSecretsManager; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** Factory class for creating a Hadoop catalog handle based on connection configuration. */ | ||
| @ApplicationScoped | ||
| @Identifier(ConnectionType.HADOOP_FACTORY_IDENTIFIER) | ||
| public class HadoopFederatedCatalogFactory implements ExternalCatalogFactory { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(HadoopFederatedCatalogFactory.class); | ||
|
|
||
| @Override | ||
| public Catalog createCatalog( | ||
| ConnectionConfigInfoDpo connectionConfigInfoDpo, UserSecretsManager userSecretsManager) { | ||
| // Currently, Polaris supports Hadoop federation only via IMPLICIT authentication. | ||
| // Hence, prior to initializing the configuration, ensure that the catalog uses | ||
| // IMPLICIT authentication. | ||
| AuthenticationParametersDpo authenticationParametersDpo = | ||
| connectionConfigInfoDpo.getAuthenticationParameters(); | ||
| if (authenticationParametersDpo.getAuthenticationTypeCode() | ||
| != AuthenticationType.IMPLICIT.getCode()) { | ||
| throw new IllegalStateException("Hadoop federation only supports IMPLICIT authentication."); | ||
| } | ||
| Configuration conf = new Configuration(); | ||
| String warehouse = ((HadoopConnectionConfigInfoDpo) connectionConfigInfoDpo).getWarehouse(); | ||
| HadoopCatalog hadoopCatalog = new HadoopCatalog(conf, warehouse); | ||
| hadoopCatalog.initialize( | ||
| warehouse, connectionConfigInfoDpo.asIcebergCatalogProperties(userSecretsManager)); | ||
| return hadoopCatalog; | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * 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.catalog; | ||
|
|
||
| import org.apache.iceberg.catalog.Catalog; | ||
| import org.apache.polaris.core.connection.ConnectionConfigInfoDpo; | ||
| import org.apache.polaris.core.secrets.UserSecretsManager; | ||
|
|
||
| /** | ||
| * Factory interface for creating external catalog handles based on connection configuration. | ||
| * | ||
| * <p>Implementations should be annotated with CDI annotations and use the @Identifier annotation to | ||
| * specify which connection type they support. | ||
| */ | ||
| public interface ExternalCatalogFactory { | ||
|
|
||
| /** | ||
| * Creates a catalog handle for the given connection configuration. | ||
| * | ||
| * @param connectionConfig the connection configuration | ||
| * @param userSecretsManager the user secrets manager for handling credentials | ||
| * @return the initialized catalog | ||
| * @throws IllegalStateException if the connection configuration is invalid | ||
| */ | ||
| Catalog createCatalog( | ||
| ConnectionConfigInfoDpo connectionConfig, UserSecretsManager userSecretsManager); | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,6 +48,7 @@ dependencies { | |
| runtimeOnly("org.postgresql:postgresql") | ||
| runtimeOnly(project(":polaris-relational-jdbc")) | ||
| runtimeOnly("io.quarkus:quarkus-jdbc-postgresql") | ||
| runtimeOnly(project(":polaris-extensions-federation-hadoop")) | ||
|
|
||
| // enforce the Quarkus _platform_ here, to get a consistent and validated set of dependencies | ||
| implementation(enforcedPlatform(libs.quarkus.bom)) | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -27,6 +27,8 @@ | |
| import com.google.common.collect.ImmutableMap; | ||
| import com.google.common.collect.ImmutableSet; | ||
| import jakarta.enterprise.context.RequestScoped; | ||
| import jakarta.enterprise.inject.Any; | ||
| import jakarta.enterprise.inject.Instance; | ||
| import jakarta.inject.Inject; | ||
| import jakarta.ws.rs.WebApplicationException; | ||
| import jakarta.ws.rs.core.HttpHeaders; | ||
|
|
@@ -61,6 +63,7 @@ | |
| import org.apache.iceberg.rest.responses.LoadTableResponse; | ||
| import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; | ||
| import org.apache.polaris.core.auth.PolarisAuthorizer; | ||
| import org.apache.polaris.core.catalog.ExternalCatalogFactory; | ||
| import org.apache.polaris.core.context.CallContext; | ||
| import org.apache.polaris.core.context.RealmContext; | ||
| import org.apache.polaris.core.entity.PolarisEntity; | ||
|
|
@@ -144,6 +147,7 @@ public class IcebergCatalogAdapter | |
| private final CatalogPrefixParser prefixParser; | ||
| private final ReservedProperties reservedProperties; | ||
| private final CatalogHandlerUtils catalogHandlerUtils; | ||
| private final Instance<ExternalCatalogFactory> externalCatalogFactories; | ||
|
|
||
| @Inject | ||
| public IcebergCatalogAdapter( | ||
|
|
@@ -157,7 +161,8 @@ public IcebergCatalogAdapter( | |
| PolarisAuthorizer polarisAuthorizer, | ||
| CatalogPrefixParser prefixParser, | ||
| ReservedProperties reservedProperties, | ||
| CatalogHandlerUtils catalogHandlerUtils, | ||
| @Any Instance<ExternalCatalogFactory> externalCatalogFactories) { | ||
| this.realmContext = realmContext; | ||
| this.callContext = callContext; | ||
| this.catalogFactory = catalogFactory; | ||
|
|
@@ -169,6 +174,7 @@ public IcebergCatalogAdapter( | |
| this.prefixParser = prefixParser; | ||
| this.reservedProperties = reservedProperties; | ||
| this.catalogHandlerUtils = catalogHandlerUtils; | ||
| this.externalCatalogFactories = externalCatalogFactories; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -205,7 +211,8 @@ IcebergCatalogHandler newHandlerWrapper(SecurityContext securityContext, String | |
| catalogName, | ||
| polarisAuthorizer, | ||
| reservedProperties, | ||
| catalogHandlerUtils, | ||
| externalCatalogFactories); | ||
| } | ||
|
|
||
| @Override | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -20,7 +20,9 @@ | |
|
|
||
| import com.google.common.base.Preconditions; | ||
| import com.google.common.collect.Maps; | ||
| import io.smallrye.common.annotation.Identifier; | ||
| import jakarta.annotation.Nonnull; | ||
| import jakarta.enterprise.inject.Instance; | ||
| import jakarta.ws.rs.core.SecurityContext; | ||
| import java.io.Closeable; | ||
| import java.time.OffsetDateTime; | ||
|
|
@@ -33,7 +35,6 @@ | |
| import java.util.Optional; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
| import org.apache.iceberg.BaseMetadataTable; | ||
| import org.apache.iceberg.BaseTable; | ||
| import org.apache.iceberg.MetadataUpdate; | ||
|
|
@@ -46,7 +47,6 @@ | |
| import org.apache.iceberg.UpdateRequirement; | ||
| import org.apache.iceberg.catalog.Catalog; | ||
| import org.apache.iceberg.catalog.Namespace; | ||
| import org.apache.iceberg.catalog.SupportsNamespaces; | ||
| import org.apache.iceberg.catalog.TableIdentifier; | ||
| import org.apache.iceberg.catalog.ViewCatalog; | ||
|
|
@@ -55,9 +55,6 @@ | |
| import org.apache.iceberg.exceptions.CommitFailedException; | ||
| import org.apache.iceberg.exceptions.ForbiddenException; | ||
| import org.apache.iceberg.exceptions.NoSuchTableException; | ||
| import org.apache.iceberg.rest.credentials.ImmutableCredential; | ||
| import org.apache.iceberg.rest.requests.CommitTransactionRequest; | ||
| import org.apache.iceberg.rest.requests.CreateNamespaceRequest; | ||
|
|
@@ -76,13 +73,10 @@ | |
| import org.apache.iceberg.rest.responses.UpdateNamespacePropertiesResponse; | ||
| import org.apache.polaris.core.auth.PolarisAuthorizableOperation; | ||
| import org.apache.polaris.core.auth.PolarisAuthorizer; | ||
| import org.apache.polaris.core.catalog.ExternalCatalogFactory; | ||
| import org.apache.polaris.core.config.FeatureConfiguration; | ||
| import org.apache.polaris.core.connection.ConnectionConfigInfoDpo; | ||
| import org.apache.polaris.core.connection.ConnectionType; | ||
| import org.apache.polaris.core.context.CallContext; | ||
| import org.apache.polaris.core.entity.CatalogEntity; | ||
| import org.apache.polaris.core.entity.PolarisEntitySubType; | ||
|
|
@@ -132,6 +126,8 @@ public class IcebergCatalogHandler extends CatalogHandler implements AutoCloseab | |
| private final ReservedProperties reservedProperties; | ||
| private final CatalogHandlerUtils catalogHandlerUtils; | ||
|
|
||
| private final Instance<ExternalCatalogFactory> externalCatalogFactories; | ||
|
|
||
| // Catalog instance will be initialized after authorizing resolver successfully resolves | ||
| // the catalog entity. | ||
| protected Catalog baseCatalog = null; | ||
|
|
@@ -151,13 +147,15 @@ public IcebergCatalogHandler( | |
| String catalogName, | ||
| PolarisAuthorizer authorizer, | ||
| ReservedProperties reservedProperties, | ||
| CatalogHandlerUtils catalogHandlerUtils, | ||
| Instance<ExternalCatalogFactory> externalCatalogFactories) { | ||
| super(callContext, resolutionManifestFactory, securityContext, catalogName, authorizer); | ||
| this.metaStoreManager = metaStoreManager; | ||
| this.userSecretsManager = userSecretsManager; | ||
| this.catalogFactory = catalogFactory; | ||
| this.reservedProperties = reservedProperties; | ||
| this.catalogHandlerUtils = catalogHandlerUtils; | ||
| this.externalCatalogFactories = externalCatalogFactories; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -220,42 +218,18 @@ protected void initializeCatalog() { | |
| ConnectionType connectionType = | ||
| ConnectionType.fromCode(connectionConfigInfoDpo.getConnectionTypeCode()); | ||
|
|
||
| // Use the unified factory pattern for all external catalog types | ||
| Instance<ExternalCatalogFactory> externalCatalogFactory = | ||
| externalCatalogFactories.select( | ||
| Identifier.Literal.of(connectionType.getFactoryIdentifier())); | ||
| if (externalCatalogFactory.isResolvable()) { | ||
| federatedCatalog = | ||
| externalCatalogFactory | ||
| .get() | ||
| .createCatalog(connectionConfigInfoDpo, getUserSecretsManager()); | ||
| } else { | ||
| throw new UnsupportedOperationException( | ||
| "External catalog factory for type '" + connectionType + "' is unavailable."); | ||
| } | ||
| this.baseCatalog = federatedCatalog; | ||
| } else { | ||
|
|
||
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.
THose are superfluous, as those are the enum names, and can therefore be removed.
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.
We still need these because we can't use ConnnectionType.ICEBERG_REST.name() or ConnectionType.HADOOP.name(). The annotations needs to be constant expressions. Here's the error for your reference.
The value for annotation attribute Identifier.value must be a constant expressionJava(536871525)