snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 18:45:06 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

feat: Fix the index opening when index already exists

Browse Source
This commit is contained in:
Clément Renault 2019-05-26 11:36:47 +02:00
parent e08edc2d6b
commit 62c8f1ba04
No known key found for this signature in database
GPG Key ID: 0151CDAB43460DAE
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meilidb-data/src/database/mod.rs
View File

@ -39,17 +39,26 @@ impl Database {
let path = path.as_ref(); let path = path.as_ref();
let cache = RwLock::new(HashMap::new()); let cache = RwLock::new(HashMap::new());
let inner = {
let options = { let options = {
let mut options = rocksdb::Options::default(); let mut options = rocksdb::Options::default();
options.create_if_missing(true); options.create_if_missing(true);
options options
}; };
let cfs = rocksdb::DB::list_cf(&options, path).unwrap_or(Vec::new()); let cfs = rocksdb::DB::list_cf(&options, path).unwrap_or(Vec::new());
Arc::new(rocksdb::DB::open_cf(&options, path, cfs)?) let inner = Arc::new(rocksdb::DB::open_cf(&options, path, &cfs)?);
}; let database = Database { cache, inner };
Ok(Database { cache, inner }) let mut indexes: Vec<_> = cfs.iter()
.filter_map(|c| c.split('-').nth(0).filter(|&c| c != "default"))
.collect();
indexes.sort_unstable();
indexes.dedup();
for index in indexes {
database.open_index(index)?;
}
Ok(database)
} }
pub fn indexes(&self) -> Result<Option<HashSet<String>>, Error> { pub fn indexes(&self) -> Result<Option<HashSet<String>>, Error> {