snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Improve Number extraction/conversion function

Browse Source
This commit is contained in:
Kerollmops 2020-05-19 14:16:29 +02:00
parent ae30ee2ade
commit e2b115f3a9
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meilisearch-core/src/update/helpers.rs
View File

@ -4,6 +4,7 @@ use std::hash::{Hash, Hasher};
use indexmap::IndexMap; use indexmap::IndexMap;
use meilisearch_schema::IndexedPos; use meilisearch_schema::IndexedPos;
use meilisearch_types::DocumentId; use meilisearch_types::DocumentId;
use ordered_float::OrderedFloat;
use serde_json::Value; use serde_json::Value;
use siphasher::sip::SipHasher; use siphasher::sip::SipHasher;
@ -81,7 +82,14 @@ pub fn value_to_number(value: &Value) -> Option<Number> {
match value { match value {
Value::Null => None, Value::Null => None,
Value::Bool(boolean) => Some(Number::Unsigned(*boolean as u64)), Value::Bool(boolean) => Some(Number::Unsigned(*boolean as u64)),
Value::Number(number) => Number::from_str(&number.to_string()).ok(), // TODO improve that Value::Number(number) => {
match (number.as_i64(), number.as_u64(), number.as_f64()) {
(Some(n), _, _) => Some(Number::Signed(n)),
(_, Some(n), _) => Some(Number::Unsigned(n)),
(_, _, Some(n)) => Some(Number::Float(OrderedFloat(n))),
(None, None, None) => None,
}
},
Value::String(string) => Number::from_str(string).ok(), Value::String(string) => Number::from_str(string).ok(),
Value::Array(_array) => None, Value::Array(_array) => None,
Value::Object(_object) => None, Value::Object(_object) => None,