update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rocksdb / java / src / main / java / org / rocksdb / DBOptionsInterface.java

diff --git a/ceph/src/rocksdb/java/src/main/java/org/rocksdb/DBOptionsInterface.java b/ceph/src/rocksdb/java/src/main/java/org/rocksdb/DBOptionsInterface.java
index b090c39d444028a34ec756d0f4f92ca907b47cd0..ef1b86bffa8550e032eb4fcd8c1647e7ab447c0d 100644 (file)
--- a/ceph/src/rocksdb/java/src/main/java/org/rocksdb/DBOptionsInterface.java
+++ b/ceph/src/rocksdb/java/src/main/java/org/rocksdb/DBOptionsInterface.java
@@ -625,7 +625,7 @@ public interface DBOptionsInterface<T extends DBOptionsInterface<T>> {
    *    then WAL_size_limit_MB, they will be deleted starting with the
    *    earliest until size_limit is met. All empty files will be deleted.</li>
    * <li>If WAL_ttl_seconds is not 0 and WAL_size_limit_MB is 0, then
-   *    WAL files will be checked every WAL_ttl_secondsi / 2 and those that
+   *    WAL files will be checked every WAL_ttl_seconds / 2 and those that
    *    are older than WAL_ttl_seconds will be deleted.</li>
    * <li>If both are not 0, WAL files will be checked every 10 min and both
    *    checks will be performed with ttl being first.</li>
@@ -648,7 +648,7 @@ public interface DBOptionsInterface<T extends DBOptionsInterface<T>> {
    * then WAL_size_limit_MB, they will be deleted starting with the
    * earliest until size_limit is met. All empty files will be deleted.</li>
    * <li>If WAL_ttl_seconds is not 0 and WAL_size_limit_MB is 0, then
-   * WAL files will be checked every WAL_ttl_secondsi / 2 and those that
+   * WAL files will be checked every WAL_ttl_seconds / 2 and those that
    * are older than WAL_ttl_seconds will be deleted.</li>
    * <li>If both are not 0, WAL files will be checked every 10 min and both
    * checks will be performed with ttl being first.</li>
@@ -947,43 +947,6 @@ public interface DBOptionsInterface<T extends DBOptionsInterface<T>> {
    */
   AccessHint accessHintOnCompactionStart();
 
-  /**
-   * If true, always create a new file descriptor and new table reader
-   * for compaction inputs. Turn this parameter on may introduce extra
-   * memory usage in the table reader, if it allocates extra memory
-   * for indexes. This will allow file descriptor prefetch options
-   * to be set for compaction input files and not to impact file
-   * descriptors for the same file used by user queries.
-   * Suggest to enable {@link BlockBasedTableConfig#cacheIndexAndFilterBlocks()}
-   * for this mode if using block-based table.
-   *
-   * Default: false
-   *
-   * @param newTableReaderForCompactionInputs true if a new file descriptor and
-   *     table reader should be created for compaction inputs
-   *
-   * @return the reference to the current options.
-   */
-  T setNewTableReaderForCompactionInputs(
-      boolean newTableReaderForCompactionInputs);
-
-  /**
-   * If true, always create a new file descriptor and new table reader
-   * for compaction inputs. Turn this parameter on may introduce extra
-   * memory usage in the table reader, if it allocates extra memory
-   * for indexes. This will allow file descriptor prefetch options
-   * to be set for compaction input files and not to impact file
-   * descriptors for the same file used by user queries.
-   * Suggest to enable {@link BlockBasedTableConfig#cacheIndexAndFilterBlocks()}
-   * for this mode if using block-based table.
-   *
-   * Default: false
-   *
-   * @return true if a new file descriptor and table reader are created for
-   *     compaction inputs
-   */
-  boolean newTableReaderForCompactionInputs();
-
   /**
    * This is a maximum buffer size that is used by WinMmapReadableFile in
    * unbuffered disk I/O mode. We need to maintain an aligned buffer for
@@ -1523,32 +1486,6 @@ public interface DBOptionsInterface<T extends DBOptionsInterface<T>> {
    */
   boolean allowIngestBehind();
 
-  /**
-   * Needed to support differential snapshots.
-   * If set to true then DB will only process deletes with sequence number
-   * less than what was set by SetPreserveDeletesSequenceNumber(uint64_t ts).
-   * Clients are responsible to periodically call this method to advance
-   * the cutoff time. If this method is never called and preserve_deletes
-   * is set to true NO deletes will ever be processed.
-   * At the moment this only keeps normal deletes, SingleDeletes will
-   * not be preserved.
-   *
-   * DEFAULT: false
-   *
-   * @param preserveDeletes true to preserve deletes.
-   *
-   * @return the reference to the current options.
-   */
-  T setPreserveDeletes(final boolean preserveDeletes);
-
-  /**
-   * Returns true if deletes are preserved.
-   * See {@link #setPreserveDeletes(boolean)}.
-   *
-   * @return true if deletes are preserved, false otherwise.
-   */
-  boolean preserveDeletes();
-
   /**
    * If enabled it uses two queues for writes, one for the ones with
    * disable_memtable and one for the ones that also write to memtable. This