You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by gl...@apache.org on 2021/03/30 02:27:51 UTC
[ozone] branch HDDS-2823 updated: HDDS-4982.Solve intellj warnings
on DBTransactionBuffer (#2082)
This is an automated email from the ASF dual-hosted git repository.
glengeng pushed a commit to branch HDDS-2823
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-2823 by this push:
new 22c2d41 HDDS-4982.Solve intellj warnings on DBTransactionBuffer (#2082)
22c2d41 is described below
commit 22c2d410ac3aaedd36fcce966bf8b8c297768405
Author: Nibiru <ax...@qq.com>
AuthorDate: Tue Mar 30 10:27:40 2021 +0800
HDDS-4982.Solve intellj warnings on DBTransactionBuffer (#2082)
Co-authored-by: xushaohong <ni...@tencent.com>
---
.../apache/hadoop/hdds/scm/metadata/DBTransactionBuffer.java | 10 +++++-----
.../hadoop/hdds/scm/metadata/SCMDBTransactionBufferImpl.java | 6 +++---
.../hadoop/hdds/scm/ha/MockSCMHADBTransactionBuffer.java | 6 +++---
.../hadoop/hdds/scm/ha/SCMHADBTransactionBufferImpl.java | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
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 @@ import java.io.IOException;
/**
* 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 @@ public class SCMDBTransactionBufferImpl implements DBTransactionBuffer {
}
@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 @@ public class MockSCMHADBTransactionBuffer implements SCMHADBTransactionBuffer {
}
@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 @@ public class SCMHADBTransactionBufferImpl implements SCMHADBTransactionBuffer {
}
@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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org