Skip to content

feat: Add support for epoch_millis and epoch_second time formats #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Darkheir merged 1 commit into from
Jun 25, 2026
Merged

feat: Add support for epoch_millis and epoch_second time formats #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
260 changes: 260 additions & 0 deletions quickwit/quickwit-datetime/src/java_date_time_format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,66 @@ fn resolve_java_datetime_format_alias_for_parsing(java_datetime_format: &str) ->

m.insert("strict_week_date", "xxxx-'W'ww-e");
m.insert("week_date", "xxxx-'W'w[w]-e");

m.insert("date", "yyyy-MM-dd");
m.insert("strict_date", "yyyy-MM-dd");
m.insert("year_month_day", "yyyy-MM-dd");
m.insert("strict_year_month_day", "yyyy-MM-dd");
m.insert("year_month", "yyyy-MM");
m.insert("strict_year_month", "yyyy-MM");
m.insert("year", "yyyy");
m.insert("strict_year", "yyyy");
m.insert("date_hour", "yyyy-MM-dd'T'HH");
m.insert("strict_date_hour", "yyyy-MM-dd'T'HH");
m.insert("date_hour_minute", "yyyy-MM-dd'T'HH:mm");
m.insert("strict_date_hour_minute", "yyyy-MM-dd'T'HH:mm");
m.insert("date_hour_minute_second", "yyyy-MM-dd'T'HH:mm:ss");
m.insert("strict_date_hour_minute_second", "yyyy-MM-dd'T'HH:mm:ss");
m.insert(
"date_hour_minute_second_fraction",
"yyyy-MM-dd'T'HH:mm:ss.SSS",
);
m.insert(
"strict_date_hour_minute_second_fraction",
"yyyy-MM-dd'T'HH:mm:ss.SSS",
);
m.insert(
"date_hour_minute_second_millis",
"yyyy-MM-dd'T'HH:mm:ss.SSS",
);
m.insert(
"strict_date_hour_minute_second_millis",
"yyyy-MM-dd'T'HH:mm:ss.SSS",
);
m.insert("date_time", "yyyy-MM-dd'T'HH:mm:ss.SSSZ");
m.insert("strict_date_time", "yyyy-MM-dd'T'HH:mm:ss.SSSZ");
m.insert("date_time_no_millis", "yyyy-MM-dd'T'HH:mm:ssZ");
m.insert("strict_date_time_no_millis", "yyyy-MM-dd'T'HH:mm:ssZ");
m.insert("hour", "HH");
m.insert("strict_hour", "HH");
m.insert("hour_minute", "HH:mm");
m.insert("strict_hour_minute", "HH:mm");
m.insert("hour_minute_second", "HH:mm:ss");
m.insert("strict_hour_minute_second", "HH:mm:ss");
m.insert("hour_minute_second_fraction", "HH:mm:ss.SSS");
m.insert("strict_hour_minute_second_fraction", "HH:mm:ss.SSS");
m.insert("hour_minute_second_millis", "HH:mm:ss.SSS");
m.insert("strict_hour_minute_second_millis", "HH:mm:ss.SSS");
m.insert("time", "HH:mm:ss.SSSZ");
m.insert("strict_time", "HH:mm:ss.SSSZ");
m.insert("time_no_millis", "HH:mm:ssZ");
m.insert("strict_time_no_millis", "HH:mm:ssZ");
m.insert("t_time", "'T'HH:mm:ss.SSSZ");
m.insert("strict_t_time", "'T'HH:mm:ss.SSSZ");
m.insert("t_time_no_millis", "'T'HH:mm:ssZ");
m.insert("strict_t_time_no_millis", "'T'HH:mm:ssZ");
// Basic (separator-less) formats. Elasticsearch has no `strict_*` variant for these.
m.insert("basic_date_time", "yyyyMMdd'T'HHmmss.SSSZ");
m.insert("basic_date_time_no_millis", "yyyyMMdd'T'HHmmssZ");
m.insert("basic_time", "HHmmss.SSSZ");
m.insert("basic_time_no_millis", "HHmmssZ");
m.insert("basic_t_time", "'T'HHmmss.SSSZ");
m.insert("basic_t_time_no_millis", "'T'HHmmssZ");
m
});
java_datetime_format_map
Expand Down Expand Up @@ -399,6 +459,65 @@ fn resolve_java_datetime_format_alias_for_formatting(java_datetime_format: &str)
m.insert("basic_week_date_time_no_millis", "xxxx'W'wwe'T'HHmmssXXXXX");
m.insert("strict_week_date", "xxxx-'W'ww-e");
m.insert("week_date", "xxxx-'W'ww-e");

m.insert("date", "yyyy-MM-dd");
m.insert("strict_date", "yyyy-MM-dd");
m.insert("year_month_day", "yyyy-MM-dd");
m.insert("strict_year_month_day", "yyyy-MM-dd");
m.insert("year_month", "yyyy-MM");
m.insert("strict_year_month", "yyyy-MM");
m.insert("year", "yyyy");
m.insert("strict_year", "yyyy");
m.insert("date_hour", "yyyy-MM-dd'T'HH");
m.insert("strict_date_hour", "yyyy-MM-dd'T'HH");
m.insert("date_hour_minute", "yyyy-MM-dd'T'HH:mm");
m.insert("strict_date_hour_minute", "yyyy-MM-dd'T'HH:mm");
m.insert("date_hour_minute_second", "yyyy-MM-dd'T'HH:mm:ss");
m.insert("strict_date_hour_minute_second", "yyyy-MM-dd'T'HH:mm:ss");
m.insert(
"date_hour_minute_second_fraction",
"yyyy-MM-dd'T'HH:mm:ss.SSS",
);
m.insert(
"strict_date_hour_minute_second_fraction",
"yyyy-MM-dd'T'HH:mm:ss.SSS",
);
m.insert(
"date_hour_minute_second_millis",
"yyyy-MM-dd'T'HH:mm:ss.SSS",
);
m.insert(
"strict_date_hour_minute_second_millis",
"yyyy-MM-dd'T'HH:mm:ss.SSS",
);
m.insert("date_time", "yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX");
m.insert("strict_date_time", "yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX");
m.insert("date_time_no_millis", "yyyy-MM-dd'T'HH:mm:ssXXXXX");
m.insert("strict_date_time_no_millis", "yyyy-MM-dd'T'HH:mm:ssXXXXX");
m.insert("hour", "HH");
m.insert("strict_hour", "HH");
m.insert("hour_minute", "HH:mm");
m.insert("strict_hour_minute", "HH:mm");
m.insert("hour_minute_second", "HH:mm:ss");
m.insert("strict_hour_minute_second", "HH:mm:ss");
m.insert("hour_minute_second_fraction", "HH:mm:ss.SSS");
m.insert("strict_hour_minute_second_fraction", "HH:mm:ss.SSS");
m.insert("hour_minute_second_millis", "HH:mm:ss.SSS");
m.insert("strict_hour_minute_second_millis", "HH:mm:ss.SSS");
m.insert("time", "HH:mm:ss.SSSXXXXX");
m.insert("strict_time", "HH:mm:ss.SSSXXXXX");
m.insert("time_no_millis", "HH:mm:ssXXXXX");
m.insert("strict_time_no_millis", "HH:mm:ssXXXXX");
m.insert("t_time", "'T'HH:mm:ss.SSSXXXXX");
m.insert("strict_t_time", "'T'HH:mm:ss.SSSXXXXX");
m.insert("t_time_no_millis", "'T'HH:mm:ssXXXXX");
m.insert("strict_t_time_no_millis", "'T'HH:mm:ssXXXXX");
m.insert("basic_date_time", "yyyyMMdd'T'HHmmss.SSSXXXXX");
m.insert("basic_date_time_no_millis", "yyyyMMdd'T'HHmmssXXXXX");
m.insert("basic_time", "HHmmss.SSSXXXXX");
m.insert("basic_time_no_millis", "HHmmssXXXXX");
m.insert("basic_t_time", "'T'HHmmss.SSSXXXXX");
m.insert("basic_t_time_no_millis", "'T'HHmmssXXXXX");
m
});
java_datetime_format_map
Expand Down Expand Up @@ -722,6 +841,147 @@ mod tests {
);
}

#[test]
fn test_parse_java_date_formats() {
test_parse_java_datetime_aux("year", "2021", datetime!(2021-01-01 00:00:00 UTC));
test_parse_java_datetime_aux("strict_year", "2021", datetime!(2021-01-01 00:00:00 UTC));
test_parse_java_datetime_aux("year_month", "2021-03", datetime!(2021-03-01 00:00:00 UTC));
test_parse_java_datetime_aux("date", "2021-03-05", datetime!(2021-03-05 00:00:00 UTC));
test_parse_java_datetime_aux(
"strict_date",
"2021-03-05",
datetime!(2021-03-05 00:00:00 UTC),
);
test_parse_java_datetime_aux(
"year_month_day",
"2021-03-05",
datetime!(2021-03-05 00:00:00 UTC),
);
test_parse_java_datetime_aux(
"date_hour",
"2021-03-05T13",
datetime!(2021-03-05 13:00:00 UTC),
);
test_parse_java_datetime_aux(
"date_hour_minute",
"2021-03-05T13:32",
datetime!(2021-03-05 13:32:00 UTC),
);
test_parse_java_datetime_aux(
"date_hour_minute_second",
"2021-03-05T13:32:43",
datetime!(2021-03-05 13:32:43 UTC),
);
test_parse_java_datetime_aux(
"date_hour_minute_second_fraction",
"2021-03-05T13:32:43.123",
datetime!(2021-03-05 13:32:43.123 UTC),
);
test_parse_java_datetime_aux(
"date_hour_minute_second_millis",
"2021-03-05T13:32:43.123",
datetime!(2021-03-05 13:32:43.123 UTC),
);
test_parse_java_datetime_aux(
"date_time",
"2021-03-05T13:32:43.123Z",
datetime!(2021-03-05 13:32:43.123 UTC),
);
test_parse_java_datetime_aux(
"strict_date_time",
"2021-03-05T13:32:43.123+01:00",
datetime!(2021-03-05 13:32:43.123 +1),
);
test_parse_java_datetime_aux(
"date_time_no_millis",
"2021-03-05T13:32:43Z",
datetime!(2021-03-05 13:32:43 UTC),
);
test_parse_java_datetime_aux(
"basic_date_time",
"20210305T133243.123Z",
datetime!(2021-03-05 13:32:43.123 UTC),
);
test_parse_java_datetime_aux(
"basic_date_time_no_millis",
"20210305T133243Z",
datetime!(2021-03-05 13:32:43 UTC),
);
}

// Time-only formats leave the date unspecified, so it is filled with an inferred (current)
// year. We therefore only assert on the parsed time-of-day, which is deterministic.
#[track_caller]
fn assert_parses_time(
java_date_time_format: &str,
date_str: &str,
expected: (u8, u8, u8, u16),
) {
let parser = StrptimeParser::from_java_datetime_format(java_date_time_format).unwrap();
let datetime = parser.parse_date_time(date_str).unwrap();
assert_eq!(
(
datetime.hour(),
datetime.minute(),
datetime.second(),
datetime.millisecond(),
),
expected,
"unexpected time for format `{java_date_time_format}` input `{date_str}`"
);
}

#[test]
fn test_parse_java_time_formats() {
assert_parses_time("hour", "13", (13, 0, 0, 0));
assert_parses_time("strict_hour", "13", (13, 0, 0, 0));
assert_parses_time("hour_minute", "13:32", (13, 32, 0, 0));
assert_parses_time("hour_minute_second", "13:32:43", (13, 32, 43, 0));
assert_parses_time(
"hour_minute_second_fraction",
"13:32:43.123",
(13, 32, 43, 123),
);
assert_parses_time(
"hour_minute_second_millis",
"13:32:43.123",
(13, 32, 43, 123),
);
assert_parses_time("time", "13:32:43.123Z", (13, 32, 43, 123));
assert_parses_time("time_no_millis", "13:32:43Z", (13, 32, 43, 0));
assert_parses_time("t_time", "T13:32:43.123Z", (13, 32, 43, 123));
assert_parses_time("t_time_no_millis", "T13:32:43Z", (13, 32, 43, 0));
assert_parses_time("basic_time", "133243.123Z", (13, 32, 43, 123));
assert_parses_time("basic_time_no_millis", "133243Z", (13, 32, 43, 0));
assert_parses_time("basic_t_time", "T133243.123Z", (13, 32, 43, 123));
assert_parses_time("basic_t_time_no_millis", "T133243Z", (13, 32, 43, 0));
}

#[track_caller]
fn assert_formats(java_date_time_format: &str, date_time: OffsetDateTime, expected: &str) {
let parser = StrptimeParser::from_java_datetime_format(java_date_time_format).unwrap();
let formatted = parser.format_date_time(&date_time).unwrap();
assert_eq!(formatted, expected, "format `{java_date_time_format}`");
}

#[test]
fn test_format_java_formats() {
let utc = datetime!(2021-03-05 13:32:43.123 UTC);
assert_formats("date", utc, "2021-03-05");
assert_formats("year_month", utc, "2021-03");
assert_formats("year", utc, "2021");
assert_formats("date_hour_minute_second", utc, "2021-03-05T13:32:43");
assert_formats("date_time", utc, "2021-03-05T13:32:43.123Z");
assert_formats("date_time_no_millis", utc, "2021-03-05T13:32:43Z");
assert_formats("basic_date_time", utc, "20210305T133243.123Z");
assert_formats("basic_date_time_no_millis", utc, "20210305T133243Z");
assert_formats("time_no_millis", utc, "13:32:43Z");

// Non-UTC offset is rendered with the `XXXXX` (`+HH:MM`) convention.
let plus_one = datetime!(2021-03-05 13:32:43.123 +1);
assert_formats("date_time", plus_one, "2021-03-05T13:32:43.123+01:00");
}

#[test]
fn test_parse_java_week_formats() {
test_parse_java_datetime_aux(
Expand Down
84 changes: 73 additions & 11 deletions quickwit/quickwit-query/src/elastic_query_dsl/range_query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,24 @@ impl ConvertibleToQueryAst for RangeQuery {
boost,
format,
} = self.value;
let (gt, gte, lt, lte) = if let Some(JsonLiteral::String(java_date_format)) = format {
let parser = StrptimeParser::from_java_datetime_format(&java_date_format)
.map_err(|err| anyhow::anyhow!("failed to parse range query date format. {err}"))?;
(
gt.map(|v| parse_and_convert(v, &parser)).transpose()?,
gte.map(|v| parse_and_convert(v, &parser)).transpose()?,
lt.map(|v| parse_and_convert(v, &parser)).transpose()?,
lte.map(|v| parse_and_convert(v, &parser)).transpose()?,
)
} else {
(gt, gte, lt, lte)
let (gt, gte, lt, lte) = match format {
Some(JsonLiteral::String(format))
if format == "epoch_millis" || format == "epoch_second" =>
{
(gt, gte, lt, lte)
}
Some(JsonLiteral::String(java_date_format)) => {
let parser = StrptimeParser::from_java_datetime_format(&java_date_format).map_err(
|err| anyhow::anyhow!("failed to parse range query date format. {err}"),
)?;
(
gt.map(|v| parse_and_convert(v, &parser)).transpose()?,
gte.map(|v| parse_and_convert(v, &parser)).transpose()?,
lt.map(|v| parse_and_convert(v, &parser)).transpose()?,
lte.map(|v| parse_and_convert(v, &parser)).transpose()?,
)
}
_ => (gt, gte, lt, lte),
};

let range_query_ast = crate::query_ast::RangeQuery {
Expand Down Expand Up @@ -163,4 +170,59 @@ mod tests {
if field == "timestamp" && upper_bound == JsonLiteral::String("2024-09-28T10:22:55.797Z".to_string())
));
}

#[test]
fn test_date_range_query_with_epoch_millis_format() {
let range_query_params = ElasticRangeQueryParams {
gt: None,
gte: Some(JsonLiteral::Number(1779137992972i64.into())),
lt: Some(JsonLiteral::Number(1780495357572i64.into())),
lte: None,
boost: None,
format: JsonLiteral::String("epoch_millis".to_string()).into(),
};
let range_query: ElasticRangeQuery = ElasticRangeQuery {
field: "@timestamp".to_string(),
value: range_query_params,
};
let range_query_ast = range_query.convert_to_query_ast().unwrap();
assert!(matches!(
range_query_ast,
QueryAst::Range(RangeQuery {
field,
lower_bound: Bound::Included(lower_bound),
upper_bound: Bound::Excluded(upper_bound),
})
if field == "@timestamp"
&& lower_bound == JsonLiteral::Number(1779137992972i64.into())
&& upper_bound == JsonLiteral::Number(1780495357572i64.into())
));
}

#[test]
fn test_date_range_query_with_epoch_second_format() {
let range_query_params = ElasticRangeQueryParams {
gt: None,
gte: Some(JsonLiteral::Number(1779137992i64.into())),
lt: None,
lte: None,
boost: None,
format: JsonLiteral::String("epoch_second".to_string()).into(),
};
let range_query: ElasticRangeQuery = ElasticRangeQuery {
field: "@timestamp".to_string(),
value: range_query_params,
};
let range_query_ast = range_query.convert_to_query_ast().unwrap();
assert!(matches!(
range_query_ast,
QueryAst::Range(RangeQuery {
field,
lower_bound: Bound::Included(lower_bound),
upper_bound: Bound::Unbounded,
})
if field == "@timestamp"
&& lower_bound == JsonLiteral::Number(1779137992i64.into())
));
}
}
Loading