From 66ae5c8161395c77f671435b88107d26de351db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Sun, 3 Feb 2019 11:12:34 +0100 Subject: [PATCH 1/3] chore: Clarify some QueryBuilder comments --- src/rank/query_builder.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rank/query_builder.rs b/src/rank/query_builder.rs index 1dced5ba3..c7fe7b528 100644 --- a/src/rank/query_builder.rs +++ b/src/rank/query_builder.rs @@ -136,7 +136,7 @@ where D: Deref, FI: Fn(DocumentId, &DatabaseView) -> bool, { pub fn query(self, query: &str, range: Range) -> Vec { - // We give the filtering work to the query distinct builder, + // We delegate the filter work to the distinct query builder, // specifying a distinct rule that has no effect. if self.filter.is_some() { let builder = self.with_distinct(|_, _| None as Option<()>, 1); From c5e951be09b163a6405afe361cdbc8cbdc0af94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Sun, 3 Feb 2019 11:12:54 +0100 Subject: [PATCH 2/3] chore: Move the deseserializer into the serde module --- src/database/mod.rs | 1 - src/database/{ => serde}/deserializer.rs | 0 src/database/serde/mod.rs | 1 + src/database/view.rs | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename src/database/{ => serde}/deserializer.rs (100%) diff --git a/src/database/mod.rs b/src/database/mod.rs index 9b6208264..e9b567171 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -21,7 +21,6 @@ const DATA_SCHEMA: &[u8] = b"data-schema"; pub mod schema; pub(crate) mod index; -mod deserializer; mod document_key; mod serde; mod update; diff --git a/src/database/deserializer.rs b/src/database/serde/deserializer.rs similarity index 100% rename from src/database/deserializer.rs rename to src/database/serde/deserializer.rs diff --git a/src/database/serde/mod.rs b/src/database/serde/mod.rs index 248c5cf5f..44c826487 100644 --- a/src/database/serde/mod.rs +++ b/src/database/serde/mod.rs @@ -19,6 +19,7 @@ pub mod find_id; pub mod key_to_string; pub mod serializer; pub mod indexer_serializer; +pub mod deserializer; pub fn calculate_hash(t: &T) -> u64 { let mut s = DefaultHasher::new(); diff --git a/src/database/view.rs b/src/database/view.rs index b5d40400b..b9144a281 100644 --- a/src/database/view.rs +++ b/src/database/view.rs @@ -9,7 +9,7 @@ use serde::de::DeserializeOwned; use crate::database::{DocumentKey, DocumentKeyAttr}; use crate::database::{retrieve_data_schema, retrieve_data_index}; -use crate::database::deserializer::Deserializer; +use crate::database::serde::deserializer::Deserializer; use crate::database::schema::Schema; use crate::database::index::Index; use crate::rank::{QueryBuilder, FilterFunc}; From 94b89c5439497dfc580f1fd69f23f5902bbe22d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Sun, 3 Feb 2019 11:13:38 +0100 Subject: [PATCH 3/3] chore: Make the Document from_raw method private --- src/rank/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rank/mod.rs b/src/rank/mod.rs index 2c5a4bfc3..3b31c0794 100644 --- a/src/rank/mod.rs +++ b/src/rank/mod.rs @@ -18,7 +18,7 @@ pub struct Document { } impl Document { - pub fn from_raw(raw: &RawDocument) -> Document { + fn from_raw(raw: &RawDocument) -> Document { let len = raw.matches.range.len(); let mut matches = Vec::with_capacity(len);