rust/tantivy
1
0
Fork 0
mirror of https://github.com/quickwit-oss/tantivy.git synced 2026-01-08 01:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

move helper to indexer module

Browse Source
This commit is contained in:
Saroh
2022-05-04 16:24:54 +02:00
parent 9e38343352
commit 14cb66ee00
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/indexer/json_term_writer.rs
View File

@@ -199,6 +199,29 @@ fn infer_type_from_str(text: &str) -> TextOrDateTime {
}
}
// Tries to infer a JSON type from a string
pub(crate) fn infer_fast_value_term(
json_term_writer: &mut JsonTermWriter,
phrase: &str,
) -> Option<Term> {
if let Ok(dt) = OffsetDateTime::parse(phrase, &Rfc3339) {
let dt_utc = dt.to_offset(UtcOffset::UTC);
return Some(generate_term_from_json_writer(
json_term_writer,
DateTime::from_utc(dt_utc),
));
}
if let Ok(u64_val) = str::parse::<u64>(phrase) {
return Some(generate_term_from_json_writer(json_term_writer, u64_val));
}
if let Ok(i64_val) = str::parse::<i64>(phrase) {
return Some(generate_term_from_json_writer(json_term_writer, i64_val));
}
if let Ok(f64_val) = str::parse::<f64>(phrase) {
return Some(generate_term_from_json_writer(json_term_writer, f64_val));
}
None
}
// helper function to generate a Term from a json fastvalue
pub(crate) fn generate_term_from_json_writer<T: FastValue>(
json_term_writer: &mut JsonTermWriter,

2
src/indexer/mod.rs
View File

@@ -26,7 +26,7 @@ use smallvec::SmallVec;
pub use self::index_writer::IndexWriter;
pub(crate) use self::json_term_writer::{
generate_term_from_json_writer, generate_terms_from_json_writer, JsonTermWriter,
generate_terms_from_json_writer, infer_fast_value_term, JsonTermWriter,
};
pub use self::log_merge_policy::LogMergePolicy;
pub use self::merge_operation::MergeOperation;

26
src/query/query_parser/query_parser.rs
View File

@@ -7,9 +7,7 @@ use tantivy_query_grammar::{UserInputAst, UserInputBound, UserInputLeaf, UserInp
use super::logical_ast::*;
use crate::core::Index;
use crate::indexer::{
generate_term_from_json_writer, generate_terms_from_json_writer, JsonTermWriter,
};
use crate::indexer::{generate_terms_from_json_writer, infer_fast_value_term, JsonTermWriter};
use crate::query::{
AllQuery, BooleanQuery, BoostQuery, EmptyQuery, Occur, PhraseQuery, Query, RangeQuery,
TermQuery,
@@ -18,7 +16,7 @@ use crate::schema::{
Facet, FacetParseError, Field, FieldType, IndexRecordOption, Schema, Term, Type,
};
use crate::time::format_description::well_known::Rfc3339;
use crate::time::{OffsetDateTime, UtcOffset};
use crate::time::OffsetDateTime;
use crate::tokenizer::{TextAnalyzer, TokenizerManager};
use crate::{DateTime, Score};
@@ -662,26 +660,6 @@ fn generate_literals_for_str(
Ok(Some(LogicalLiteral::Phrase(terms)))
}
fn infer_fast_value_term(json_term_writer: &mut JsonTermWriter, phrase: &str) -> Option<Term> {
if let Ok(dt) = OffsetDateTime::parse(phrase, &Rfc3339) {
let dt_utc = dt.to_offset(UtcOffset::UTC);
return Some(generate_term_from_json_writer(
json_term_writer,
DateTime::from_utc(dt_utc),
));
}
if let Ok(u64_val) = str::parse::<u64>(phrase) {
return Some(generate_term_from_json_writer(json_term_writer, u64_val));
}
if let Ok(i64_val) = str::parse::<i64>(phrase) {
return Some(generate_term_from_json_writer(json_term_writer, i64_val));
}
if let Ok(f64_val) = str::parse::<f64>(phrase) {
return Some(generate_term_from_json_writer(json_term_writer, f64_val));
}
None
}
fn generate_literals_for_json_object(
field_name: &str,
field: Field,