overwrite create if missing default at correct spot

Youri K · Youri K · commit a6f8fe3f2a63 · 2019-08-30T12:06:55.000+02:00
diff --git a/src/main/scala/com/scalableminds/fossildb/db/RocksDBStore.scala b/src/main/scala/com/scalableminds/fossildb/db/RocksDBStore.scala
@@ -21,7 +21,7 @@ class RocksDBManager(dataDir: Path, columnFamilies: List[String], optionsFilePat
 
   val (db: RocksDB, columnFamilyHandles) = {
     RocksDB.loadLibrary()
-    val options = new DBOptions().setCreateIfMissing(true).setCreateMissingColumnFamilies(true)
+    val options = new DBOptions()
     val cfListRef: mutable.Buffer[ColumnFamilyDescriptor] = mutable.Buffer()
     optionsFilePathOpt.foreach { optionsFilePath =>
       try {
@@ -33,6 +33,7 @@ class RocksDBManager(dataDir: Path, columnFamilies: List[String], optionsFilePat
         }
       }
     }
+    options.setCreateIfMissing(true).setCreateMissingColumnFamilies(true)
     val newColumnFamilyDescriptors = (columnFamilies.map(_.getBytes) :+ RocksDB.DEFAULT_COLUMN_FAMILY).diff(cfListRef.toList.map(_.getName)).map(new ColumnFamilyDescriptor(_))
     val columnFamilyDescriptors = cfListRef.toList ::: newColumnFamilyDescriptors
     logger.info("Opening RocksDB at " + dataDir.toAbsolutePath)

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class RocksDBManager(dataDir: Path, columnFamilies: List[String], optionsFilePat`
`21`	`21`
`22`	`22`	`val (db: RocksDB, columnFamilyHandles) = {`
`23`	`23`	`RocksDB.loadLibrary()`
`24`		`- val options = new DBOptions().setCreateIfMissing(true).setCreateMissingColumnFamilies(true)`
	`24`	`+ val options = new DBOptions()`
`25`	`25`	`val cfListRef: mutable.Buffer[ColumnFamilyDescriptor] = mutable.Buffer()`
`26`	`26`	`optionsFilePathOpt.foreach { optionsFilePath =>`
`27`	`27`	`try {`
`@@ -33,6 +33,7 @@ class RocksDBManager(dataDir: Path, columnFamilies: List[String], optionsFilePat`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
	`36`	`+ options.setCreateIfMissing(true).setCreateMissingColumnFamilies(true)`
`36`	`37`	`val newColumnFamilyDescriptors = (columnFamilies.map(_.getBytes) :+ RocksDB.DEFAULT_COLUMN_FAMILY).diff(cfListRef.toList.map(_.getName)).map(new ColumnFamilyDescriptor(_))`
`37`	`38`	`val columnFamilyDescriptors = cfListRef.toList ::: newColumnFamilyDescriptors`
`38`	`39`	`logger.info("Opening RocksDB at " + dataDir.toAbsolutePath)`