Update to rocksdb 7

This commit is contained in:
Andrea Cavalli 2022-03-27 01:22:20 +01:00
parent 39811dc3f3
commit 87c031fe71
4 changed files with 6 additions and 30 deletions

View File

@ -135,11 +135,6 @@
<artifactId>disruptor</artifactId> <artifactId>disruptor</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
<version>6.28.2</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.lucene</groupId> <groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId> <artifactId>lucene-core</artifactId>
@ -335,6 +330,7 @@
<dependency> <dependency>
<groupId>org.rocksdb</groupId> <groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId> <artifactId>rocksdbjni</artifactId>
<version>7.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.lucene</groupId> <groupId>org.apache.lucene</groupId>

View File

@ -454,7 +454,6 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase {
} else { } else {
options.setDelayedWriteRate(64 * SizeUnit.MB); options.setDelayedWriteRate(64 * SizeUnit.MB);
} }
options.setNewTableReaderForCompactionInputs(true);
options.setCreateIfMissing(true); options.setCreateIfMissing(true);
options.setSkipStatsUpdateOnDbOpen(true); options.setSkipStatsUpdateOnDbOpen(true);
options.setCreateMissingColumnFamilies(true); options.setCreateMissingColumnFamilies(true);

View File

@ -92,11 +92,6 @@ public class UnmodifiableReadOptions extends ReadOptions {
throw uoe(); throw uoe();
} }
@Override
public ReadOptions setIterStartSeqnum(long l) {
throw uoe();
}
@Override @Override
public ReadOptions setTableFilter(AbstractTableFilter abstractTableFilter) { public ReadOptions setTableFilter(AbstractTableFilter abstractTableFilter) {
throw uoe(); throw uoe();

View File

@ -142,20 +142,6 @@ public class CappedWriteBatch extends WriteBatch {
flushIfNeeded(false); flushIfNeeded(false);
} }
@Deprecated
@Override
public synchronized void remove(byte[] key) throws RocksDBException {
super.remove(key);
flushIfNeeded(false);
}
@Deprecated
@Override
public synchronized void remove(ColumnFamilyHandle columnFamilyHandle, byte[] key) throws RocksDBException {
super.remove(columnFamilyHandle, key);
flushIfNeeded(false);
}
@Override @Override
public synchronized void delete(byte[] key) throws RocksDBException { public synchronized void delete(byte[] key) throws RocksDBException {
super.delete(key); super.delete(key);
@ -173,7 +159,7 @@ public class CappedWriteBatch extends WriteBatch {
if (USE_FAST_DIRECT_BUFFERS && isReadOnlyDirect(key)) { if (USE_FAST_DIRECT_BUFFERS && isReadOnlyDirect(key)) {
ByteBuffer keyNioBuffer = ((ReadableComponent) key).readableBuffer(); ByteBuffer keyNioBuffer = ((ReadableComponent) key).readableBuffer();
buffersToRelease.add(key); buffersToRelease.add(key);
remove(columnFamilyHandle, keyNioBuffer); delete(columnFamilyHandle, keyNioBuffer);
} else { } else {
try { try {
super.delete(columnFamilyHandle, LLUtils.toArray(key)); super.delete(columnFamilyHandle, LLUtils.toArray(key));
@ -197,14 +183,14 @@ public class CappedWriteBatch extends WriteBatch {
} }
@Override @Override
public synchronized void remove(ByteBuffer key) throws RocksDBException { public synchronized void delete(ByteBuffer key) throws RocksDBException {
super.remove(key); super.delete(key);
flushIfNeeded(false); flushIfNeeded(false);
} }
@Override @Override
public synchronized void remove(ColumnFamilyHandle columnFamilyHandle, ByteBuffer key) throws RocksDBException { public synchronized void delete(ColumnFamilyHandle columnFamilyHandle, ByteBuffer key) throws RocksDBException {
super.remove(columnFamilyHandle, key); super.delete(columnFamilyHandle, key);
flushIfNeeded(false); flushIfNeeded(false);
} }