sririshindra commented on code in PR #3682:
URL: https://github.com/apache/polaris/pull/3682#discussion_r2785819656
##########
runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java:
##########
@@ -634,11 +640,110 @@ public LoadTableResponse createTableStaged(
* @return ETagged {@link LoadTableResponse} to uniquely identify the table
metadata
*/
public LoadTableResponse registerTable(Namespace namespace,
RegisterTableRequest request) {
- PolarisAuthorizableOperation op =
PolarisAuthorizableOperation.REGISTER_TABLE;
- authorizeCreateTableLikeUnderNamespaceOperationOrThrow(
- op, TableIdentifier.of(namespace, request.name()));
+ TableIdentifier identifier = TableIdentifier.of(namespace, request.name());
+ boolean overwrite = RegisterTableRequestContext.getOverwrite();
+
+ if (overwrite) {
+ // Resolve the namespace and table (optional) so we can distinguish
overwrite from create.
+ resolutionManifest = newResolutionManifest();
+ resolutionManifest.addPath(
+ new ResolverPath(Arrays.asList(namespace.levels()),
PolarisEntityType.NAMESPACE),
+ namespace);
+ ResolverPath tablePath =
+ new ResolverPath(
+ PolarisCatalogHelpers.tableIdentifierToList(identifier),
+ PolarisEntityType.TABLE_LIKE,
+ true /* optional */);
+ resolutionManifest.addPassthroughPath(tablePath, identifier);
+ resolutionManifest.resolveAll();
+
+ boolean tableExists =
+ resolutionManifest.getResolvedPath(
+ identifier,
+ PolarisEntityType.TABLE_LIKE,
+ PolarisEntitySubType.ICEBERG_TABLE,
+ true)
+ != null;
+ if (tableExists) {
+ authorizeUpdateTableOverwriteOrThrow(identifier);
+ LOGGER.debug(
+ "registerTable: overwrite=true, authorized for UPDATE_TABLE on
existing table");
+ } else {
+ // Table doesn't exist, fall back to REGISTER_TABLE authorization
+ LOGGER.debug(
+ "registerTable: overwrite=true, table not found, falling back to
REGISTER_TABLE");
+ PolarisAuthorizableOperation op =
PolarisAuthorizableOperation.REGISTER_TABLE;
+ authorizeCreateTableLikeUnderNamespaceOperationOrThrow(op, identifier);
+ }
+ } else {
+ // Creating new table requires REGISTER_TABLE privilege
+ PolarisAuthorizableOperation op =
PolarisAuthorizableOperation.REGISTER_TABLE;
+ authorizeCreateTableLikeUnderNamespaceOperationOrThrow(op, identifier);
+ }
+
+ try {
+ return catalogHandlerUtils.registerTable(baseCatalog, namespace,
request);
+ } finally {
+ // Clean up context
+ RegisterTableRequestContext.clear();
+ }
+ }
+
+ private void authorizeUpdateTableOverwriteOrThrow(TableIdentifier
identifier) {
+ authorizeBasicTableLikeOperationsOrThrow(
+ EnumSet.of(PolarisAuthorizableOperation.UPDATE_TABLE),
+ PolarisEntitySubType.ICEBERG_TABLE,
+ identifier);
- return catalogHandlerUtils.registerTable(baseCatalog, namespace, request);
+ if (!(authorizer instanceof PolarisAuthorizerImpl authorizerImpl)) {
Review Comment:
Fixed in the latest PR https://github.com/apache/polaris/pull/3719
##########
runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/RegisterTableRequestContext.java:
##########
@@ -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.polaris.service.catalog.iceberg;
+
+/**
+ * Thread-local context that carries additional parameters for a {@code
RegisterTableRequest} which
+ * are not present on the generated Iceberg request type.
+ *
+ * <p>The current implementation only records the caller's intent to
"overwrite" an existing table.
+ * Using a ThreadLocal keeps the flag local to the request lifecycle and
avoids changing the
+ * generated DTOs. Callers must clear the flag (typically in a finally block)
to avoid leaking state
+ * across requests.
+ */
+public class RegisterTableRequestContext {
+ private static final ThreadLocal<Boolean> SHOULD_OVERWRITE =
ThreadLocal.withInitial(() -> false);
Review Comment:
Removed this entirely in https://github.com/apache/polaris/pull/3719
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
