Format fixes

facebook · Jan 26, 2023 · 05c35e1 · 05c35e1
1 parent e925803
commit 05c35e1
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 86 deletions.
diff --git a/java/src/main/java/org/rocksdb/BlockBasedTableConfig.java b/java/src/main/java/org/rocksdb/BlockBasedTableConfig.java
@@ -309,8 +309,7 @@ public BlockBasedTableConfig setPersistentCache(
    *
    * @return the reference to the current config.
    */
-  public BlockBasedTableConfig setBlockCacheCompressed(
-      final Cache blockCacheCompressed) {
+  public BlockBasedTableConfig setBlockCacheCompressed(final Cache blockCacheCompressed) {
     this.blockCacheCompressed = blockCacheCompressed;
     return this;
   }

diff --git a/java/src/main/java/org/rocksdb/StringAppendOperator.java b/java/src/main/java/org/rocksdb/StringAppendOperator.java
@@ -11,19 +11,19 @@
  * two strings.
  */
 public class StringAppendOperator extends MergeOperator {
-    public StringAppendOperator() {
-        this(',');
-    }
+  public StringAppendOperator() {
+    this(',');
+  }
 
-    public StringAppendOperator(final char delim) {
-      super(newSharedStringAppendOperator(delim));
-    }
+  public StringAppendOperator(final char delim) {
+    super(newSharedStringAppendOperator(delim));
+  }
 
-    public StringAppendOperator(final String delim) {
-      super(newSharedStringAppendOperator(delim));
-    }
+  public StringAppendOperator(final String delim) {
+    super(newSharedStringAppendOperator(delim));
+  }
 
-    private static native long newSharedStringAppendOperator(final char delim);
-    private static native long newSharedStringAppendOperator(final String delim);
-    @Override protected final native void disposeInternal(final long handle);
+  private static native long newSharedStringAppendOperator(final char delim);
+  private static native long newSharedStringAppendOperator(final String delim);
+  @Override protected final native void disposeInternal(final long handle);
 }
diff --git a/java/src/test/java/org/rocksdb/BackupEngineOptionsTest.java b/java/src/test/java/org/rocksdb/BackupEngineOptionsTest.java
@@ -15,8 +15,7 @@
 import org.junit.rules.ExpectedException;
 
 public class BackupEngineOptionsTest {
-  private static final String ARBITRARY_PATH =
-      System.getProperty("java.io.tmpdir");
+  private static final String ARBITRARY_PATH = System.getProperty("java.io.tmpdir");
 
   @ClassRule
   public static final RocksNativeLibraryResource ROCKS_NATIVE_LIBRARY_RESOURCE =
@@ -61,13 +60,10 @@ public void infoLog() {
     try (final BackupEngineOptions backupEngineOptions = new BackupEngineOptions(ARBITRARY_PATH)) {
       assertThat(backupEngineOptions.infoLog()).isNull();
 
-      try(final Options options = new Options();
-          final Logger logger = new Logger(options){
-            @Override
-            protected void log(final InfoLogLevel infoLogLevel, final String logMsg) {
-
-            }
-          }) {
+      try (final Options options = new Options(); final Logger logger = new Logger(options) {
+        @Override
+        protected void log(final InfoLogLevel infoLogLevel, final String logMsg) {}
+      }) {
         backupEngineOptions.setInfoLog(logger);
         assertThat(backupEngineOptions.infoLog()).isEqualTo(logger);
       }
@@ -291,7 +287,8 @@ public void failShareFilesWithChecksumIfDisposed() {
     }
   }
 
-  private BackupEngineOptions setupUninitializedBackupEngineOptions(final ExpectedException exception) {
+  private BackupEngineOptions setupUninitializedBackupEngineOptions(
+      final ExpectedException exception) {
     final BackupEngineOptions backupEngineOptions = new BackupEngineOptions(ARBITRARY_PATH);
     backupEngineOptions.close();
     exception.expect(AssertionError.class);

diff --git a/java/src/test/java/org/rocksdb/BytewiseComparatorRegressionTest.java b/java/src/test/java/org/rocksdb/BytewiseComparatorRegressionTest.java
@@ -61,10 +61,9 @@ public void testDefaultComparator() throws RocksDBException {
   @Test
   public void testCppComparator() throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true).setComparator(
-            BuiltinComparator.BYTEWISE_COMPARATOR)) {
+             BuiltinComparator.BYTEWISE_COMPARATOR)) {
       performTest(options);
     }
-
   }
 
   private void performTest(final Options options) throws RocksDBException {

diff --git a/java/src/test/java/org/rocksdb/CheckPointTest.java b/java/src/test/java/org/rocksdb/CheckPointTest.java
@@ -60,7 +60,6 @@ public void checkPoint() throws RocksDBException {
   @Test(expected = IllegalArgumentException.class)
   public void failIfDbIsNull() {
     try (final Checkpoint ignored = Checkpoint.create(null)) {
-
     }
   }
 

diff --git a/java/src/test/java/org/rocksdb/ClockCacheTest.java b/java/src/test/java/org/rocksdb/ClockCacheTest.java
@@ -18,8 +18,7 @@ public void newClockCache() {
     final long capacity = 1000;
     final int numShardBits = 16;
     final boolean strictCapacityLimit = true;
-    try(final Cache ignored = new ClockCache(capacity,
-        numShardBits, strictCapacityLimit)) {
+    try (final Cache ignored = new ClockCache(capacity, numShardBits, strictCapacityLimit)) {
       //no op
     }
   }

diff --git a/java/src/test/java/org/rocksdb/ColumnFamilyOptionsTest.java b/java/src/test/java/org/rocksdb/ColumnFamilyOptionsTest.java
@@ -97,8 +97,7 @@ public void failColumnFamilyOptionsFromPropsWithNullValue() {
   @Test(expected = IllegalArgumentException.class)
   public void failColumnFamilyOptionsFromPropsWithEmptyProps() {
     try (final ColumnFamilyOptions ignored =
-             ColumnFamilyOptions.getColumnFamilyOptionsFromProps(
-                 new Properties())) {
+             ColumnFamilyOptions.getColumnFamilyOptionsFromProps(new Properties())) {
     }
   }
 

diff --git a/java/src/test/java/org/rocksdb/ColumnFamilyTest.java b/java/src/test/java/org/rocksdb/ColumnFamilyTest.java
@@ -22,16 +22,14 @@ public class ColumnFamilyTest {
   public static final RocksNativeLibraryResource ROCKS_NATIVE_LIBRARY_RESOURCE =
       new RocksNativeLibraryResource();
 
-  @Rule
-  public TemporaryFolder dbFolder = new TemporaryFolder();
+  @Rule public TemporaryFolder dbFolder = new TemporaryFolder();
 
   @Test
   public void columnFamilyDescriptorName() throws RocksDBException {
     final byte[] cfName = "some_name".getBytes(UTF_8);
 
     try(final ColumnFamilyOptions cfOptions = new ColumnFamilyOptions()) {
-      final ColumnFamilyDescriptor cfDescriptor =
-              new ColumnFamilyDescriptor(cfName, cfOptions);
+      final ColumnFamilyDescriptor cfDescriptor = new ColumnFamilyDescriptor(cfName, cfOptions);
       assertThat(cfDescriptor.getName()).isEqualTo(cfName);
     }
   }
@@ -40,24 +38,23 @@ public void columnFamilyDescriptorName() throws RocksDBException {
   public void columnFamilyDescriptorOptions() throws RocksDBException {
     final byte[] cfName = "some_name".getBytes(UTF_8);
 
-    try(final ColumnFamilyOptions cfOptions = new ColumnFamilyOptions()
-            .setCompressionType(CompressionType.BZLIB2_COMPRESSION)) {
+    try (final ColumnFamilyOptions cfOptions =
+             new ColumnFamilyOptions().setCompressionType(CompressionType.BZLIB2_COMPRESSION)) {
       final ColumnFamilyDescriptor cfDescriptor =
           new ColumnFamilyDescriptor(cfName, cfOptions);
 
-        assertThat(cfDescriptor.getOptions().compressionType())
-            .isEqualTo(CompressionType.BZLIB2_COMPRESSION);
+      assertThat(cfDescriptor.getOptions().compressionType())
+          .isEqualTo(CompressionType.BZLIB2_COMPRESSION);
     }
   }
 
   @Test
   public void listColumnFamilies() throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
-         final RocksDB ignored = RocksDB.open(options,
-             dbFolder.getRoot().getAbsolutePath())) {
+         final RocksDB ignored = RocksDB.open(options, dbFolder.getRoot().getAbsolutePath())) {
       // Test listColumnFamilies
-      final List<byte[]> columnFamilyNames = RocksDB.listColumnFamilies(options,
-          dbFolder.getRoot().getAbsolutePath());
+      final List<byte[]> columnFamilyNames =
+          RocksDB.listColumnFamilies(options, dbFolder.getRoot().getAbsolutePath());
       assertThat(columnFamilyNames).isNotNull();
       assertThat(columnFamilyNames.size()).isGreaterThan(0);
       assertThat(columnFamilyNames.size()).isEqualTo(1);
@@ -93,21 +90,20 @@ public void defaultColumnFamily() throws RocksDBException {
   @Test
   public void createColumnFamily() throws RocksDBException {
     final byte[] cfName = "new_cf".getBytes(UTF_8);
-    final ColumnFamilyDescriptor cfDescriptor = new ColumnFamilyDescriptor(cfName,
-            new ColumnFamilyOptions());
+    final ColumnFamilyDescriptor cfDescriptor =
+        new ColumnFamilyDescriptor(cfName, new ColumnFamilyOptions());
 
     try (final Options options = new Options().setCreateIfMissing(true);
-         final RocksDB db = RocksDB.open(options,
-                 dbFolder.getRoot().getAbsolutePath())) {
+         final RocksDB db = RocksDB.open(options, dbFolder.getRoot().getAbsolutePath())) {
       try (final ColumnFamilyHandle columnFamilyHandle = db.createColumnFamily(cfDescriptor)) {
         assertThat(columnFamilyHandle.getName()).isEqualTo(cfName);
         assertThat(columnFamilyHandle.getID()).isEqualTo(1);
 
         final ColumnFamilyDescriptor latestDescriptor = columnFamilyHandle.getDescriptor();
         assertThat(latestDescriptor.getName()).isEqualTo(cfName);
 
-        final List<byte[]> columnFamilyNames = RocksDB.listColumnFamilies(
-                options, dbFolder.getRoot().getAbsolutePath());
+        final List<byte[]> columnFamilyNames =
+            RocksDB.listColumnFamilies(options, dbFolder.getRoot().getAbsolutePath());
         assertThat(columnFamilyNames).isNotNull();
         assertThat(columnFamilyNames.size()).isGreaterThan(0);
         assertThat(columnFamilyNames.size()).isEqualTo(2);

diff --git a/java/src/test/java/org/rocksdb/ReadOnlyTest.java b/java/src/test/java/org/rocksdb/ReadOnlyTest.java
@@ -91,8 +91,7 @@ public void failToWriteInReadOnly() throws RocksDBException {
   @Test(expected = RocksDBException.class)
   public void failToCFWriteInReadOnly() throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
-         final RocksDB ignored = RocksDB.open(options,
-             dbFolder.getRoot().getAbsolutePath())) {
+         final RocksDB ignored = RocksDB.open(options, dbFolder.getRoot().getAbsolutePath())) {
       //no-op
     }
 
@@ -112,8 +111,7 @@ public void failToCFWriteInReadOnly() throws RocksDBException {
   @Test(expected = RocksDBException.class)
   public void failToRemoveInReadOnly() throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
-         final RocksDB ignored = RocksDB.open(options,
-             dbFolder.getRoot().getAbsolutePath())) {
+         final RocksDB ignored = RocksDB.open(options, dbFolder.getRoot().getAbsolutePath())) {
       //no-op
     }
 
@@ -135,8 +133,7 @@ public void failToRemoveInReadOnly() throws RocksDBException {
   @Test(expected = RocksDBException.class)
   public void failToCFRemoveInReadOnly() throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
-         final RocksDB ignored = RocksDB.open(options,
-             dbFolder.getRoot().getAbsolutePath())) {
+         final RocksDB ignored = RocksDB.open(options, dbFolder.getRoot().getAbsolutePath())) {
       //no-op
     }
 
@@ -149,17 +146,15 @@ public void failToCFRemoveInReadOnly() throws RocksDBException {
       try (final RocksDB rDb = RocksDB.openReadOnly(
           dbFolder.getRoot().getAbsolutePath(), cfDescriptors,
           readOnlyColumnFamilyHandleList)) {
-          rDb.delete(readOnlyColumnFamilyHandleList.get(0),
-              "key".getBytes());
+        rDb.delete(readOnlyColumnFamilyHandleList.get(0), "key".getBytes());
       }
     }
   }
 
   @Test(expected = RocksDBException.class)
   public void failToWriteBatchReadOnly() throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
-         final RocksDB ignored = RocksDB.open(options,
-             dbFolder.getRoot().getAbsolutePath())) {
+         final RocksDB ignored = RocksDB.open(options, dbFolder.getRoot().getAbsolutePath())) {
       //no-op
     }
 
@@ -174,17 +169,16 @@ public void failToWriteBatchReadOnly() throws RocksDBException {
           readOnlyColumnFamilyHandleList);
            final WriteBatch wb = new WriteBatch();
            final WriteOptions wOpts = new WriteOptions()) {
-          wb.put("key".getBytes(), "value".getBytes());
-          rDb.write(wOpts, wb);
+        wb.put("key".getBytes(), "value".getBytes());
+        rDb.write(wOpts, wb);
       }
     }
   }
 
   @Test(expected = RocksDBException.class)
   public void failToCFWriteBatchReadOnly() throws RocksDBException {
     try (final Options options = new Options().setCreateIfMissing(true);
-         final RocksDB ignored = RocksDB.open(options,
-             dbFolder.getRoot().getAbsolutePath())) {
+         final RocksDB ignored = RocksDB.open(options, dbFolder.getRoot().getAbsolutePath())) {
       //no-op
     }
 
@@ -199,9 +193,8 @@ public void failToCFWriteBatchReadOnly() throws RocksDBException {
           readOnlyColumnFamilyHandleList);
            final WriteBatch wb = new WriteBatch();
            final WriteOptions wOpts = new WriteOptions()) {
-          wb.put(readOnlyColumnFamilyHandleList.get(0), "key".getBytes(),
-              "value".getBytes());
-          rDb.write(wOpts, wb);
+        wb.put(readOnlyColumnFamilyHandleList.get(0), "key".getBytes(), "value".getBytes());
+        rDb.write(wOpts, wb);
       }
     }
   }
@@ -219,8 +212,9 @@ public void errorIfWalFileExists() throws RocksDBException {
 
       final List<ColumnFamilyHandle> readOnlyColumnFamilyHandleList = new ArrayList<>();
       try (final DBOptions options = new DBOptions();
-           final RocksDB ignored = RocksDB.openReadOnly(options, dbFolder.getRoot().getAbsolutePath(),
-               cfDescriptors, readOnlyColumnFamilyHandleList, true)) {
+           final RocksDB ignored =
+               RocksDB.openReadOnly(options, dbFolder.getRoot().getAbsolutePath(), cfDescriptors,
+                   readOnlyColumnFamilyHandleList, true)) {
         // no-op... should have raised an error as errorIfWalFileExists=true
       }
     }

diff --git a/java/src/test/java/org/rocksdb/RocksDBTest.java b/java/src/test/java/org/rocksdb/RocksDBTest.java
@@ -75,10 +75,9 @@ public void createColumnFamily() throws RocksDBException {
 
       final List<ColumnFamilyHandle> cfHandles = new ArrayList<>();
       try (final RocksDB ignored = RocksDB.open(dbFolder.getRoot().getAbsolutePath(),
-        Arrays.asList(
-            new ColumnFamilyDescriptor(RocksDB.DEFAULT_COLUMN_FAMILY),
-            new ColumnFamilyDescriptor(col1Name)),
-            cfHandles)) {
+               Arrays.asList(new ColumnFamilyDescriptor(RocksDB.DEFAULT_COLUMN_FAMILY),
+                   new ColumnFamilyDescriptor(col1Name)),
+               cfHandles)) {
         try {
           assertThat(cfHandles.size()).isEqualTo(2);
           assertThat(cfHandles.get(1)).isNotNull();
@@ -118,11 +117,9 @@ public void createColumnFamilies() throws RocksDBException {
 
     cfHandles = new ArrayList<>();
     try (final RocksDB ignored = RocksDB.open(dbFolder.getRoot().getAbsolutePath(),
-        Arrays.asList(
-            new ColumnFamilyDescriptor(RocksDB.DEFAULT_COLUMN_FAMILY),
-            new ColumnFamilyDescriptor(col1Name),
-            new ColumnFamilyDescriptor(col2Name)),
-        cfHandles)) {
+             Arrays.asList(new ColumnFamilyDescriptor(RocksDB.DEFAULT_COLUMN_FAMILY),
+                 new ColumnFamilyDescriptor(col1Name), new ColumnFamilyDescriptor(col2Name)),
+             cfHandles)) {
       try {
         assertThat(cfHandles.size()).isEqualTo(3);
         assertThat(cfHandles.get(1)).isNotNull();
@@ -164,11 +161,9 @@ public void createColumnFamiliesfromDescriptors() throws RocksDBException {
 
     cfHandles = new ArrayList<>();
     try (final RocksDB ignored = RocksDB.open(dbFolder.getRoot().getAbsolutePath(),
-        Arrays.asList(
-            new ColumnFamilyDescriptor(RocksDB.DEFAULT_COLUMN_FAMILY),
-            new ColumnFamilyDescriptor(col1Name),
-            new ColumnFamilyDescriptor(col2Name)),
-        cfHandles)) {
+             Arrays.asList(new ColumnFamilyDescriptor(RocksDB.DEFAULT_COLUMN_FAMILY),
+                 new ColumnFamilyDescriptor(col1Name), new ColumnFamilyDescriptor(col2Name)),
+             cfHandles)) {
       try {
         assertThat(cfHandles.size()).isEqualTo(3);
         assertThat(cfHandles.get(1)).isNotNull();
@@ -814,8 +809,7 @@ public void compactRangeWithKeysReduceColumnFamily()
   }
 
   @Test
-  public void compactRangeToLevel()
-      throws RocksDBException {
+  public void compactRangeToLevel() throws RocksDBException {
     final int NUM_KEYS_PER_L0_FILE = 100;
     final int KEY_SIZE = 20;
     final int VALUE_SIZE = 300;
@@ -1172,10 +1166,12 @@ public void destroyDB() throws RocksDBException {
       try (final RocksDB db = RocksDB.open(options, dbPath)) {
         db.put("key1".getBytes(), "value".getBytes());
       }
-      assertThat(dbFolder.getRoot().exists() && Objects.requireNonNull(dbFolder.getRoot().listFiles()).length != 0)
+      assertThat(dbFolder.getRoot().exists()
+          && Objects.requireNonNull(dbFolder.getRoot().listFiles()).length != 0)
           .isTrue();
       RocksDB.destroyDB(dbPath, options);
-      assertThat(dbFolder.getRoot().exists() && Objects.requireNonNull(dbFolder.getRoot().listFiles()).length != 0)
+      assertThat(dbFolder.getRoot().exists()
+          && Objects.requireNonNull(dbFolder.getRoot().listFiles()).length != 0)
           .isFalse();
     }
   }