Merge branch 'main' into crepererum/issue1963

pull/24376/head
kodiakhq[bot] 2021-09-14 11:38:59 +00:00 committed by GitHub
commit 9ea61cd434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 17 deletions

1
Cargo.lock generated
View File

@ -3323,7 +3323,6 @@ dependencies = [
"datafusion_util", "datafusion_util",
"futures", "futures",
"hashbrown", "hashbrown",
"influxdb_line_protocol",
"internal_types", "internal_types",
"itertools 0.10.1", "itertools 0.10.1",
"libc", "libc",

View File

@ -24,7 +24,6 @@ datafusion = { path = "../datafusion" }
datafusion_util = { path = "../datafusion_util" } datafusion_util = { path = "../datafusion_util" }
futures = "0.3" futures = "0.3"
hashbrown = "0.11" hashbrown = "0.11"
influxdb_line_protocol = { path = "../influxdb_line_protocol" }
internal_types = { path = "../internal_types" } internal_types = { path = "../internal_types" }
observability_deps = { path = "../observability_deps" } observability_deps = { path = "../observability_deps" }
parking_lot = "0.11.2" parking_lot = "0.11.2"

View File

@ -15,7 +15,6 @@ use datafusion::{
optimizer::utils, optimizer::utils,
}; };
use datafusion_util::{make_range_expr, AndExprBuilder}; use datafusion_util::{make_range_expr, AndExprBuilder};
use influxdb_line_protocol::timestamp;
use internal_types::schema::TIME_COLUMN_NAME; use internal_types::schema::TIME_COLUMN_NAME;
use observability_deps::tracing::debug; use observability_deps::tracing::debug;
use sqlparser::{ use sqlparser::{
@ -609,9 +608,9 @@ impl ParseDeletePredicate {
Ok(datetime) => Ok(datetime.timestamp_nanos()), Ok(datetime) => Ok(datetime.timestamp_nanos()),
Err(timestamp_err) => { Err(timestamp_err) => {
// See if it is in nanosecond form // See if it is in nanosecond form
let time_result = timestamp(input); let time_result = input.parse::<i64>();
match time_result { match time_result {
Ok((_, nano)) => Ok(nano), Ok(nano) => Ok(nano),
Err(nano_err) => { Err(nano_err) => {
// wrong format, return both error // wrong format, return both error
let error_str = format!("{}, {}", timestamp_err, nano_err); let error_str = format!("{}, {}", timestamp_err, nano_err);
@ -867,24 +866,15 @@ mod tests {
#[test] #[test]
fn test_parse_timestamp_invalid() { fn test_parse_timestamp_invalid() {
// It turn out this is not invalid but return1 123
let input = r#"123gdb"#; let input = r#"123gdb"#;
let time = ParseDeletePredicate::parse_time(input).unwrap(); ParseDeletePredicate::parse_time(input).unwrap_err();
assert_eq!(time, 123);
//assert!(time.is_err());
// must parse time
// It turn out this is not invalid but return1 1970
let input = r#"1970-01-01T00:00:00"#; let input = r#"1970-01-01T00:00:00"#;
let time = ParseDeletePredicate::parse_time(input).unwrap(); ParseDeletePredicate::parse_time(input).unwrap_err();
assert_eq!(time, 1970);
//assert!(time.is_err());
// It turn out this is not invalid but return1 1971 // It turn out this is not invalid but return1 1971
let input = r#"1971-02-01:30:21Z"#; let input = r#"1971-02-01:30:21Z"#;
let time = ParseDeletePredicate::parse_time(input).unwrap(); ParseDeletePredicate::parse_time(input).unwrap_err();
assert_eq!(time, 1971);
//assert!(time.is_err());
} }
#[test] #[test]