HDDS-4982.Solve intellj warnings on DBTransactionBuffer (#2082)
Co-authored-by: xushaohong <nibiruxu@tencent.com>
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/metadata/DBTransactionBuffer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/metadata/DBTransactionBuffer.java
index 85f5b40..ef17470 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/metadata/DBTransactionBuffer.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/metadata/DBTransactionBuffer.java
@@ -25,11 +25,11 @@
/**
* DB transaction that abstracts the updates to the underlying datastore.
*/
-public interface DBTransactionBuffer<KEY, VALUE> extends Closeable {
+public interface DBTransactionBuffer extends Closeable {
- void addToBuffer(Table<KEY, VALUE> table, KEY key, VALUE value) throws
- IOException;
+ <KEY, VALUE> void addToBuffer(Table<KEY, VALUE> table, KEY key, VALUE value)
+ throws IOException;
- void removeFromBuffer(Table<KEY, VALUE> table, KEY key) throws
- IOException;
+ <KEY, VALUE> void removeFromBuffer(Table<KEY, VALUE> table, KEY key)
+ throws IOException;
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBTransactionBufferImpl.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBTransactionBufferImpl.java
index 9937a49..92777fb 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBTransactionBufferImpl.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBTransactionBufferImpl.java
@@ -31,13 +31,13 @@
}
@Override
- public void addToBuffer(Table table, Object key, Object value)
- throws IOException {
+ public <KEY, VALUE> void addToBuffer(
+ Table<KEY, VALUE> table, KEY key, VALUE value) throws IOException {
table.put(key, value);
}
@Override
- public void removeFromBuffer(Table table, Object key)
+ public <KEY, VALUE>void removeFromBuffer(Table<KEY, VALUE> table, KEY key)
throws IOException {
table.delete(key);
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/MockSCMHADBTransactionBuffer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/MockSCMHADBTransactionBuffer.java
index b4ce677..174a4f8 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/MockSCMHADBTransactionBuffer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/MockSCMHADBTransactionBuffer.java
@@ -48,13 +48,13 @@
}
@Override
- public void addToBuffer(Table table, Object key, Object value)
- throws IOException {
+ public <KEY, VALUE> void addToBuffer(
+ Table<KEY, VALUE> table, KEY key, VALUE value) throws IOException {
table.putWithBatch(getCurrentBatchOperation(), key, value);
}
@Override
- public void removeFromBuffer(Table table, Object key)
+ public <KEY, VALUE> void removeFromBuffer(Table<KEY, VALUE> table, KEY key)
throws IOException {
table.deleteWithBatch(getCurrentBatchOperation(), key);
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHADBTransactionBufferImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHADBTransactionBufferImpl.java
index 4eea7a2..cdda49c 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHADBTransactionBufferImpl.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHADBTransactionBufferImpl.java
@@ -54,13 +54,13 @@
}
@Override
- public void addToBuffer(Table table, Object key, Object value)
- throws IOException {
+ public <KEY, VALUE> void addToBuffer(
+ Table<KEY, VALUE> table, KEY key, VALUE value) throws IOException {
table.putWithBatch(getCurrentBatchOperation(), key, value);
}
@Override
- public void removeFromBuffer(Table table, Object key)
+ public <KEY, VALUE> void removeFromBuffer(Table<KEY, VALUE> table, KEY key)
throws IOException {
table.deleteWithBatch(getCurrentBatchOperation(), key);
}
