Merge pull request #13 from stefan-zobel/9.7.fb

Merge 9.7.fb
stefan-zobel · Oct 26, 2024 · a0f6707 · a0f6707
2 parents 71c3f19 + 28bfb2d
commit a0f6707
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 11 deletions.
diff --git a/bin/9.7.1/librocksdbjni-win64.dll b/bin/9.7.1/librocksdbjni-win64.dll
diff --git a/bin/9.7.2/librocksdbjni-win64.dll b/bin/9.7.2/librocksdbjni-win64.dll
diff --git a/bin/9.7.3/librocksdbjni-linux64-musl.so b/bin/9.7.3/librocksdbjni-linux64-musl.so
diff --git a/bin/9.7.3/librocksdbjni-linux64.so b/bin/9.7.3/librocksdbjni-linux64.so
diff --git a/bin/9.7.3/librocksdbjni-win64.dll b/bin/9.7.3/librocksdbjni-win64.dll
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.streamsupport</groupId>
     <artifactId>schwefel</artifactId>
     <packaging>jar</packaging>
-    <version>9.6.1.1</version>
+    <version>9.7.3.1-SNAPSHOT</version>
     <name>schwefel</name>
     <description>A dead simple RocksDB Java wrapper</description>
     <url>https://github.com/stefan-zobel/schwefel/</url>

diff --git a/src/main/java/org/rocksdb/AdvancedMutableColumnFamilyOptionsInterface.java b/src/main/java/org/rocksdb/AdvancedMutableColumnFamilyOptionsInterface.java
@@ -733,11 +733,10 @@ T setReportBgIoStats(
   double blobGarbageCollectionAgeCutoff();
 
   /**
-   *  If the ratio of garbage in the oldest blob files exceeds this threshold,
-   *  targeted compactions are scheduled in order to force garbage collecting
-   *  the blob files in question, assuming they are all eligible based on the
-   *  value of {@link #blobGarbageCollectionAgeCutoff} above. This option is
-   *  currently only supported with leveled compactions.
+   * If the ratio of garbage in the blob files currently eligible for garbage
+   * collection exceeds this threshold, targeted compactions are scheduled in
+   * order to force garbage collecting the oldest blob files. This option is
+   * currently only supported with leveled compactions.
    * <p>
    *  Note that {@link #enableBlobGarbageCollection} has to be set in order for this
    *  option to have any effect.

diff --git a/src/main/java/org/rocksdb/ColumnFamilyOptions.java b/src/main/java/org/rocksdb/ColumnFamilyOptions.java
@@ -1204,11 +1204,10 @@ public double blobGarbageCollectionAgeCutoff() {
   }
 
   /**
-   *  If the ratio of garbage in the oldest blob files exceeds this threshold,
-   *  targeted compactions are scheduled in order to force garbage collecting
-   *  the blob files in question, assuming they are all eligible based on the
-   *  value of {@link #blobGarbageCollectionAgeCutoff} above. This option is
-   *  currently only supported with leveled compactions.
+   * If the ratio of garbage in the blob files currently eligible for garbage
+   * collection exceeds this threshold, targeted compactions are scheduled in
+   * order to force garbage collecting the oldest blob files. This option is
+   * currently only supported with leveled compactions.
    * <p>
    *  Note that {@link #enableBlobGarbageCollection} has to be set in order for this
    *  option to have any effect.

diff --git a/src/main/resources/librocksdbjni-linux64-musl.so b/src/main/resources/librocksdbjni-linux64-musl.so
diff --git a/src/main/resources/librocksdbjni-linux64.so b/src/main/resources/librocksdbjni-linux64.so
diff --git a/src/main/resources/librocksdbjni-win64.dll b/src/main/resources/librocksdbjni-win64.dll