errose28 commented on a change in pull request #1435: URL: https://github.com/apache/hadoop-ozone/pull/1435#discussion_r501976342
########## File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/AbstractOMKeyDeleteResponse.java ########## @@ -0,0 +1,143 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.om.response.key; + +import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.ozone.OmUtils; +import org.apache.hadoop.ozone.om.OMMetadataManager; +import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; +import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup; +import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; +import org.apache.hadoop.ozone.om.response.CleanupTableInfo; +import org.apache.hadoop.ozone.om.response.OMClientResponse; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos + .OMResponse; +import org.apache.hadoop.hdds.utils.db.BatchOperation; + +import java.io.IOException; +import javax.annotation.Nullable; +import javax.annotation.Nonnull; + +import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DELETED_TABLE; + +/** + * Base class for responses that need to move keys from an arbitrary table to + * the deleted table. + */ +@CleanupTableInfo(cleanupTables = {DELETED_TABLE}) +public abstract class AbstractOMKeyDeleteResponse extends OMClientResponse { + + private boolean isRatisEnabled; + + public AbstractOMKeyDeleteResponse( + @Nonnull OMResponse omResponse, boolean isRatisEnabled) { + + super(omResponse); + this.isRatisEnabled = isRatisEnabled; + } + + /** + * For when the request is not successful. + * For a successful request, the other constructor should be used. + */ + public AbstractOMKeyDeleteResponse(@Nonnull OMResponse omResponse) { + super(omResponse); + checkStatusNotOK(); + } + + /** + * Adds the operation of deleting the {@code keyName omKeyInfo} pair from + * {@code fromTable} to the batch operation {@code batchOperation}. The + * batch operation is not committed, so no changes are persisted to disk. + * The log transaction index used will be retrieved by calling + * {@link OmKeyInfo#getUpdateID} on {@code omKeyInfo}. + */ + protected void addDeletionToBatch( + OMMetadataManager omMetadataManager, + BatchOperation batchOperation, + Table<String, ?> fromTable, + String keyName, + OmKeyInfo omKeyInfo) throws IOException { + + addDeletionToBatch(omMetadataManager, batchOperation, fromTable, keyName, + omKeyInfo, omKeyInfo.getUpdateID()); + } + + /** + * Adds the operation of deleting the {@code keyName omKeyInfo} pair from + * {@code fromTable} to the batch operation {@code batchOperation}. The + * batch operation is not committed, so no changes are persisted to disk. + */ + protected void addDeletionToBatch( Review comment: This is actually related to a mistake I made in OMKeysDeleteResponse. The original implementation had one trxnLogIndex it used for all the keys. All other calls to this method are using the updateID of the keyInfo provided as the trxnLogIndex. If the way I am doing it currently (OMKeysDeleteResponse uses the updateID of each key as its trxnLogIndex instead of one value for all keys deleted), then I can remove the overload. If not, I can fix OMKeysDeleteResponse to call the overload, giving it identical behavior to its original 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: ozone-issues-unsubscr...@hadoop.apache.org For additional commands, e-mail: ozone-issues-h...@hadoop.apache.org
