Merge pull request #11 from stefan-zobel/9.5.fb

Merge 9.5.fb

pom.xml

@@ -4,7 +4,7 @@
     <groupId>net.sourceforge.streamsupport</groupId>
     <artifactId>schwefel</artifactId>
     <packaging>jar</packaging>
-    <version>9.4.0.1</version>
+    <version>9.5.2.1-SNAPSHOT</version>
     <name>schwefel</name>
     <description>A dead simple RocksDB Java wrapper</description>
     <url>https://github.com/stefan-zobel/schwefel/</url>

src/main/java/org/rocksdb/RateLimiter.java

@@ -45,7 +45,7 @@ public RateLimiter(final long rateBytesPerSecond) {
    *     when rate_bytes_per_sec is set to 10MB/s and refill_period_us is set to
    *     100ms, then 1MB is refilled every 100ms internally. Larger value can
    *     lead to burstier writes while smaller value introduces more CPU
-   *     overhead. The default of 100,000ms should work for most cases.
+   *     overhead. The default of 100,000us should work for most cases.
    */
   public RateLimiter(final long rateBytesPerSecond,
       final long refillPeriodMicros) {
@@ -66,7 +66,7 @@ public RateLimiter(final long rateBytesPerSecond,
    *     when rate_bytes_per_sec is set to 10MB/s and refill_period_us is set to
    *     100ms, then 1MB is refilled every 100ms internally. Larger value can
    *     lead to burstier writes while smaller value introduces more CPU
-   *     overhead. The default of 100,000ms should work for most cases.
+   *     overhead. The default of 100,000us should work for most cases.
    * @param fairness RateLimiter accepts high-pri requests and low-pri requests.
    *     A low-pri request is usually blocked in favor of hi-pri request.
    *     Currently, RocksDB assigns low-pri to request from compaction and
@@ -95,7 +95,7 @@ public RateLimiter(final long rateBytesPerSecond,
    *     when rate_bytes_per_sec is set to 10MB/s and refill_period_us is set to
    *     100ms, then 1MB is refilled every 100ms internally. Larger value can
    *     lead to burstier writes while smaller value introduces more CPU
-   *     overhead. The default of 100,000ms should work for most cases.
+   *     overhead. The default of 100,000us should work for most cases.
    * @param fairness RateLimiter accepts high-pri requests and low-pri requests.
    *     A low-pri request is usually blocked in favor of hi-pri request.
    *     Currently, RocksDB assigns low-pri to request from compaction and
@@ -127,7 +127,7 @@ public RateLimiter(final long rateBytesPerSecond,
    *     when rate_bytes_per_sec is set to 10MB/s and refill_period_us is set to
    *     100ms, then 1MB is refilled every 100ms internally. Larger value can
    *     lead to burstier writes while smaller value introduces more CPU
-   *     overhead. The default of 100,000ms should work for most cases.
+   *     overhead. The default of 100,000us should work for most cases.
    * @param fairness RateLimiter accepts high-pri requests and low-pri requests.
    *     A low-pri request is usually blocked in favor of hi-pri request.
    *     Currently, RocksDB assigns low-pri to request from compaction and

src/main/java/org/rocksdb/TickerType.java

@@ -878,6 +878,10 @@ public enum TickerType {
 
     SST_FOOTER_CORRUPTION_COUNT((byte) -0x55),
 
+    FILE_READ_CORRUPTION_RETRY_COUNT((byte) -0x56),
+
+    FILE_READ_CORRUPTION_RETRY_SUCCESS_COUNT((byte) -0x57),
+
     TICKER_ENUM_MAX((byte) -0x54);
 
     private final byte value;