snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

feat: Replace the linked-hash-map dependency by indexmap

Browse Source
This commit is contained in:
Clément Renault 2019-09-04 14:53:16 +02:00
parent f6ff79085e
commit ee6a54fe4c
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meilidb-schema/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
bincode = "1.1.2" bincode = "1.1.2"
linked-hash-map = { version = "0.5.2", features = ["serde_impl"] } indexmap = { version = "1.1.0", features = ["serde-1"] }
serde = { version = "1.0.91", features = ["derive"] } serde = { version = "1.0.91", features = ["derive"] }
serde_json = { version = "1.0.39", features = ["preserve_order"] } serde_json = { version = "1.0.39", features = ["preserve_order"] }
toml = { version = "0.5.0", features = ["preserve_order"] } toml = { version = "0.5.0", features = ["preserve_order"] }

10
meilidb-schema/src/lib.rs
View File

@ -6,7 +6,7 @@ use std::ops::BitOr;
use std::sync::Arc; use std::sync::Arc;
use serde::{Serialize, Deserialize}; use serde::{Serialize, Deserialize};
use linked_hash_map::LinkedHashMap; use indexmap::IndexMap;
pub const DISPLAYED: SchemaProps = SchemaProps { displayed: true, indexed: false, ranked: false }; pub const DISPLAYED: SchemaProps = SchemaProps { displayed: true, indexed: false, ranked: false };
pub const INDEXED: SchemaProps = SchemaProps { displayed: false, indexed: true, ranked: false }; pub const INDEXED: SchemaProps = SchemaProps { displayed: false, indexed: true, ranked: false };
@ -53,14 +53,14 @@ impl BitOr for SchemaProps {
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct SchemaBuilder { pub struct SchemaBuilder {
identifier: String, identifier: String,
attributes: LinkedHashMap<String, SchemaProps>, attributes: IndexMap<String, SchemaProps>,
} }
impl SchemaBuilder { impl SchemaBuilder {
pub fn with_identifier<S: Into<String>>(name: S) -> SchemaBuilder { pub fn with_identifier<S: Into<String>>(name: S) -> SchemaBuilder {
SchemaBuilder { SchemaBuilder {
identifier: name.into(), identifier: name.into(),
attributes: LinkedHashMap::new(), attributes: IndexMap::new(),
} }
} }
@ -147,14 +147,14 @@ impl Schema {
bincode::serialize_into(writer, &builder) bincode::serialize_into(writer, &builder)
} }
fn attributes_ordered(&self) -> LinkedHashMap<String, SchemaProps> { fn attributes_ordered(&self) -> IndexMap<String, SchemaProps> {
let mut ordered = BTreeMap::new(); let mut ordered = BTreeMap::new();
for (name, attr) in &self.inner.attrs { for (name, attr) in &self.inner.attrs {
let (_, props) = self.inner.props[attr.0 as usize]; let (_, props) = self.inner.props[attr.0 as usize];
ordered.insert(attr.0, (name, props)); ordered.insert(attr.0, (name, props));
} }
let mut attributes = LinkedHashMap::with_capacity(ordered.len()); let mut attributes = IndexMap::with_capacity(ordered.len());
for (_, (name, props)) in ordered { for (_, (name, props)) in ordered {
attributes.insert(name.clone(), props); attributes.insert(name.clone(), props);
} }

2
meilidb/Cargo.toml
View File

@ -14,7 +14,7 @@ csv = "1.0.7"
diskus = "0.5.0" diskus = "0.5.0"
env_logger = "0.6.1" env_logger = "0.6.1"
jemallocator = "0.1.9" jemallocator = "0.1.9"
linked-hash-map = "0.5.2" indexmap = { version = "1.1.0", features = ["serde-1"] }
meilidb-core = { path = "../meilidb-core", version = "0.1.0" } meilidb-core = { path = "../meilidb-core", version = "0.1.0" }
quickcheck = "0.8.2" quickcheck = "0.8.2"
rand = "0.6.5" rand = "0.6.5"

4
meilidb/examples/query-database.rs
View File

@ -9,7 +9,7 @@ use std::iter::FromIterator;
use std::path::PathBuf; use std::path::PathBuf;
use std::time::{Instant, Duration}; use std::time::{Instant, Duration};
use linked_hash_map::LinkedHashMap; use indexmap::IndexMap;
use rustyline::{Editor, Config}; use rustyline::{Editor, Config};
use structopt::StructOpt; use structopt::StructOpt;
use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor}; use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
@ -39,7 +39,7 @@ pub struct Opt {
pub char_context: usize, pub char_context: usize,
} }
type Document = LinkedHashMap<String, String>; type Document = IndexMap<String, String>;
fn display_highlights(text: &str, ranges: &[usize]) -> io::Result<()> { fn display_highlights(text: &str, ranges: &[usize]) -> io::Result<()> {
let mut stdout = StandardStream::stdout(ColorChoice::Always); let mut stdout = StandardStream::stdout(ColorChoice::Always);