searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-22 21:04:27 +01:00
Code Issues Releases Wiki Activity

Merge pull request #33 from Kerollmops/fastest-schema

Browse Source 
Improve the Schema performances
This commit is contained in:
Clément Renault 2018-12-15 22:32:44 +01:00 committed by GitHub
commit 26fbb46253
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/database/schema.rs
View File

@ -3,6 +3,7 @@ use std::io::{Read, Write};
use std::{fmt, u32}; use std::{fmt, u32};
use std::path::Path; use std::path::Path;
use std::ops::BitOr; use std::ops::BitOr;
use std::sync::Arc;
use std::fs::File; use std::fs::File;
use serde_derive::{Serialize, Deserialize}; use serde_derive::{Serialize, Deserialize};
@ -60,18 +61,23 @@ impl SchemaBuilder {
let mut props = Vec::new(); let mut props = Vec::new();
for (i, (name, prop)) in self.attrs.into_iter().enumerate() { for (i, (name, prop)) in self.attrs.into_iter().enumerate() {
attrs.insert(name, SchemaAttr(i as u32)); attrs.insert(name.clone(), SchemaAttr(i as u32));
props.push(prop); props.push((name, prop));
} }
Schema { attrs, props } Schema { inner: Arc::new(InnerSchema { attrs, props }) }
} }
} }
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct Schema { pub struct Schema {
inner: Arc<InnerSchema>,
}
#[derive(Debug, Clone, PartialEq, Eq)]
struct InnerSchema {
attrs: HashMap<String, SchemaAttr>, attrs: HashMap<String, SchemaAttr>,
props: Vec<SchemaProps>, props: Vec<(String, SchemaProps)>,
} }
impl Schema { impl Schema {
@ -88,9 +94,9 @@ impl Schema {
pub fn write_to<W: Write>(&self, writer: W) -> bincode::Result<()> { pub fn write_to<W: Write>(&self, writer: W) -> bincode::Result<()> {
let mut ordered = BTreeMap::new(); let mut ordered = BTreeMap::new();
for (name, field) in &self.attrs { for (name, field) in &self.inner.attrs {
let index = field.as_u32(); let index = field.as_u32();
let props = self.props[index as usize]; let (_, props) = self.inner.props[index as usize];
ordered.insert(index, (name, props)); ordered.insert(index, (name, props));
} }
@ -103,19 +109,19 @@ impl Schema {
} }
pub fn props(&self, attr: SchemaAttr) -> SchemaProps { pub fn props(&self, attr: SchemaAttr) -> SchemaProps {
self.props[attr.as_u32() as usize] let index = attr.as_u32();
let (_, props) = self.inner.props[index as usize];
props
} }
pub fn attribute<S: AsRef<str>>(&self, name: S) -> Option<SchemaAttr> { pub fn attribute<S: AsRef<str>>(&self, name: S) -> Option<SchemaAttr> {
self.attrs.get(name.as_ref()).cloned() self.inner.attrs.get(name.as_ref()).cloned()
} }
pub fn attribute_name(&self, attr: SchemaAttr) -> &str { pub fn attribute_name(&self, attr: SchemaAttr) -> &str {
// FIXME complexity is insane ! let index = attr.as_u32();
for (key, &value) in &self.attrs { let (name, _) = &self.inner.props[index as usize];
if value == attr { return &key } name
}
panic!("schema attribute name not found for {:?}", attr)
} }
} }