snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-30 09:04:59 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #196 from meilisearch/fix-cf-handle-creation

Browse Source 
Create the Column Family only when it doesn't already exist
This commit is contained in:
Clément Renault 2019-09-19 12:29:50 +02:00 committed by GitHub
commit 1e2ef06c5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meilidb-data/src/cf_tree.rs
View File

@ -17,9 +17,12 @@ struct CfTreeInner {
impl CfTree { impl CfTree {
pub fn create(db: Arc<rocksdb::DB>, name: String) -> RocksDbResult<CfTree> { pub fn create(db: Arc<rocksdb::DB>, name: String) -> RocksDbResult<CfTree> {
let mut options = rocksdb::Options::default(); let mut options = rocksdb::Options::default();
options.create_missing_column_families(true); options.create_missing_column_families(true); // this doesn't work
if db.cf_handle(&name).is_none() {
let _cf = db.create_cf(&name, &options)?;
}
let _cf = db.create_cf(&name, &options)?;
let index = Arc::new(CfTreeInner { db, name }); let index = Arc::new(CfTreeInner { db, name });
Ok(CfTree { index, sender: None }) Ok(CfTree { index, sender: None })
@ -31,9 +34,12 @@ impl CfTree {
) -> RocksDbResult<(CfTree, Receiver<()>)> ) -> RocksDbResult<(CfTree, Receiver<()>)>
{ {
let mut options = rocksdb::Options::default(); let mut options = rocksdb::Options::default();
options.create_missing_column_families(true); options.create_missing_column_families(true); // this doesn't work
if db.cf_handle(&name).is_none() {
let _cf = db.create_cf(&name, &options)?;
}
let _cf = db.create_cf(&name, &options)?;
let index = Arc::new(CfTreeInner { db, name }); let index = Arc::new(CfTreeInner { db, name });
let (sender, receiver) = unbounded(); let (sender, receiver) = unbounded();