Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2612 from influxdata/ntran/df_lit_timestamp 

chore: update latest datafusion and use its lit_timestamp_nano
pull/24376/head
kodiakhq[bot] 2021-09-22 15:41:06 +00:00 committed by GitHub
parent 61ccdbba93 e80d8aa391
commit 7820f9d17b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -828,7 +828,7 @@ dependencies = [
[[package]] [[package]]
name = "datafusion" name = "datafusion"
version = "5.1.0" version = "5.1.0"
source = "git+https://github.com/apache/arrow-datafusion.git?rev=299ab7d1c37c707fcd500d3428abbdbe4dc5399b#299ab7d1c37c707fcd500d3428abbdbe4dc5399b" source = "git+https://github.com/apache/arrow-datafusion.git?rev=1c858ce7baab1929cfdba97051ef4e5e4d0a866b#1c858ce7baab1929cfdba97051ef4e5e4d0a866b"
dependencies = [ dependencies = [
"ahash", "ahash",
"arrow", "arrow",

2
datafusion/Cargo.toml
View File

@ -9,4 +9,4 @@ description = "Re-exports datafusion at a specific version"
# Rename to workaround doctest bug # Rename to workaround doctest bug
# Turn off optional datafusion features (e.g. various crypo functions) # Turn off optional datafusion features (e.g. various crypo functions)
upstream = { git = "https://github.com/apache/arrow-datafusion.git", rev="299ab7d1c37c707fcd500d3428abbdbe4dc5399b", default-features = false, package = "datafusion" } upstream = { git = "https://github.com/apache/arrow-datafusion.git", rev="1c858ce7baab1929cfdba97051ef4e5e4d0a866b", default-features = false, package = "datafusion" }

13
predicate/src/predicate.rs
View File

@ -11,9 +11,8 @@ use std::{
use data_types::timestamp::TimestampRange; use data_types::timestamp::TimestampRange;
use datafusion::{ use datafusion::{
error::DataFusionError, error::DataFusionError,
logical_plan::{col, lit, Column, Expr, Operator}, logical_plan::{col, lit, lit_timestamp_nano, Column, Expr, Operator},
optimizer::utils, optimizer::utils,
scalar::ScalarValue,
}; };
use datafusion_util::{make_range_expr, AndExprBuilder}; use datafusion_util::{make_range_expr, AndExprBuilder};
use internal_types::schema::TIME_COLUMN_NAME; use internal_types::schema::TIME_COLUMN_NAME;
@ -212,15 +211,11 @@ impl Predicate {
// Time range // Time range
if let Some(range) = pred.range { if let Some(range) = pred.range {
// cast int to timestamp
// NGA todo: add in DF a function timestamp_lit(i64_val) which does lit(ScalarValue::TimestampNanosecond(Some(i64_val))
// and use it here
let ts_start = ScalarValue::TimestampNanosecond(Some(range.start));
let ts_end = ScalarValue::TimestampNanosecond(Some(range.end));
// time_expr = NOT(start <= time_range < end) // time_expr = NOT(start <= time_range < end)
// Equivalent to: (time < start OR time >= end)
let time_expr = col(TIME_COLUMN_NAME) let time_expr = col(TIME_COLUMN_NAME)
.lt(lit(ts_start)) .lt(lit_timestamp_nano(range.start))
.or(col(TIME_COLUMN_NAME).gt_eq(lit(ts_end))); .or(col(TIME_COLUMN_NAME).gt_eq(lit_timestamp_nano(range.end)));
match expr { match expr {
None => expr = Some(time_expr), None => expr = Some(time_expr),