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

Move some RocksObject into try-with-resources in Test (#5037)

Browse Source 
Summary:
Fix #5008
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5037

Differential Revision: D14302474

Pulled By: riversand963

fbshipit-source-id: dcd9dda5d4d6d459315692f355499a39e546d518
This commit is contained in:
SeterKwok 2019-03-04 14:51:13 -08:00 committed by Facebook Github Bot
parent 9a31b8dd2c
commit a283800616
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/test/java/org/rocksdb/RocksDBTest.java
View File

@ -525,8 +525,7 @@ public class RocksDBTest {
@Test @Test
public void deleteRange() throws RocksDBException { public void deleteRange() throws RocksDBException {
try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath()); try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath())) {
final WriteOptions wOpt = new WriteOptions()) {
db.put("key1".getBytes(), "value".getBytes()); db.put("key1".getBytes(), "value".getBytes());
db.put("key2".getBytes(), "12345678".getBytes()); db.put("key2".getBytes(), "12345678".getBytes());
db.put("key3".getBytes(), "abcdefg".getBytes()); db.put("key3".getBytes(), "abcdefg".getBytes());

6
java/src/test/java/org/rocksdb/WriteBatchTest.java
View File

@ -180,6 +180,7 @@ public class WriteBatchTest {
@Test @Test
public void deleteRange() throws RocksDBException { public void deleteRange() throws RocksDBException {
try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath()); try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath());
final WriteBatch batch = new WriteBatch();
final WriteOptions wOpt = new WriteOptions()) { final WriteOptions wOpt = new WriteOptions()) {
db.put("key1".getBytes(), "value".getBytes()); db.put("key1".getBytes(), "value".getBytes());
db.put("key2".getBytes(), "12345678".getBytes()); db.put("key2".getBytes(), "12345678".getBytes());
@ -190,9 +191,8 @@ public class WriteBatchTest {
assertThat(db.get("key3".getBytes())).isEqualTo("abcdefg".getBytes()); assertThat(db.get("key3".getBytes())).isEqualTo("abcdefg".getBytes());
assertThat(db.get("key4".getBytes())).isEqualTo("xyz".getBytes()); assertThat(db.get("key4".getBytes())).isEqualTo("xyz".getBytes());
WriteBatch batch = new WriteBatch();
batch.deleteRange("key2".getBytes(), "key4".getBytes()); batch.deleteRange("key2".getBytes(), "key4".getBytes());
db.write(new WriteOptions(), batch); db.write(wOpt, batch);
assertThat(db.get("key1".getBytes())).isEqualTo("value".getBytes()); assertThat(db.get("key1".getBytes())).isEqualTo("value".getBytes());
assertThat(db.get("key2".getBytes())).isNull(); assertThat(db.get("key2".getBytes())).isNull();
@ -399,7 +399,7 @@ public class WriteBatchTest {
} }
@Test @Test
public void hasEndrepareRange() throws RocksDBException { public void hasEndPrepareRange() throws RocksDBException {
try (final WriteBatch batch = new WriteBatch()) { try (final WriteBatch batch = new WriteBatch()) {
assertThat(batch.hasEndPrepare()).isFalse(); assertThat(batch.hasEndPrepare()).isFalse();
} }

11
java/src/test/java/org/rocksdb/WriteBatchWithIndexTest.java
View File

@ -104,7 +104,7 @@ public class WriteBatchWithIndexTest {
} }
@Test @Test
public void write_writeBatchWithIndex() throws RocksDBException { public void writeBatchWithIndex() throws RocksDBException {
try (final Options options = new Options().setCreateIfMissing(true); try (final Options options = new Options().setCreateIfMissing(true);
final RocksDB db = RocksDB.open(options, final RocksDB db = RocksDB.open(options,
dbFolder.getRoot().getAbsolutePath())) { dbFolder.getRoot().getAbsolutePath())) {
@ -114,11 +114,12 @@ public class WriteBatchWithIndexTest {
final byte[] k2 = "key2".getBytes(); final byte[] k2 = "key2".getBytes();
final byte[] v2 = "value2".getBytes(); final byte[] v2 = "value2".getBytes();
try (final WriteBatchWithIndex wbwi = new WriteBatchWithIndex()) { try (final WriteBatchWithIndex wbwi = new WriteBatchWithIndex();
final WriteOptions wOpt = new WriteOptions()) {
wbwi.put(k1, v1); wbwi.put(k1, v1);
wbwi.put(k2, v2); wbwi.put(k2, v2);
db.write(new WriteOptions(), wbwi); db.write(wOpt, wbwi);
} }
assertThat(db.get(k1)).isEqualTo(v1); assertThat(db.get(k1)).isEqualTo(v1);
@ -512,6 +513,7 @@ public class WriteBatchWithIndexTest {
@Test @Test
public void deleteRange() throws RocksDBException { public void deleteRange() throws RocksDBException {
try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath()); try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath());
final WriteBatch batch = new WriteBatch();
final WriteOptions wOpt = new WriteOptions()) { final WriteOptions wOpt = new WriteOptions()) {
db.put("key1".getBytes(), "value".getBytes()); db.put("key1".getBytes(), "value".getBytes());
db.put("key2".getBytes(), "12345678".getBytes()); db.put("key2".getBytes(), "12345678".getBytes());
@ -522,9 +524,8 @@ public class WriteBatchWithIndexTest {
assertThat(db.get("key3".getBytes())).isEqualTo("abcdefg".getBytes()); assertThat(db.get("key3".getBytes())).isEqualTo("abcdefg".getBytes());
assertThat(db.get("key4".getBytes())).isEqualTo("xyz".getBytes()); assertThat(db.get("key4".getBytes())).isEqualTo("xyz".getBytes());
WriteBatch batch = new WriteBatch();
batch.deleteRange("key2".getBytes(), "key4".getBytes()); batch.deleteRange("key2".getBytes(), "key4".getBytes());
db.write(new WriteOptions(), batch); db.write(wOpt, batch);
assertThat(db.get("key1".getBytes())).isEqualTo("value".getBytes()); assertThat(db.get("key1".getBytes())).isEqualTo("value".getBytes());
assertThat(db.get("key2".getBytes())).isNull(); assertThat(db.get("key2".getBytes())).isNull();