diff --git a/src/indexer/json_term_writer.rs b/src/indexer/json_term_writer.rs index cf8532ed3..6e54cb6c8 100644 --- a/src/indexer/json_term_writer.rs +++ b/src/indexer/json_term_writer.rs @@ -200,30 +200,30 @@ fn infer_type_from_str(text: &str) -> TextOrDateTime { } // Tries to infer a JSON type from a string -pub(crate) fn infer_fast_value_term( +pub(crate) fn convert_to_fast_value_and_get_term( json_term_writer: &mut JsonTermWriter, phrase: &str, ) -> Option { if let Ok(dt) = OffsetDateTime::parse(phrase, &Rfc3339) { let dt_utc = dt.to_offset(UtcOffset::UTC); - return Some(generate_term_from_json_writer( + return Some(set_fastvalue_and_get_term( json_term_writer, DateTime::from_utc(dt_utc), )); } if let Ok(u64_val) = str::parse::(phrase) { - return Some(generate_term_from_json_writer(json_term_writer, u64_val)); + return Some(set_fastvalue_and_get_term(json_term_writer, u64_val)); } if let Ok(i64_val) = str::parse::(phrase) { - return Some(generate_term_from_json_writer(json_term_writer, i64_val)); + return Some(set_fastvalue_and_get_term(json_term_writer, i64_val)); } if let Ok(f64_val) = str::parse::(phrase) { - return Some(generate_term_from_json_writer(json_term_writer, f64_val)); + return Some(set_fastvalue_and_get_term(json_term_writer, f64_val)); } None } // helper function to generate a Term from a json fastvalue -pub(crate) fn generate_term_from_json_writer( +pub(crate) fn set_fastvalue_and_get_term( json_term_writer: &mut JsonTermWriter, value: T, ) -> Term { @@ -232,7 +232,7 @@ pub(crate) fn generate_term_from_json_writer( } // helper function to generate a list of terms with their positions from a textual json value -pub(crate) fn generate_terms_from_json_writer( +pub(crate) fn set_string_and_get_terms( json_term_writer: &mut JsonTermWriter, value: &str, text_analyzer: &TextAnalyzer, diff --git a/src/indexer/mod.rs b/src/indexer/mod.rs index f0eb48457..37bdb1ba1 100644 --- a/src/indexer/mod.rs +++ b/src/indexer/mod.rs @@ -26,7 +26,7 @@ use smallvec::SmallVec; pub use self::index_writer::IndexWriter; pub(crate) use self::json_term_writer::{ - generate_terms_from_json_writer, infer_fast_value_term, JsonTermWriter, + convert_to_fast_value_and_get_term, set_string_and_get_terms, JsonTermWriter, }; pub use self::log_merge_policy::LogMergePolicy; pub use self::merge_operation::MergeOperation; diff --git a/src/query/query_parser/query_parser.rs b/src/query/query_parser/query_parser.rs index d7a839423..2ce07983f 100644 --- a/src/query/query_parser/query_parser.rs +++ b/src/query/query_parser/query_parser.rs @@ -7,7 +7,9 @@ use tantivy_query_grammar::{UserInputAst, UserInputBound, UserInputLeaf, UserInp use super::logical_ast::*; use crate::core::Index; -use crate::indexer::{generate_terms_from_json_writer, infer_fast_value_term, JsonTermWriter}; +use crate::indexer::{ + convert_to_fast_value_and_get_term, set_string_and_get_terms, JsonTermWriter, +}; use crate::query::{ AllQuery, BooleanQuery, BoostQuery, EmptyQuery, Occur, PhraseQuery, Query, RangeQuery, TermQuery, @@ -671,10 +673,10 @@ fn generate_literals_for_json_object( let mut logical_literals = Vec::new(); let mut term = Term::new(); let mut json_term_writer = JsonTermWriter::initialize(field, json_path, &mut term); - if let Some(term) = infer_fast_value_term(&mut json_term_writer, phrase) { + if let Some(term) = convert_to_fast_value_and_get_term(&mut json_term_writer, phrase) { logical_literals.push(LogicalLiteral::Term(term)); } - let terms = generate_terms_from_json_writer(&mut json_term_writer, phrase, text_analyzer); + let terms = set_string_and_get_terms(&mut json_term_writer, phrase, text_analyzer); drop(json_term_writer); if terms.len() <= 1 { for (_, term) in terms {