andreacavalli/CavalliumDBEngine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Andrea Cavalli 2022-05-01 15:35:12 +02:00
parent 59e980f356
commit c72e4d5a83
1 changed files with 7 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java
View File

@ -423,8 +423,6 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase {
} }
} }
createIfNotExists(descriptors, rocksdbOptions, standardCache, compressedCache, inMemory, dbPath, dbPathString);
while (true) { while (true) {
try { try {
// a factory method that returns a RocksDB instance // a factory method that returns a RocksDB instance
@ -682,13 +680,6 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase {
//flushDb(db, handles); //flushDb(db, handles);
} }
for (ColumnFamilyHandle handle : handles) {
try {
handle.close();
} catch (Exception ex) {
logger.error("Can't close column family", ex);
}
}
snapshotsHandles.forEach((id, snapshot) -> { snapshotsHandles.forEach((id, snapshot) -> {
try { try {
if (db.isOwningHandle()) { if (db.isOwningHandle()) {
@ -705,6 +696,13 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase {
} catch (Exception ex) { } catch (Exception ex) {
logger.error("Can't close database " + name + " at " + dbPath, ex); logger.error("Can't close database " + name + " at " + dbPath, ex);
} }
for (ColumnFamilyHandle handle : handles) {
try {
handle.close();
} catch (Exception ex) {
logger.error("Can't close column family", ex);
}
}
if (compressedCache != null) { if (compressedCache != null) {
compressedCache.close(); compressedCache.close();
} }
@ -953,50 +951,6 @@ public class LLLocalKeyValueDatabase implements LLKeyValueDatabase {
return paths; return paths;
} }
private void createIfNotExists(List<ColumnFamilyDescriptor> descriptors,
DBOptions options,
Cache standardCache,
Cache compressedCache,
boolean inMemory,
Path dbPath,
String dbPathString) throws RocksDBException {
if (inMemory) {
return;
}
if (Files.notExists(dbPath)) {
// Check if handles are all different
var descriptorsSet = new HashSet<>(descriptors);
if (descriptorsSet.size() != descriptors.size()) {
throw new IllegalArgumentException("Descriptors must be unique!");
}
List<ColumnFamilyDescriptor> descriptorsToCreate = new LinkedList<>(descriptors);
descriptorsToCreate
.removeIf((cf) -> Arrays.equals(cf.getName(), DEFAULT_COLUMN_FAMILY.getName()));
/*
SkipStatsUpdateOnDbOpen = true because this RocksDB.open session is used only to add just some columns
*/
//var dbOptionsFastLoadSlowEdit = options.setSkipStatsUpdateOnDbOpen(true);
LinkedList<ColumnFamilyHandle> handles = new LinkedList<>();
this.db = RocksDB.open(options.setCreateMissingColumnFamilies(true),
dbPathString,
descriptors,
handles
);
this.standardCache = standardCache;
this.compressedCache = compressedCache;
flushAndCloseDb(db, standardCache, compressedCache, handles);
this.closed = false;
this.db = null;
this.standardCache = null;
this.compressedCache = null;
}
}
private Snapshot getSnapshotLambda(LLSnapshot snapshot) { private Snapshot getSnapshotLambda(LLSnapshot snapshot) {
var closeReadSnapLock = closeLock.readLock(); var closeReadSnapLock = closeLock.readLock();
try { try {