104 lines
4.7 KiB
Diff
104 lines
4.7 KiB
Diff
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
|
|
index 8dcf7af2f2..5d56f19325 100644
|
|
--- a/gradle/dependencies.gradle
|
|
+++ b/gradle/dependencies.gradle
|
|
@@ -104,7 +104,7 @@ versions += [
|
|
owaspDepCheckPlugin: "6.0.3",
|
|
powermock: "2.0.9",
|
|
reflections: "0.9.12",
|
|
- rocksDB: "5.18.4",
|
|
+ rocksDB: "6.19.3",
|
|
scalaCollectionCompat: "2.3.0",
|
|
scalafmt: "1.5.1",
|
|
scalaJava8Compat : "0.9.1",
|
|
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter.java
|
|
index 2e2cb41100..ae08255fb6 100644
|
|
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter.java
|
|
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter.java
|
|
@@ -123,11 +123,12 @@ public class RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter extends
|
|
// (3) skipping because, not done in actual PrepareForBulkLoad() code in https://github.com/facebook/rocksdb/blob/master/options/options.cc
|
|
//columnFamilyOptions.setMemTableConfig(new VectorMemTableConfig());
|
|
// (4-5) below:
|
|
- dbOptions.setMaxBackgroundFlushes(4);
|
|
+ /* dbOptions.setMaxBackgroundFlushes(4);
|
|
columnFamilyOptions.setDisableAutoCompactions(true);
|
|
columnFamilyOptions.setLevel0FileNumCompactionTrigger(1 << 30);
|
|
columnFamilyOptions.setLevel0SlowdownWritesTrigger(1 << 30);
|
|
- columnFamilyOptions.setLevel0StopWritesTrigger(1 << 30);
|
|
+ columnFamilyOptions.setLevel0StopWritesTrigger(1 << 30);*/
|
|
+ super.prepareForBulkLoad();
|
|
return this;
|
|
}
|
|
|
|
@@ -185,7 +186,7 @@ public class RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter extends
|
|
}
|
|
|
|
@Override
|
|
- public Options setComparator(final AbstractComparator<? extends AbstractSlice<?>> comparator) {
|
|
+ public Options setComparator(final AbstractComparator comparator) {
|
|
columnFamilyOptions.setComparator(comparator);
|
|
return this;
|
|
}
|
|
@@ -342,6 +343,7 @@ public class RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter extends
|
|
return this;
|
|
}
|
|
|
|
+ @Deprecated
|
|
@Override
|
|
public int maxBackgroundCompactions() {
|
|
return dbOptions.maxBackgroundCompactions();
|
|
@@ -358,6 +360,7 @@ public class RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter extends
|
|
return dbOptions.statistics();
|
|
}
|
|
|
|
+ @Deprecated
|
|
@Override
|
|
public void setBaseBackgroundCompactions(final int baseBackgroundCompactions) {
|
|
dbOptions.setBaseBackgroundCompactions(baseBackgroundCompactions);
|
|
@@ -368,6 +371,7 @@ public class RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter extends
|
|
return dbOptions.baseBackgroundCompactions();
|
|
}
|
|
|
|
+ @Deprecated
|
|
@Override
|
|
public Options setMaxBackgroundCompactions(final int maxBackgroundCompactions) {
|
|
dbOptions.setMaxBackgroundCompactions(maxBackgroundCompactions);
|
|
@@ -375,8 +379,9 @@ public class RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter extends
|
|
}
|
|
|
|
@Override
|
|
- public void setMaxSubcompactions(final int maxSubcompactions) {
|
|
+ public Options setMaxSubcompactions(final int maxSubcompactions) {
|
|
dbOptions.setMaxSubcompactions(maxSubcompactions);
|
|
+ return this;
|
|
}
|
|
|
|
@Override
|
|
@@ -384,11 +389,13 @@ public class RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapter extends
|
|
return dbOptions.maxSubcompactions();
|
|
}
|
|
|
|
+ @Deprecated
|
|
@Override
|
|
public int maxBackgroundFlushes() {
|
|
return dbOptions.maxBackgroundFlushes();
|
|
}
|
|
|
|
+ @Deprecated
|
|
@Override
|
|
public Options setMaxBackgroundFlushes(final int maxBackgroundFlushes) {
|
|
dbOptions.setMaxBackgroundFlushes(maxBackgroundFlushes);
|
|
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
|
|
index e1c5df31d0..5b2b9cc7eb 100644
|
|
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
|
|
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
|
|
@@ -136,7 +136,7 @@ public class RocksDBStore implements KeyValueStore<Bytes, byte[]>, BatchWritingS
|
|
tableConfig.setBlockSize(BLOCK_SIZE);
|
|
|
|
filter = new BloomFilter();
|
|
- tableConfig.setFilter(filter);
|
|
+ tableConfig.setFilterPolicy(filter);
|
|
|
|
userSpecifiedOptions.optimizeFiltersForHits();
|
|
userSpecifiedOptions.setTableFormatConfig(tableConfig);
|