Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
101 changes: 100 additions & 1 deletion src/query/src/optimizer/type_conversion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,12 @@ mod tests {
use std::collections::HashMap;
use std::sync::Arc;

use datafusion_common::arrow::datatypes::Field;
use datafusion::execution::SessionStateBuilder;
use datafusion_common::arrow::datatypes::{Field, TimeUnit as ArrowTimeUnit};
use datafusion_common::{Column, DFSchema};
use datafusion_expr::simplify::SimplifyContext;
use datafusion_expr::{Literal, LogicalPlanBuilder};
use datafusion_optimizer::simplify_expressions::ExprSimplifier;
use datafusion_sql::TableReference;
use session::context::QueryContext;

Expand Down Expand Up @@ -384,6 +387,102 @@ mod tests {
);
}

/// TODO(discord9): update this once datafusion update and fixes lossy downcast problem
#[test]
fn test_datafusion_simplifier_unwraps_timestamp_precision_cast_comparisons() {
let schema = Arc::new(
DFSchema::from_unqualified_fields(
vec![Arc::new(Field::new(
"ts",
DataType::Timestamp(ArrowTimeUnit::Nanosecond, None),
false,
))]
.into(),
HashMap::new(),
)
.unwrap(),
);
let simplifier = ExprSimplifier::new(SimplifyContext::default().with_schema(schema));

let ts = Expr::Column(Column::from_name("ts"));
let cast_ts = Expr::Cast(datafusion_expr::Cast {
expr: Box::new(ts.clone()),
data_type: DataType::Timestamp(ArrowTimeUnit::Millisecond, None),
});
let ms_lit = ScalarValue::TimestampMillisecond(Some(1000), None).lit();
let ns_lit = ScalarValue::TimestampNanosecond(Some(1_000_000_000), None).lit();

let simplify = |expr| simplifier.simplify(expr).unwrap();

assert_eq!(
simplify(cast_ts.clone().eq(ms_lit.clone())),
ts.clone().eq(ns_lit.clone()),
);
assert_eq!(
simplify(cast_ts.clone().not_eq(ms_lit.clone())),
ts.clone().not_eq(ns_lit.clone()),
);
assert_eq!(
simplify(cast_ts.clone().lt(ms_lit.clone())),
ts.clone().lt(ns_lit.clone()),
);
assert_eq!(
simplify(cast_ts.clone().lt_eq(ms_lit.clone())),
ts.clone().lt_eq(ns_lit.clone()),
);
assert_eq!(
simplify(cast_ts.clone().gt(ms_lit.clone())),
ts.clone().gt(ns_lit.clone()),
);
assert_eq!(
simplify(cast_ts.clone().gt_eq(ms_lit.clone())),
ts.clone().gt_eq(ns_lit.clone()),
);
assert_eq!(simplify(ms_lit.lt(cast_ts)), ts.gt(ns_lit),);
}

#[test]
fn test_datafusion_optimizer_pushes_filter_through_timestamp_cast_projection() {
let cast_ts = Expr::Cast(datafusion_expr::Cast {
expr: Box::new(Expr::Column(Column::from_name("column1"))),
data_type: DataType::Timestamp(ArrowTimeUnit::Millisecond, None),
});
let plan = LogicalPlanBuilder::values(vec![vec![
ScalarValue::TimestampNanosecond(Some(1_000_000_123), None).lit(),
1_i64.lit(),
]])
.unwrap()
.project(vec![
cast_ts.alias("ts_ms"),
Expr::Column(Column::from_name("column2")).alias("val"),
])
.unwrap()
.filter(
Expr::Column(Column::from_name("ts_ms")).eq(ScalarValue::TimestampMillisecond(
Some(1000),
None,
)
.lit()),
)
.unwrap()
.build()
.unwrap();

let session_state = SessionStateBuilder::new().with_default_features().build();
let optimized_plan = session_state.optimize(&plan).unwrap();
let optimized = optimized_plan.display_indent().to_string();

assert!(optimized.contains("Projection:"), "{optimized}");
assert!(
optimized.contains("Filter: column1 = TimestampNanosecond(1000000000, None)"),
"{optimized}"
);
assert!(
optimized.find("Projection:") < optimized.find("Filter:"),
"{optimized}"
);
}

#[test]
fn test_convert_timestamp_str() {
use datatypes::arrow::datatypes::TimeUnit as ArrowTimeUnit;
Expand Down
74 changes: 74 additions & 0 deletions src/query/src/tests/time_range_filter_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
use common_time::Timestamp;
use common_time::range::TimestampRange;
use common_time::timestamp::TimeUnit;
use datafusion_common::ScalarValue;
use datafusion_expr::expr::Expr;
use datafusion_expr::{col, lit};
use datatypes::arrow::datatypes::{DataType, TimeUnit as ArrowTimeUnit};
use datatypes::data_type::ConcreteDataType;
use datatypes::schema::{ColumnSchema, Schema};
use datatypes::vectors::{Int64Vector, TimestampMillisecondVector};
Expand Down Expand Up @@ -135,6 +138,77 @@ impl TimeRangeTester {
}
}

fn cast_to_ms_col(name: &str) -> Expr {
Expr::Cast(datafusion_expr::Cast {
expr: Box::new(col(name)),
data_type: DataType::Timestamp(ArrowTimeUnit::Millisecond, None),
})
}

fn ms_lit(value: i64) -> Expr {
lit(ScalarValue::TimestampMillisecond(Some(value), None))
}

#[test]
fn test_casted_time_index_precision_boundaries() {
let cast_ts = cast_to_ms_col("ts");

let us_bucket = TimestampRange::with_unit(1_000_000, 1_001_000, TimeUnit::Microsecond).unwrap();
assert_eq!(
us_bucket,
build_time_range_predicate(
"ts",
TimeUnit::Microsecond,
&[cast_ts.clone().eq(ms_lit(1000))],
)
);
assert!(us_bucket.contains(&Timestamp::new(1_000_999, TimeUnit::Microsecond)));
assert!(!us_bucket.contains(&Timestamp::new(1_001_000, TimeUnit::Microsecond)));

assert_eq!(
TimestampRange::until_end(Timestamp::new(1_001_000, TimeUnit::Microsecond), false),
build_time_range_predicate(
"ts",
TimeUnit::Microsecond,
&[cast_ts.clone().lt_eq(ms_lit(1000))],
)
);

let ns_bucket =
TimestampRange::with_unit(1_000_000_000, 1_001_000_000, TimeUnit::Nanosecond).unwrap();
assert_eq!(
ns_bucket,
build_time_range_predicate(
"ts",
TimeUnit::Nanosecond,
&[cast_ts.clone().eq(ms_lit(1000))],
)
);
assert!(ns_bucket.contains(&Timestamp::new(1_000_999_999, TimeUnit::Nanosecond)));
assert!(!ns_bucket.contains(&Timestamp::new(1_001_000_000, TimeUnit::Nanosecond)));

assert_eq!(
TimestampRange::from_start(Timestamp::new(1_000_000_000, TimeUnit::Nanosecond)),
build_time_range_predicate(
"ts",
TimeUnit::Nanosecond,
&[cast_ts.clone().gt_eq(ms_lit(1000))],
)
);
assert_eq!(
TimestampRange::from_start(Timestamp::new(1_001_000_000, TimeUnit::Nanosecond)),
build_time_range_predicate(
"ts",
TimeUnit::Nanosecond,
&[cast_ts.clone().gt(ms_lit(1000))],
)
);
assert_eq!(
TimestampRange::until_end(Timestamp::new(1_000_000_000, TimeUnit::Nanosecond), false),
build_time_range_predicate("ts", TimeUnit::Nanosecond, &[cast_ts.lt(ms_lit(1000))],)
);
}

#[tokio::test]
async fn test_range_filter() {
let tester = create_test_engine();
Expand Down
Loading
Loading