andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Findbugs issues

Browse Source 
- BackupableDB missing call to super.finalize(major)
- WriteBatchTest inefficient String usage(minor)
- RocksDB local dead variable store(medium)
This commit is contained in:
fyrz 2014-10-02 21:31:19 +02:00
parent df3373fbf7
commit da8ff9ff89
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/org/rocksdb/BackupableDB.java
View File

@ -82,6 +82,7 @@ public class BackupableDB extends RocksDB {
@Override protected void finalize() { @Override protected void finalize() {
close(); close();
super.finalize();
} }
protected native void open(long rocksDBHandle, long backupDBOptionsHandle); protected native void open(long rocksDBHandle, long backupDBOptionsHandle);

2
java/org/rocksdb/RocksDB.java
View File

@ -103,8 +103,6 @@ public class RocksDB extends RocksObject {
* @see Options.createIfMissing() * @see Options.createIfMissing()
*/ */
public static RocksDB open(String path) throws RocksDBException { public static RocksDB open(String path) throws RocksDBException {
RocksDB db = new RocksDB();
// This allows to use the rocksjni default Options instead of // This allows to use the rocksjni default Options instead of
// the c++ one. // the c++ one.
Options options = new Options(); Options options = new Options();

28
java/org/rocksdb/WriteBatchTest.java
View File

@ -53,9 +53,9 @@ public class WriteBatchTest {
WriteBatchInternal.setSequence(batch, 100); WriteBatchInternal.setSequence(batch, 100);
assert(100 == WriteBatchInternal.sequence(batch)); assert(100 == WriteBatchInternal.sequence(batch));
assert(3 == batch.count()); assert(3 == batch.count());
assert(new String("Put(baz, boo)@102" + assert(("Put(baz, boo)@102" +
"Delete(box)@101" + "Delete(box)@101" +
"Put(foo, bar)@100") "Put(foo, bar)@100")
.equals(new String(getContents(batch), "US-ASCII"))); .equals(new String(getContents(batch), "US-ASCII")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
System.err.println(e); System.err.println(e);
@ -79,16 +79,16 @@ public class WriteBatchTest {
b2.clear(); b2.clear();
b2.put("b".getBytes("US-ASCII"), "vb".getBytes("US-ASCII")); b2.put("b".getBytes("US-ASCII"), "vb".getBytes("US-ASCII"));
WriteBatchInternal.append(b1, b2); WriteBatchInternal.append(b1, b2);
assert(new String("Put(a, va)@200" + assert(("Put(a, va)@200" +
"Put(b, vb)@201") "Put(b, vb)@201")
.equals(new String(getContents(b1), "US-ASCII"))); .equals(new String(getContents(b1), "US-ASCII")));
assert(2 == b1.count()); assert(2 == b1.count());
b2.remove("foo".getBytes("US-ASCII")); b2.remove("foo".getBytes("US-ASCII"));
WriteBatchInternal.append(b1, b2); WriteBatchInternal.append(b1, b2);
assert(new String("Put(a, va)@200" + assert(("Put(a, va)@200" +
"Put(b, vb)@202" + "Put(b, vb)@202" +
"Put(b, vb)@201" + "Put(b, vb)@201" +
"Delete(foo)@203") "Delete(foo)@203")
.equals(new String(getContents(b1), "US-ASCII"))); .equals(new String(getContents(b1), "US-ASCII")));
assert(4 == b1.count()); assert(4 == b1.count());
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
@ -108,11 +108,11 @@ public class WriteBatchTest {
batch.putLogData("blob2".getBytes("US-ASCII")); batch.putLogData("blob2".getBytes("US-ASCII"));
batch.merge("foo".getBytes("US-ASCII"), "bar".getBytes("US-ASCII")); batch.merge("foo".getBytes("US-ASCII"), "bar".getBytes("US-ASCII"));
assert(5 == batch.count()); assert(5 == batch.count());
assert(new String("Merge(foo, bar)@4" + assert(("Merge(foo, bar)@4" +
"Put(k1, v1)@0" + "Put(k1, v1)@0" +
"Delete(k2)@3" + "Delete(k2)@3" +
"Put(k2, v2)@1" + "Put(k2, v2)@1" +
"Put(k3, v3)@2") "Put(k3, v3)@2")
.equals(new String(getContents(batch), "US-ASCII"))); .equals(new String(getContents(batch), "US-ASCII")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
System.err.println(e); System.err.println(e);