From 32d42b3509f2456a6b3d1e55e81119b0b6351c23 Mon Sep 17 00:00:00 2001 From: Radek Hubner Date: Thu, 7 Dec 2023 12:23:18 +0400 Subject: [PATCH] Fix format. --- java/src/main/java/org/rocksdb/InBuiltMergeOperator.java | 1 - java/src/main/java/org/rocksdb/MergeOperatorV2.java | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/java/src/main/java/org/rocksdb/InBuiltMergeOperator.java b/java/src/main/java/org/rocksdb/InBuiltMergeOperator.java index c14fbd1c63f..93d1c26e510 100644 --- a/java/src/main/java/org/rocksdb/InBuiltMergeOperator.java +++ b/java/src/main/java/org/rocksdb/InBuiltMergeOperator.java @@ -15,7 +15,6 @@ public abstract class InBuiltMergeOperator extends RocksObject implements MergeO protected InBuiltMergeOperator(final long nativeHandle) { super(nativeHandle); } - } // diff --git a/java/src/main/java/org/rocksdb/MergeOperatorV2.java b/java/src/main/java/org/rocksdb/MergeOperatorV2.java index a2872decf74..fa98185ca1f 100644 --- a/java/src/main/java/org/rocksdb/MergeOperatorV2.java +++ b/java/src/main/java/org/rocksdb/MergeOperatorV2.java @@ -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 operand);