fix default column when no config is provided

Youri K · Youri K · commit aba1953e8ac8 · 2019-08-30T12:30:45.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
@@ -35,7 +35,7 @@ class RocksDBManager(dataDir: Path, columnFamilies: List[String], optionsFilePat
     }
     options.setCreateIfMissing(true).setCreateMissingColumnFamilies(true)
     val defaultColumnFamilyOptions = cfListRef.find(_.getName sameElements RocksDB.DEFAULT_COLUMN_FAMILY).map(_.getOptions).getOrElse(new ColumnFamilyOptions())
-    val newColumnFamilyDescriptors = columnFamilies.map(_.getBytes).diff(cfListRef.toList.map(_.getName)).map(new ColumnFamilyDescriptor(_, defaultColumnFamilyOptions))
+    val newColumnFamilyDescriptors = (columnFamilies.map(_.getBytes) :+ RocksDB.DEFAULT_COLUMN_FAMILY).diff(cfListRef.toList.map(_.getName)).map(new ColumnFamilyDescriptor(_, defaultColumnFamilyOptions))
     val columnFamilyDescriptors = cfListRef.toList ::: newColumnFamilyDescriptors
     logger.info("Opening RocksDB at " + dataDir.toAbsolutePath)
     val columnFamilyHandles = new util.ArrayList[ColumnFamilyHandle]

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class RocksDBManager(dataDir: Path, columnFamilies: List[String], optionsFilePat`
`35`	`35`	`}`
`36`	`36`	`options.setCreateIfMissing(true).setCreateMissingColumnFamilies(true)`
`37`	`37`	`val defaultColumnFamilyOptions = cfListRef.find(_.getName sameElements RocksDB.DEFAULT_COLUMN_FAMILY).map(_.getOptions).getOrElse(new ColumnFamilyOptions())`
`38`		`- val newColumnFamilyDescriptors = columnFamilies.map(_.getBytes).diff(cfListRef.toList.map(_.getName)).map(new ColumnFamilyDescriptor(_, defaultColumnFamilyOptions))`
	`38`	`+ val newColumnFamilyDescriptors = (columnFamilies.map(_.getBytes) :+ RocksDB.DEFAULT_COLUMN_FAMILY).diff(cfListRef.toList.map(_.getName)).map(new ColumnFamilyDescriptor(_, defaultColumnFamilyOptions))`
`39`	`39`	`val columnFamilyDescriptors = cfListRef.toList ::: newColumnFamilyDescriptors`
`40`	`40`	`logger.info("Opening RocksDB at " + dataDir.toAbsolutePath)`
`41`	`41`	`val columnFamilyHandles = new util.ArrayList[ColumnFamilyHandle]`