This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 3c9df5cf32 HDDS-9727. Replace ThrowableFunction with CheckedFunction
(#5734)
3c9df5cf32 is described below
commit 3c9df5cf3292b2feb0ffa1aa9c254b1c51c8cb9a
Author: TaiJuWu <[email protected]>
AuthorDate: Wed Dec 6 04:05:25 2023 +0800
HDDS-9727. Replace ThrowableFunction with CheckedFunction (#5734)
---
.../hadoop/hdds/utils/ThrowableFunction.java | 27 ----------------------
.../apache/hadoop/ozone/om/OmSnapshotManager.java | 4 ++--
2 files changed, 2 insertions(+), 29 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/ThrowableFunction.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/ThrowableFunction.java
deleted file mode 100644
index d6dbb6871d..0000000000
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/ThrowableFunction.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.hdds.utils;
-
-
-/**
- * Utility interface for function which throws exceptions.
- * Similar to {@link java.util.function.Function}.
- */
-public interface ThrowableFunction<T, R, E extends Throwable> {
- R apply(T t) throws E;
-}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotManager.java
index f77a079da2..6e9af3960c 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotManager.java
@@ -40,7 +40,6 @@ import com.google.common.cache.RemovalListener;
import org.apache.hadoop.hdds.StringUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.server.ServerUtils;
-import org.apache.hadoop.hdds.utils.ThrowableFunction;
import org.apache.hadoop.hdds.utils.db.CodecRegistry;
import org.apache.hadoop.hdds.utils.db.DBCheckpoint;
import org.apache.hadoop.hdds.utils.db.RDBStore;
@@ -66,6 +65,7 @@ import org.apache.hadoop.ozone.om.snapshot.SnapshotUtils;
import org.apache.hadoop.ozone.snapshot.CancelSnapshotDiffResponse;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffReportOzone;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse;
+import org.apache.ratis.util.function.CheckedFunction;
import org.apache.ozone.rocksdiff.RocksDBCheckpointDiffer;
import org.rocksdb.ColumnFamilyDescriptor;
import org.rocksdb.ColumnFamilyHandle;
@@ -512,7 +512,7 @@ public final class OmSnapshotManager implements
AutoCloseable {
*/
private static void performOperationOnKeys(
TableIterator<String, ? extends Table.KeyValue<String, ?>> keyIter,
- ThrowableFunction<Table.KeyValue<String, ?>,
+ CheckedFunction<Table.KeyValue<String, ?>,
Void, IOException> operationFunction) throws IOException {
// Continue only when there are entries of snapshot (bucket) scope
// in deletedTable in the first place
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
