Merge pull request #505 from fyrz/RocksJava-Redundant-Modifier

[RocksJava] Redundant access-modifier in interfaces
main
Adam Retter 10 years ago
commit 30e93c9b9c
  1. 4
      java/src/main/java/org/rocksdb/ColumnFamilyOptionsInterface.java
  2. 2
      java/src/main/java/org/rocksdb/MergeOperator.java
  3. 14
      java/src/main/java/org/rocksdb/RocksIteratorInterface.java
  4. 18
      java/src/main/java/org/rocksdb/WriteBatchInterface.java

@ -124,7 +124,7 @@ public interface ColumnFamilyOptionsInterface {
* operators are "put", "uint64add", "stringappend" and "stringappendtest". * operators are "put", "uint64add", "stringappend" and "stringappendtest".
* @return the instance of the current Object. * @return the instance of the current Object.
*/ */
public Object setMergeOperatorName(String name); Object setMergeOperatorName(String name);
/** /**
* <p>Set the merge operator to be used for merging two different key/value * <p>Set the merge operator to be used for merging two different key/value
@ -135,7 +135,7 @@ public interface ColumnFamilyOptionsInterface {
* @param mergeOperator {@link MergeOperator} instance. * @param mergeOperator {@link MergeOperator} instance.
* @return the instance of the current Object. * @return the instance of the current Object.
*/ */
public Object setMergeOperator(MergeOperator mergeOperator); Object setMergeOperator(MergeOperator mergeOperator);
/** /**
* Amount of data to build up in memory (backed by an unsorted log * Amount of data to build up in memory (backed by an unsorted log

@ -11,5 +11,5 @@ package org.rocksdb;
* value. * value.
*/ */
public interface MergeOperator { public interface MergeOperator {
public long newMergeOperatorHandle(); long newMergeOperatorHandle();
} }

@ -26,19 +26,19 @@ public interface RocksIteratorInterface {
* *
* @return true if iterator is valid. * @return true if iterator is valid.
*/ */
public boolean isValid(); boolean isValid();
/** /**
* <p>Position at the first entry in the source. The iterator is Valid() * <p>Position at the first entry in the source. The iterator is Valid()
* after this call if the source is not empty.</p> * after this call if the source is not empty.</p>
*/ */
public void seekToFirst(); void seekToFirst();
/** /**
* <p>Position at the last entry in the source. The iterator is * <p>Position at the last entry in the source. The iterator is
* valid after this call if the source is not empty.</p> * valid after this call if the source is not empty.</p>
*/ */
public void seekToLast(); void seekToLast();
/** /**
* <p>Position at the first entry in the source whose key is that or * <p>Position at the first entry in the source whose key is that or
@ -50,7 +50,7 @@ public interface RocksIteratorInterface {
* @param target byte array describing a key or a * @param target byte array describing a key or a
* key prefix to seek for. * key prefix to seek for.
*/ */
public void seek(byte[] target); void seek(byte[] target);
/** /**
* <p>Moves to the next entry in the source. After this call, Valid() is * <p>Moves to the next entry in the source. After this call, Valid() is
@ -58,7 +58,7 @@ public interface RocksIteratorInterface {
* *
* <p>REQUIRES: {@link #isValid()}</p> * <p>REQUIRES: {@link #isValid()}</p>
*/ */
public void next(); void next();
/** /**
* <p>Moves to the previous entry in the source. After this call, Valid() is * <p>Moves to the previous entry in the source. After this call, Valid() is
@ -66,7 +66,7 @@ public interface RocksIteratorInterface {
* *
* <p>REQUIRES: {@link #isValid()}</p> * <p>REQUIRES: {@link #isValid()}</p>
*/ */
public void prev(); void prev();
/** /**
* <p>If an error has occurred, return it. Else return an ok status. * <p>If an error has occurred, return it. Else return an ok status.
@ -76,5 +76,5 @@ public interface RocksIteratorInterface {
* @throws RocksDBException thrown if error happens in underlying * @throws RocksDBException thrown if error happens in underlying
* native library. * native library.
*/ */
public void status() throws RocksDBException; void status() throws RocksDBException;
} }

@ -16,7 +16,7 @@ public interface WriteBatchInterface {
* *
* @return number of items in WriteBatch * @return number of items in WriteBatch
*/ */
public int count(); int count();
/** /**
* <p>Store the mapping "key-&gt;value" in the database.</p> * <p>Store the mapping "key-&gt;value" in the database.</p>
@ -24,7 +24,7 @@ public interface WriteBatchInterface {
* @param key the specified key to be inserted. * @param key the specified key to be inserted.
* @param value the value associated with the specified key. * @param value the value associated with the specified key.
*/ */
public void put(byte[] key, byte[] value); void put(byte[] key, byte[] value);
/** /**
* <p>Store the mapping "key-&gt;value" within given column * <p>Store the mapping "key-&gt;value" within given column
@ -35,7 +35,7 @@ public interface WriteBatchInterface {
* @param key the specified key to be inserted. * @param key the specified key to be inserted.
* @param value the value associated with the specified key. * @param value the value associated with the specified key.
*/ */
public void put(ColumnFamilyHandle columnFamilyHandle, void put(ColumnFamilyHandle columnFamilyHandle,
byte[] key, byte[] value); byte[] key, byte[] value);
/** /**
@ -46,7 +46,7 @@ public interface WriteBatchInterface {
* @param value the value to be merged with the current value for * @param value the value to be merged with the current value for
* the specified key. * the specified key.
*/ */
public void merge(byte[] key, byte[] value); void merge(byte[] key, byte[] value);
/** /**
* <p>Merge "value" with the existing value of "key" in given column family. * <p>Merge "value" with the existing value of "key" in given column family.
@ -57,7 +57,7 @@ public interface WriteBatchInterface {
* @param value the value to be merged with the current value for * @param value the value to be merged with the current value for
* the specified key. * the specified key.
*/ */
public void merge(ColumnFamilyHandle columnFamilyHandle, void merge(ColumnFamilyHandle columnFamilyHandle,
byte[] key, byte[] value); byte[] key, byte[] value);
/** /**
@ -65,7 +65,7 @@ public interface WriteBatchInterface {
* *
* @param key Key to delete within database * @param key Key to delete within database
*/ */
public void remove(byte[] key); void remove(byte[] key);
/** /**
* <p>If column family contains a mapping for "key", erase it. Else do nothing.</p> * <p>If column family contains a mapping for "key", erase it. Else do nothing.</p>
@ -73,7 +73,7 @@ public interface WriteBatchInterface {
* @param columnFamilyHandle {@link ColumnFamilyHandle} instance * @param columnFamilyHandle {@link ColumnFamilyHandle} instance
* @param key Key to delete within database * @param key Key to delete within database
*/ */
public void remove(ColumnFamilyHandle columnFamilyHandle, byte[] key); void remove(ColumnFamilyHandle columnFamilyHandle, byte[] key);
/** /**
* Append a blob of arbitrary size to the records in this batch. The blob will * Append a blob of arbitrary size to the records in this batch. The blob will
@ -89,10 +89,10 @@ public interface WriteBatchInterface {
* *
* @param blob binary object to be inserted * @param blob binary object to be inserted
*/ */
public void putLogData(byte[] blob); void putLogData(byte[] blob);
/** /**
* Clear all updates buffered in this batch * Clear all updates buffered in this batch
*/ */
public void clear(); void clear();
} }

Loading…
Cancel
Save