Skip to content

Commit

Permalink
Fix format.
Browse files Browse the repository at this point in the history
  • Loading branch information
rhubner committed Feb 7, 2024
1 parent f2f82c0 commit 82606aa
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
1 change: 0 additions & 1 deletion java/src/main/java/org/rocksdb/InBuiltMergeOperator.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public abstract class InBuiltMergeOperator extends RocksObject implements MergeO
protected InBuiltMergeOperator(final long nativeHandle) {
super(nativeHandle);
}

}

//
Expand Down
9 changes: 6 additions & 3 deletions java/src/main/java/org/rocksdb/MergeOperatorV2.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@ public MergeOperatorV2(final String operatorName) {

/**
* This is the callback method which supplies the values to be merged for the provided key.
* The parameters are only valid until the method returns, and must be deep copied if you wish to retain them.
* The parameters are only valid until the method returns, and must be deep copied if you wish to
* retain them.
*
* @param key The key associated with the merge operation.
* @param existingValue The existing value of the current key, null means that the value doesn't exist.
* @param existingValue The existing value of the current key, null means that the value doesn't
* exist.
* @param operand A list of operands to apply
* @return The method should return the result of merging the supplied values with the implemented merge algorithm.
* @return The method should return the result of merging the supplied values with the implemented
* merge algorithm.
*/
public abstract MergeOperatorOutput fullMergeV2(
final ByteBuffer key, final ByteBuffer existingValue, final List<ByteBuffer> operand);
Expand Down
18 changes: 9 additions & 9 deletions java/src/main/java/org/rocksdb/UInt64AddOperator.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
* integer value.
*/
public class UInt64AddOperator extends InBuiltMergeOperator {
public UInt64AddOperator() {
super(newSharedUInt64AddOperator());
}
public UInt64AddOperator() {
super(newSharedUInt64AddOperator());
}

private static native long newSharedUInt64AddOperator();
@Override
protected final void disposeInternal(final long handle) {
disposeInternalJni(handle);
}
private static native void disposeInternalJni(final long handle);
private static native long newSharedUInt64AddOperator();
@Override
protected final void disposeInternal(final long handle) {
disposeInternalJni(handle);
}
private static native void disposeInternalJni(final long handle);
}

0 comments on commit 82606aa

Please sign in to comment.