Switch to write batch as autoclose

snowblossomcoin · Nov 16, 2018 · f1155a5 · f1155a5
1 parent 6c00acd
commit f1155a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/lib/src/db/rocksdb/RocksDBMap.java b/lib/src/db/rocksdb/RocksDBMap.java
@@ -78,9 +78,8 @@ public void remove(ByteString key)
   @Override
   public void putAll(SortedMap<ByteString, ByteString> m)
   {
-    try
+    try(WriteBatch batch = new WriteBatch())
     {
-      WriteBatch batch = new WriteBatch();
 
       for(Map.Entry<ByteString, ByteString> e : m.entrySet())
       {

diff --git a/lib/src/db/rocksdb/RocksDBMapMutationSet.java b/lib/src/db/rocksdb/RocksDBMapMutationSet.java
@@ -86,9 +86,8 @@ public void add(ByteString key, ByteString value)
   @Override
   public void addAll(TreeMultimap<ByteString, ByteString> map)
   {
-    try
+    try(WriteBatch batch = new WriteBatch())
     {
-      WriteBatch batch = new WriteBatch();
       byte b[]=new byte[0];
 
       for(Map.Entry<ByteString, ByteString> me : map.entries())
@@ -127,9 +126,7 @@ public List<ByteString> getSet(ByteString key, int max_reply)
 
     LinkedList<ByteString> set = new LinkedList<>();
     int count = 0;
-    RocksIterator it = db.newIterator();
-
-    try
+    try(RocksIterator it = db.newIterator())
     {
       it.seek(dbKey.toByteArray());
 
@@ -147,10 +144,6 @@ public List<ByteString> getSet(ByteString key, int max_reply)
         it.next();
       }
     }
-    finally
-    {
-      it.dispose();
-    }
 
     return set;