From d7c5d2892c93dcd659282fe7fbd93deba447e620 Mon Sep 17 00:00:00 2001 From: Eugene Tolbakov Date: Wed, 17 Jul 2024 16:54:24 +0100 Subject: [PATCH] chore(es): clippy --- .../quickwit-query/src/elastic_query_dsl/range_query.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/quickwit/quickwit-query/src/elastic_query_dsl/range_query.rs b/quickwit/quickwit-query/src/elastic_query_dsl/range_query.rs index 0302cf0892b..f056cee971d 100644 --- a/quickwit/quickwit-query/src/elastic_query_dsl/range_query.rs +++ b/quickwit/quickwit-query/src/elastic_query_dsl/range_query.rs @@ -34,8 +34,8 @@ use crate::not_nan_f32::NotNaNf32; use crate::query_ast::QueryAst; use crate::JsonLiteral; -/// Elasticsearch/OpenSearch uses a set of preconfigured formats, more information could be found here -/// https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html +// Elasticsearch/OpenSearch uses a set of preconfigured formats, more information could be found +// here https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html lazy_static! { static ref ELASTICSEARCH_FORMAT_TO_STRFTIME: HashMap<&'static str, &'static str> = { @@ -44,6 +44,7 @@ lazy_static! { m.insert(r"^date_optional_time$", "%Y-%m-%dT%H:%M:%S.%3f%:z"); m.insert(r"^strict_date_optional_time$", "%Y-%m-%dT%H:%M:%S.%3f%:z"); m.insert(r"^yyyy-MM-dd$", "%Y-%m-%d"); + m.insert(r"^basic_date$", "%Y%m%d"); m.insert(r"^yyyyMMdd$", "%Y%m%d"); m }; @@ -83,7 +84,7 @@ impl ConvertableToQueryAst for RangeQuery { format, } = self.value; let (gt, gte, lt, lte) = if let Some(JsonLiteral::String(fmt)) = format { - let parser = create_strptime_parser(&fmt)?; + let parser = create_strptime_parser(fmt)?; ( gt.map(|v| parse_and_convert(v, &parser)).transpose()?, gte.map(|v| parse_and_convert(v, &parser)).transpose()?, @@ -129,7 +130,7 @@ fn parse_and_convert(literal: JsonLiteral, parser: &StrptimeParser) -> anyhow::R } } -fn create_strptime_parser(fmt: &String) -> Result { +fn create_strptime_parser(fmt: String) -> Result { let strptime_format = convert_format_to_strpformat(&fmt)?; StrptimeParser::from_str(&strptime_format).map_err(|reason| { anyhow::anyhow!("failed to create parser from : {}; reason: {}", fmt, reason)