Skip to content

Commit

Permalink
Ran 'make format'
Browse files Browse the repository at this point in the history
  • Loading branch information
adamretter committed Dec 21, 2023
1 parent f15cf83 commit a2986ff
Show file tree
Hide file tree
Showing 83 changed files with 1,012 additions and 1,063 deletions.
4 changes: 2 additions & 2 deletions java/src/main/java/org/rocksdb/AbstractCompactionFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
public abstract class AbstractCompactionFilter<T extends AbstractSlice<?>>
extends RocksObject {

/**
* Context of the Compaction Filter.
*/
Expand Down Expand Up @@ -58,7 +57,8 @@ public boolean isManualCompaction() {
* Constructor to be called by subclasses to set the
* handle to the underlying C++ object.
*
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ Compaction Filter.
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
* RocksDB C++ Compaction Filter.
*/
protected AbstractCompactionFilter(final long nativeHandle) {
super(nativeHandle);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/
public abstract class AbstractCompactionFilterFactory<T extends AbstractCompactionFilter<?>>
extends RocksCallbackObject {

/**
* Constructs a new Compaction Filter Factory which has no underlying C++ object.
*/
Expand Down
2 changes: 0 additions & 2 deletions java/src/main/java/org/rocksdb/AbstractEventListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
*/
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
public abstract class AbstractEventListener extends RocksCallbackObject implements EventListener {

/**
* Callback events that can be enabled.
*/
public enum EnabledEventCallback {

/**
* Flush completed.
*/
Expand Down
3 changes: 2 additions & 1 deletion java/src/main/java/org/rocksdb/AbstractRocksIterator.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ public abstract class AbstractRocksIterator<P extends RocksObject>
* Constructs an AbstractRocksIterator.
*
* @param parent the parent object from which the Rocks Iterator was created.
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ RocksIterator.
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
* RocksDB C++ RocksIterator.
*/
protected AbstractRocksIterator(final P parent,
final long nativeHandle) {
Expand Down
4 changes: 2 additions & 2 deletions java/src/main/java/org/rocksdb/AbstractSlice.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
* @param <T> the concrete Java type that is wrapped by the subclass of {@link AbstractSlice}.
*/
public abstract class AbstractSlice<T> extends RocksMutableObject {

/**
* Constructs an AbstractSlice.
*/
Expand All @@ -38,7 +37,8 @@ protected AbstractSlice() {
/**
* Constructs an AbstractSlice.
*
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ Slice.
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
* RocksDB C++ Slice.
*/
protected AbstractSlice(final long nativeHandle) {
super(nativeHandle);
Expand Down
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/AbstractTableFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/
public abstract class AbstractTableFilter
extends RocksCallbackObject implements TableFilter {

/**
* Constructs a new AbstractTableFilter.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
*/
public abstract class AbstractTransactionNotifier
extends RocksCallbackObject {

/**
* Constructs an AbstractTransactionNotifier.
*/
Expand Down
4 changes: 2 additions & 2 deletions java/src/main/java/org/rocksdb/AbstractWriteBatch.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
*/
public abstract class AbstractWriteBatch extends RocksObject
implements WriteBatchInterface {

/**
* Construct an AbstractWriteBatch.
*
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ Write Batch object.
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
* RocksDB C++ Write Batch object.
*/
protected AbstractWriteBatch(final long nativeHandle) {
super(nativeHandle);
Expand Down
4 changes: 2 additions & 2 deletions java/src/main/java/org/rocksdb/BackupEngine.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
* time you need to do a backup.
*/
public class BackupEngine extends RocksObject implements AutoCloseable {

/**
* Construct a BackupEngine.
*
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ backup engine object.
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
* RocksDB C++ backup engine object.
*/
protected BackupEngine(final long nativeHandle) {
super(nativeHandle);
Expand Down
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/BlockBasedTableConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
*/
// TODO(AR) should be renamed BlockBasedTableOptions
public class BlockBasedTableConfig extends TableFormatConfig {

/**
* Constructs a new BlockBasedTableConfig.
*/
Expand Down
5 changes: 2 additions & 3 deletions java/src/main/java/org/rocksdb/Cache.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@

package org.rocksdb;


/**
* Base class for Cache implementations.
*/
public abstract class Cache extends RocksObject {

/**
* Construct a Cache.
*
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ cache object.
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
* RocksDB C++ cache object.
*/
protected Cache(final long nativeHandle) {
super(nativeHandle);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
*/
public class CassandraCompactionFilter
extends AbstractCompactionFilter<Slice> {

/**
* Constructs a new CasandraCompactionFilter.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* values.
*/
public class CassandraValueMergeOperator extends MergeOperator {

/**
* Constructs a new CassandraValueMergeOperator.
*
Expand Down
4 changes: 2 additions & 2 deletions java/src/main/java/org/rocksdb/ClockCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public ClockCache(final long capacity, final int numShardBits) {
* @param strictCapacityLimit insert to the cache will fail when cache is full
*/
@Deprecated
public ClockCache(final long capacity, final int numShardBits,
final boolean strictCapacityLimit) {
public ClockCache(
final long capacity, final int numShardBits, final boolean strictCapacityLimit) {
super(newClockCache(capacity, numShardBits, strictCapacityLimit));
}

Expand Down
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/CompactionJobInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* Information about a Compaction Job.
*/
public class CompactionJobInfo extends RocksObject {

/**
* Constructs a new CompactionJobInfo.
*/
Expand Down
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/CompactionJobStats.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Statistics about a Compaction Job.
*/
public class CompactionJobStats extends RocksObject {

/**
* Constructs a new CompactionJobStats.
*/
Expand Down
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/CompactionOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* calls.
*/
public class CompactionOptions extends RocksObject {

/**
* Constructs a new CompactionOptions.
*/
Expand Down
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/CompactionOptionsFIFO.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Options for FIFO Compaction
*/
public class CompactionOptionsFIFO extends RocksObject {

/**
* Constructs a new CompactionOptionsFIFO.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Options for Universal Compaction
*/
public class CompactionOptionsUniversal extends RocksObject {

/**
* Constructs a new CompactionOptionsUniversal.
*/
Expand Down
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/CompactionReason.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Reasons for compaction.
*/
public enum CompactionReason {

/**
* Unknown.
*/
Expand Down
3 changes: 1 addition & 2 deletions java/src/main/java/org/rocksdb/CompressionOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Options for Compression
*/
public class CompressionOptions extends RocksObject {

/**
* RocksDB's generic default compression level. Internally it'll be translated
* to the default compression level specific to the library being used.
Expand Down Expand Up @@ -71,7 +70,7 @@ public CompressionOptions setLevel(final int level) {
* Get the Compression "level".
* <p>
* See {@link #setLevel(int)}
*
*
* @return the compression level.
*/
public int level() {
Expand Down
3 changes: 2 additions & 1 deletion java/src/main/java/org/rocksdb/ConcurrentTaskLimiter.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ public abstract class ConcurrentTaskLimiter extends RocksObject {
/**
* Constructs a ConcurrentTaskLimiter.
*
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ concurrent task limiter object.
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
* RocksDB C++ concurrent task limiter object.
*/
protected ConcurrentTaskLimiter(final long nativeHandle) {
super(nativeHandle);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* Concurrent Task Limiter.
*/
public class ConcurrentTaskLimiterImpl extends ConcurrentTaskLimiter {

/**
* Construct a new Concurrent Task Limiter.
*
Expand Down
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/DirectSlice.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
* values consider using @see org.rocksdb.Slice
*/
public class DirectSlice extends AbstractSlice<ByteBuffer> {

/**
* Constant for No Direct Slice.
*/
Expand Down
4 changes: 2 additions & 2 deletions java/src/main/java/org/rocksdb/Filter.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
*/
//TODO(AR) should be renamed FilterPolicy
public abstract class Filter extends RocksObject {

/**
* Constructs a filter.
*
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ filter object.
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
* RocksDB C++ filter object.
*/
protected Filter(final long nativeHandle) {
super(nativeHandle);
Expand Down
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/GetStatus.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* If the target of the fetch is not big enough, this may be bigger than the contents of the target.
*/
public class GetStatus {

/**
* The status of the request to fetch into the buffer.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* and post a warning in the LOG.
*/
public class HashLinkedListMemTableConfig extends MemTableConfig {

/**
* The default number of buckets.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* and post a warning in the LOG.
*/
public class HashSkipListMemTableConfig extends MemTableConfig {

/**
* The default number of buckets.
*/
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/java/org/rocksdb/HistogramType.java
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public enum HistogramType {

/**
* BlobDB Put/PutWithTTL/PutUntil/Write latency.
* Measured in microseconds.
* Measured in microseconds.
*/
BLOB_DB_WRITE_MICROS((byte) 0x23),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* ExportImportFilesMetaData)}.
*/
public class ImportColumnFamilyOptions extends RocksObject {

/**
* Constructs an ImportColumnFamilyOptions.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* {@link RocksDB#ingestExternalFile(ColumnFamilyHandle, List, IngestExternalFileOptions)}.
*/
public class IngestExternalFileOptions extends RocksObject {

/**
* Constructs an IngestExternalFileOptions.
*/
Expand Down
3 changes: 2 additions & 1 deletion java/src/main/java/org/rocksdb/KeyMayExist.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ public int hashCode() {
}

/**
* Part of the return type from {@link RocksDB#keyMayExist(ColumnFamilyHandle, ByteBuffer, ByteBuffer)}.
* Part of the return type from {@link RocksDB#keyMayExist(ColumnFamilyHandle, ByteBuffer,
* ByteBuffer)}.
*/
public enum KeyMayExistEnum {
/**
Expand Down
18 changes: 9 additions & 9 deletions java/src/main/java/org/rocksdb/MergeOperator.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
* value.
*/
public abstract class MergeOperator extends RocksObject {

/**
* Constructs a MergeOperator.
*
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native RocksDB C++ MergeOperator.
*/
protected MergeOperator(final long nativeHandle) {
super(nativeHandle);
}
/**
* Constructs a MergeOperator.
*
* @param nativeHandle reference to the value of the C++ pointer pointing to the underlying native
* RocksDB C++ MergeOperator.
*/
protected MergeOperator(final long nativeHandle) {
super(nativeHandle);
}
}
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/MutableOptionKey.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* Mutable Option keys.
*/
public interface MutableOptionKey {

/**
* Types of values used for Mutable Options,
*/
Expand Down
4 changes: 2 additions & 2 deletions java/src/main/java/org/rocksdb/OptimisticTransactionDB.java
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ public RocksDB getBaseDB() {

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

private static native long open(final long optionsHandle,
final String path) throws RocksDBException;
private static native long open(final long optionsHandle, final String path)
throws RocksDBException;
private static native long[] open(final long handle, final String path,
final byte[][] columnFamilyNames, final long[] columnFamilyOptions);
private static native void closeDatabase(final long handle) throws RocksDBException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*/
public class OptimisticTransactionOptions extends RocksObject
implements TransactionalOptions<OptimisticTransactionOptions> {

/**
* Constructs an OptimisticTransactionOptions.
*/
Expand Down
Loading

0 comments on commit a2986ff

Please sign in to comment.