Skip to content

Commit 896c56a

Browse files
alanpaxtonrhubner
authored andcommitted
Manually fix format
Make it exactly as CI says Which isn’t how it ends up if you try to `make format` I strongly suspect `make format` is subtly borked on Mac
1 parent 761cd04 commit 896c56a

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

java/src/test/java/org/rocksdb/TransactionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ public void multiGetAsList() throws RocksDBException {
354354
final byte[] v2 = "v2".getBytes(UTF_8);
355355

356356
try (final DBContainer dbContainer = startDb();
357-
final ReadOptions readOptions = new ReadOptions()) {
357+
final ReadOptions readOptions = new ReadOptions()) {
358358
final ColumnFamilyHandle testCf = dbContainer.getTestColumnFamily();
359359

360360
try (final Transaction txn = dbContainer.beginTransaction()) {

java/src/test/java/org/rocksdb/WriteBatchTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,8 @@ public void getWriteBatch() {
488488
@Test
489489
public void wideColumnBatch() throws RocksDBException {
490490
try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath());
491-
final WriteBatch wb = new WriteBatch(); final WriteOptions wOpt = new WriteOptions();
492-
final ColumnFamilyHandle cf = db.getDefaultColumnFamily()) {
491+
final WriteBatch wb = new WriteBatch(); final WriteOptions wOpt = new WriteOptions();
492+
final ColumnFamilyHandle cf = db.getDefaultColumnFamily()) {
493493
WideColumn<byte[]> column = new WideColumn<>("name".getBytes(UTF_8), "value".getBytes(UTF_8));
494494
List<WideColumn<byte[]>> columns = new ArrayList<>();
495495
columns.add(column);
@@ -511,8 +511,8 @@ public void wideColumnBatch() throws RocksDBException {
511511
@Test
512512
public void wideColumnBatchDirect() throws RocksDBException {
513513
try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath());
514-
final WriteBatch wb = new WriteBatch(); final WriteOptions wOpt = new WriteOptions();
515-
final ColumnFamilyHandle cf = db.getDefaultColumnFamily()) {
514+
final WriteBatch wb = new WriteBatch(); final WriteOptions wOpt = new WriteOptions();
515+
final ColumnFamilyHandle cf = db.getDefaultColumnFamily()) {
516516
ByteBuffer key = ByteBuffer.allocateDirect(10);
517517
key.put("key".getBytes(UTF_8));
518518
key.flip();

java/src/test/java/org/rocksdb/WriteBatchWithIndexTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,9 +1069,9 @@ public void iteratorWithBaseOverwriteFalse() throws RocksDBException {
10691069
@Test
10701070
public void wideColumnBatch() throws RocksDBException {
10711071
try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath());
1072-
final WriteBatchWithIndex wbwi = new WriteBatchWithIndex(false);
1073-
final WriteOptions wOpt = new WriteOptions();
1074-
final ColumnFamilyHandle cf = db.getDefaultColumnFamily()) {
1072+
final WriteBatchWithIndex wbwi = new WriteBatchWithIndex(false);
1073+
final WriteOptions wOpt = new WriteOptions();
1074+
final ColumnFamilyHandle cf = db.getDefaultColumnFamily()) {
10751075
WideColumn<byte[]> column = new WideColumn<>("name".getBytes(UTF_8), "value".getBytes(UTF_8));
10761076
List<WideColumn<byte[]>> columns = new ArrayList<>();
10771077
columns.add(column);
@@ -1093,9 +1093,9 @@ public void wideColumnBatch() throws RocksDBException {
10931093
@Test
10941094
public void wideColumnBatchDirect() throws RocksDBException {
10951095
try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath());
1096-
final WriteBatchWithIndex wbwi = new WriteBatchWithIndex(false);
1097-
final WriteOptions wOpt = new WriteOptions();
1098-
final ColumnFamilyHandle cf = db.getDefaultColumnFamily()) {
1096+
final WriteBatchWithIndex wbwi = new WriteBatchWithIndex(false);
1097+
final WriteOptions wOpt = new WriteOptions();
1098+
final ColumnFamilyHandle cf = db.getDefaultColumnFamily()) {
10991099
ByteBuffer key = ByteBuffer.allocateDirect(10);
11001100
key.put("key".getBytes(UTF_8));
11011101
key.flip();

0 commit comments

Comments
 (0)