Skip to content

Commit 6ef32e0

Browse files
committed
Ran 'make format'
1 parent f6aa03c commit 6ef32e0

File tree

84 files changed

+1011
-1061
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1011
-1061
lines changed

java/src/main/java/org/rocksdb/AbstractCompactionFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
public abstract class AbstractCompactionFilter<T extends AbstractSlice<?>>
1717
extends RocksObject {
18-
1918
/**
2019
* Context of the Compaction Filter.
2120
*/
@@ -58,7 +57,8 @@ public boolean isManualCompaction() {
5857
* Constructor to be called by subclasses to set the
5958
* handle to the underlying C++ object.
6059
*
61-
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ Compaction Filter.
60+
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
61+
* RocksDB C++ Compaction Filter.
6262
*/
6363
protected AbstractCompactionFilter(final long nativeHandle) {
6464
super(nativeHandle);

java/src/main/java/org/rocksdb/AbstractCompactionFilterFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
*/
1414
public abstract class AbstractCompactionFilterFactory<T extends AbstractCompactionFilter<?>>
1515
extends RocksCallbackObject {
16-
1716
/**
1817
* Constructs a new Compaction Filter Factory which has no underlying C++ object.
1918
*/

java/src/main/java/org/rocksdb/AbstractEventListener.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
*/
1313
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
1414
public abstract class AbstractEventListener extends RocksCallbackObject implements EventListener {
15-
1615
/**
1716
* Callback events that can be enabled.
1817
*/
1918
public enum EnabledEventCallback {
20-
2119
/**
2220
* Flush completed.
2321
*/

java/src/main/java/org/rocksdb/AbstractRocksIterator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public abstract class AbstractRocksIterator<P extends RocksObject>
2929
* Constructs an AbstractRocksIterator.
3030
*
3131
* @param parent the parent object from which the Rocks Iterator was created.
32-
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ RocksIterator.
32+
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
33+
* RocksDB C++ RocksIterator.
3334
*/
3435
protected AbstractRocksIterator(final P parent,
3536
final long nativeHandle) {

java/src/main/java/org/rocksdb/AbstractSlice.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
* @param <T> the concrete Java type that is wrapped by the subclass of {@link AbstractSlice}.
2828
*/
2929
public abstract class AbstractSlice<T> extends RocksMutableObject {
30-
3130
/**
3231
* Constructs an AbstractSlice.
3332
*/
@@ -38,7 +37,8 @@ protected AbstractSlice() {
3837
/**
3938
* Constructs an AbstractSlice.
4039
*
41-
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ Slice.
40+
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
41+
* RocksDB C++ Slice.
4242
*/
4343
protected AbstractSlice(final long nativeHandle) {
4444
super(nativeHandle);

java/src/main/java/org/rocksdb/AbstractTableFilter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
public abstract class AbstractTableFilter
88
extends RocksCallbackObject implements TableFilter {
9-
109
/**
1110
* Constructs a new AbstractTableFilter.
1211
*/

java/src/main/java/org/rocksdb/AbstractTransactionNotifier.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*/
1212
public abstract class AbstractTransactionNotifier
1313
extends RocksCallbackObject {
14-
1514
/**
1615
* Constructs an AbstractTransactionNotifier.
1716
*/

java/src/main/java/org/rocksdb/AbstractWriteBatch.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
*/
2323
public abstract class AbstractWriteBatch extends RocksObject
2424
implements WriteBatchInterface {
25-
2625
/**
2726
* Construct an AbstractWriteBatch.
2827
*
29-
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ Write Batch object.
28+
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
29+
* RocksDB C++ Write Batch object.
3030
*/
3131
protected AbstractWriteBatch(final long nativeHandle) {
3232
super(nativeHandle);

java/src/main/java/org/rocksdb/BackupEngine.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
* time you need to do a backup.
1919
*/
2020
public class BackupEngine extends RocksObject implements AutoCloseable {
21-
2221
/**
2322
* Construct a BackupEngine.
2423
*
25-
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ backup engine object.
24+
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
25+
* RocksDB C++ backup engine object.
2626
*/
2727
protected BackupEngine(final long nativeHandle) {
2828
super(nativeHandle);

java/src/main/java/org/rocksdb/BlockBasedTableConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*/
1212
// TODO(AR) should be renamed BlockBasedTableOptions
1313
public class BlockBasedTableConfig extends TableFormatConfig {
14-
1514
/**
1615
* Constructs a new BlockBasedTableConfig.
1716
*/

java/src/main/java/org/rocksdb/Cache.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55

66
package org.rocksdb;
77

8-
98
/**
109
* Base class for Cache implementations.
1110
*/
1211
public abstract class Cache extends RocksObject {
13-
1412
/**
1513
* Construct a Cache.
1614
*
17-
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ cache object.
15+
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
16+
* RocksDB C++ cache object.
1817
*/
1918
protected Cache(final long nativeHandle) {
2019
super(nativeHandle);

java/src/main/java/org/rocksdb/CassandraCompactionFilter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
*/
1515
public class CassandraCompactionFilter
1616
extends AbstractCompactionFilter<Slice> {
17-
1817
/**
1918
* Constructs a new CasandraCompactionFilter.
2019
*

java/src/main/java/org/rocksdb/CassandraValueMergeOperator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
* values.
1313
*/
1414
public class CassandraValueMergeOperator extends MergeOperator {
15-
1615
/**
1716
* Constructs a new CassandraValueMergeOperator.
1817
*

java/src/main/java/org/rocksdb/ClockCache.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public ClockCache(final long capacity, final int numShardBits) {
6262
* @param strictCapacityLimit insert to the cache will fail when cache is full
6363
*/
6464
@Deprecated
65-
public ClockCache(final long capacity, final int numShardBits,
66-
final boolean strictCapacityLimit) {
65+
public ClockCache(
66+
final long capacity, final int numShardBits, final boolean strictCapacityLimit) {
6767
super(newClockCache(capacity, numShardBits, strictCapacityLimit));
6868
}
6969

java/src/main/java/org/rocksdb/CompactionJobInfo.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* Information about a Compaction Job.
1414
*/
1515
public class CompactionJobInfo extends RocksObject {
16-
1716
/**
1817
* Constructs a new CompactionJobInfo.
1918
*/

java/src/main/java/org/rocksdb/CompactionJobStats.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Statistics about a Compaction Job.
1010
*/
1111
public class CompactionJobStats extends RocksObject {
12-
1312
/**
1413
* Constructs a new CompactionJobStats.
1514
*/

java/src/main/java/org/rocksdb/CompactionOptions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* calls.
1414
*/
1515
public class CompactionOptions extends RocksObject {
16-
1716
/**
1817
* Constructs a new CompactionOptions.
1918
*/

java/src/main/java/org/rocksdb/CompactionOptionsFIFO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Options for FIFO Compaction
1010
*/
1111
public class CompactionOptionsFIFO extends RocksObject {
12-
1312
/**
1413
* Constructs a new CompactionOptionsFIFO.
1514
*/

java/src/main/java/org/rocksdb/CompactionOptionsUniversal.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Options for Universal Compaction
1010
*/
1111
public class CompactionOptionsUniversal extends RocksObject {
12-
1312
/**
1413
* Constructs a new CompactionOptionsUniversal.
1514
*/

java/src/main/java/org/rocksdb/CompactionReason.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Reasons for compaction.
1010
*/
1111
public enum CompactionReason {
12-
1312
/**
1413
* Unknown.
1514
*/

java/src/main/java/org/rocksdb/CompressionOptions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Options for Compression
1010
*/
1111
public class CompressionOptions extends RocksObject {
12-
1312
/**
1413
* RocksDB's generic default compression level. Internally it'll be translated
1514
* to the default compression level specific to the library being used.
@@ -71,7 +70,7 @@ public CompressionOptions setLevel(final int level) {
7170
* Get the Compression "level".
7271
* <p>
7372
* See {@link #setLevel(int)}
74-
*
73+
*
7574
* @return the compression level.
7675
*/
7776
public int level() {

java/src/main/java/org/rocksdb/ConcurrentTaskLimiter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public abstract class ConcurrentTaskLimiter extends RocksObject {
1313
/**
1414
* Constructs a ConcurrentTaskLimiter.
1515
*
16-
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ concurrent task limiter object.
16+
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
17+
* RocksDB C++ concurrent task limiter object.
1718
*/
1819
protected ConcurrentTaskLimiter(final long nativeHandle) {
1920
super(nativeHandle);

java/src/main/java/org/rocksdb/ConcurrentTaskLimiterImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
* Concurrent Task Limiter.
1111
*/
1212
public class ConcurrentTaskLimiterImpl extends ConcurrentTaskLimiter {
13-
1413
/**
1514
* Construct a new Concurrent Task Limiter.
1615
*

java/src/main/java/org/rocksdb/DirectSlice.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* values consider using @see org.rocksdb.Slice
1717
*/
1818
public class DirectSlice extends AbstractSlice<ByteBuffer> {
19-
2019
/**
2120
* Constant for No Direct Slice.
2221
*/

java/src/main/java/org/rocksdb/Filter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
*/
1515
//TODO(AR) should be renamed FilterPolicy
1616
public abstract class Filter extends RocksObject {
17-
1817
/**
1918
* Constructs a filter.
2019
*
21-
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ filter object.
20+
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
21+
* RocksDB C++ filter object.
2222
*/
2323
protected Filter(final long nativeHandle) {
2424
super(nativeHandle);

java/src/main/java/org/rocksdb/GetStatus.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
* If the target of the fetch is not big enough, this may be bigger than the contents of the target.
1313
*/
1414
public class GetStatus {
15-
1615
/**
1716
* The status of the request to fetch into the buffer.
1817
*/

java/src/main/java/org/rocksdb/HashLinkedListMemTableConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
* and post a warning in the LOG.
1616
*/
1717
public class HashLinkedListMemTableConfig extends MemTableConfig {
18-
1918
/**
2019
* The default number of buckets.
2120
*/

java/src/main/java/org/rocksdb/HashSkipListMemTableConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
* and post a warning in the LOG.
1616
*/
1717
public class HashSkipListMemTableConfig extends MemTableConfig {
18-
1918
/**
2019
* The default number of buckets.
2120
*/

java/src/main/java/org/rocksdb/HistogramType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public enum HistogramType {
171171

172172
/**
173173
* BlobDB Put/PutWithTTL/PutUntil/Write latency.
174-
* Measured in microseconds.
174+
* Measured in microseconds.
175175
*/
176176
BLOB_DB_WRITE_MICROS((byte) 0x23),
177177

java/src/main/java/org/rocksdb/ImportColumnFamilyOptions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
* ExportImportFilesMetaData)}.
1313
*/
1414
public class ImportColumnFamilyOptions extends RocksObject {
15-
1615
/**
1716
* Constructs an ImportColumnFamilyOptions.
1817
*/

java/src/main/java/org/rocksdb/IngestExternalFileOptions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
* {@link RocksDB#ingestExternalFile(ColumnFamilyHandle, List, IngestExternalFileOptions)}.
1212
*/
1313
public class IngestExternalFileOptions extends RocksObject {
14-
1514
/**
1615
* Constructs an IngestExternalFileOptions.
1716
*/

java/src/main/java/org/rocksdb/KeyMayExist.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public int hashCode() {
2828
}
2929

3030
/**
31-
* Part of the return type from {@link RocksDB#keyMayExist(ColumnFamilyHandle, ByteBuffer, ByteBuffer)}.
31+
* Part of the return type from {@link RocksDB#keyMayExist(ColumnFamilyHandle, ByteBuffer,
32+
* ByteBuffer)}.
3233
*/
3334
public enum KeyMayExistEnum {
3435
/**

java/src/main/java/org/rocksdb/MergeOperator.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
* value.
1313
*/
1414
public abstract class MergeOperator extends RocksObject {
15-
16-
/**
17-
* Constructs a MergeOperator.
18-
*
19-
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ MergeOperator.
20-
*/
21-
protected MergeOperator(final long nativeHandle) {
22-
super(nativeHandle);
15+
/**
16+
* Constructs a MergeOperator.
17+
*
18+
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
19+
* RocksDB C++ MergeOperator.
20+
*/
21+
protected MergeOperator(final long nativeHandle) {
22+
super(nativeHandle);
2323
}
2424
}

java/src/main/java/org/rocksdb/MutableOptionKey.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* Mutable Option keys.
66
*/
77
public interface MutableOptionKey {
8-
98
/**
109
* Types of values used for Mutable Options,
1110
*/

java/src/main/java/org/rocksdb/OptimisticTransactionDB.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ public RocksDB getBaseDB() {
207207

208208
@Override protected final native void disposeInternal(final long handle);
209209

210-
private static native long open(final long optionsHandle,
211-
final String path) throws RocksDBException;
210+
private static native long open(final long optionsHandle, final String path)
211+
throws RocksDBException;
212212
private static native long[] open(final long handle, final String path,
213213
final byte[][] columnFamilyNames, final long[] columnFamilyOptions);
214214
private static native void closeDatabase(final long handle) throws RocksDBException;

java/src/main/java/org/rocksdb/OptimisticTransactionOptions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*/
1111
public class OptimisticTransactionOptions extends RocksObject
1212
implements TransactionalOptions<OptimisticTransactionOptions> {
13-
1413
/**
1514
* Constructs an OptimisticTransactionOptions.
1615
*/

0 commit comments

Comments
 (0)