924060929 commented on code in PR #69408: URL: https://github.com/apache/doris/pull/69408#discussion_r4345428437
########## fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergRestSchemaCommit.java: ########## @@ -0,0 +1,118 @@ +// 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 com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonFactoryBuilder; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.google.common.base.Preconditions; +import org.apache.iceberg.CatalogProperties; +import org.apache.iceberg.TableMetadata; +import org.apache.iceberg.TableOperations; +import org.apache.iceberg.UpdateRequirement; +import org.apache.iceberg.rest.HTTPClient; +import org.apache.iceberg.rest.RESTSerializers; +import org.apache.iceberg.rest.RESTSessionCatalog; +import org.apache.iceberg.rest.RESTUtil; +import org.apache.iceberg.rest.requests.UpdateTableRequest; +import org.apache.iceberg.rest.requests.UpdateTableRequestParser; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** Adds a partition-counter precondition to a DROP request without persisting a partition spec. */ +public final class IcebergRestSchemaCommit { + private static final ThreadLocal<TableMetadata> DROP_BASE = new ThreadLocal<>(); + + private IcebergRestSchemaCommit() { + } + + public static RESTSessionCatalog newSessionCatalog() { + return new GuardedSessionCatalog(); + } + + static boolean supports(RESTSessionCatalog catalog) { + return catalog instanceof GuardedSessionCatalog; + } + + static void commit(TableOperations operations, TableMetadata base, TableMetadata update) { + Preconditions.checkState(DROP_BASE.get() == null, "Nested Iceberg REST schema DROP commit"); + DROP_BASE.set(base); + try { + // The synchronous SDK commit keeps its endpoint, table auth session, mutation headers, + // response handling and cached metadata. Only the serialized request gains a requirement. + operations.commit(base, update); + } finally { + DROP_BASE.remove(); + } + } + + static ObjectMapper newMapper() { + // Match Iceberg 1.11.0 RESTObjectMapper using public APIs, then specialize only table updates. + JsonFactory factory = new JsonFactoryBuilder() + .configure(JsonFactory.Feature.INTERN_FIELD_NAMES, false) + .configure(JsonFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW, false).build(); + ObjectMapper mapper = new ObjectMapper(factory); + mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + mapper.setPropertyNamingStrategy(new PropertyNamingStrategies.KebabCaseStrategy()); + RESTSerializers.registerAll(mapper); + SimpleModule module = new SimpleModule("doris-iceberg-schema-drop"); + module.addSerializer(UpdateTableRequest.class, new DropRequestSerializer()); + mapper.registerModule(module); + return mapper; + } + + private static final class GuardedSessionCatalog extends RESTSessionCatalog { + private GuardedSessionCatalog() { + super(properties -> HTTPClient.builder(properties).uri(properties.get(CatalogProperties.URI)) + .withHeaders(RESTUtil.configHeaders(properties)).withObjectMapper(newMapper()).build(), null); + } + } + + private static final class DropRequestSerializer extends JsonSerializer<UpdateTableRequest> { + @Override + public void serialize(UpdateTableRequest request, JsonGenerator generator, SerializerProvider provider) + throws IOException { + TableMetadata base = DROP_BASE.get(); + UpdateTableRequest serialized = request; + if (base != null) { + // A scoped commit may serialize only the table whose validated metadata it pinned. + Preconditions.checkState(request.requirements().stream().anyMatch(requirement -> + requirement instanceof UpdateRequirement.AssertTableUUID + && Objects.equals(((UpdateRequirement.AssertTableUUID) requirement).uuid(), + base.uuid())), + "Iceberg REST schema DROP request does not match its validated table"); + List<UpdateRequirement> requirements = new ArrayList<>(request.requirements()); + requirements.add(new UpdateRequirement.AssertLastAssignedPartitionId(base.lastAssignedPartitionId())); Review Comment: I found another public API in the currently pinned Iceberg 1.11.0 that may avoid an SDK upgrade: `RESTSessionCatalog.commitTransaction(SessionContext, List<TableCommit>)`. Could you first prototype and validate a single-table commit through this API? Keep the existing validated-base checks and SDK schema staging, then explicitly build a `TableCommit` with: - `UpdateRequirements.forUpdateTable(validatedBase, schemaUpdate.changes())`; - an additional `AssertLastAssignedPartitionId(validatedBase.lastAssignedPartitionId())`; - the table identifier and the complete `schemaUpdate.changes()`. Submit it as a singleton list through the retained REST session catalog, using the existing session-context conversion and writable catalog-generation lease. The partition counter must come from the exact base already validated, not from another read immediately before submission. This would put all requirements in the request object and remove the ThreadLocal/custom mapper without changing ADD/RENAME behavior. This is a candidate to validate, not a proven drop-in replacement. In the 1.11.0 implementation, there are three compatibility differences to check: 1. **Endpoint support:** this uses the transaction commit endpoint even for one table. Verify support in the REST services we target. If unavailable, report an explicit unsupported-operation error; do not fall back to an unguarded ordinary commit. Any resulting reduction in supported DROP operations needs to be made explicit. 2. **Authentication:** ordinary table commits use an auth-manager `tableSession` derived from the loaded table configuration, whereas `commitTransaction` uses a `contextualSession`. Verify default/catalog authentication, delegated-user authentication, and services relying on table-specific credentials. These paths cannot be assumed equivalent. 3. **Metadata/cache handling:** `commitTransaction` does not update the existing `RESTTableOperations` handle from a commit response. Ensure successful completion invalidates the relevant SDK/Doris caches and later operations reload metadata rather than reuse the stale handle. Please include real HTTP tests for the explicit requirement, rejection of a concurrent partition addition, consecutive ordinary drops, authentication, post-commit reload, and unsupported transaction endpoints. If endpoint or authentication compatibility prevents this approach, documenting the concrete failing service/path would help decide the next implementation. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
