Skip to content

Fix parse '1'::interval as month by default #11454

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

Closed
nix010 wants to merge 4 commits into from
Closed

Fix parse '1'::interval as month by default #11454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be8ab57
Fix parse interval as month by default
Jul 13, 2024
bffa7c2
refactor
Jul 13, 2024
446f18c
refactor
Jul 15, 2024
ff33ada
handle case of array column value
Jul 17, 2024
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
56 changes: 53 additions & 3 deletions datafusion/expr/src/columnar_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
use arrow::array::ArrayRef;
use arrow::array::NullArray;
use arrow::compute::{kernels, CastOptions};
use arrow::datatypes::{DataType, TimeUnit};
use arrow::datatypes::{DataType, IntervalUnit, TimeUnit};
use arrow::error::ArrowError;
use arrow_array::Array;
use datafusion_common::format::DEFAULT_CAST_OPTIONS;
use datafusion_common::{internal_err, Result, ScalarValue};
use std::sync::Arc;
Expand Down Expand Up @@ -183,6 +185,43 @@ impl ColumnarValue {
Ok(args)
}

fn _format_interval_string_value(&self, str_val: &String) -> Option<String> {
let start_idx = if str_val.starts_with('-') { 1 } else { 0 };

// only incase of simple input that all char is a number.
if str_val[start_idx..].chars().all(|c| c.is_ascii_digit()) {
return Some(format!("{} second", str_val));
}
None
}

fn _kernels_cast_with_option(
Copy link
Contributor

@samuelcolvin samuelcolvin Aug 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe useful to add a docstring here explaining why this method is necessary / what it does.

&self,
array_val: &ArrayRef,
cast_type: &DataType,
cast_options: &CastOptions,
) -> Result<ArrayRef, ArrowError> {
let array_data = array_val.to_data();

let array: &ArrayRef = match (array_data.data_type(), cast_type) {
(DataType::Utf8, &DataType::Interval(IntervalUnit::MonthDayNano)) => {
let string_array = arrow_array::StringArray::from(array_data);
let string_value: String = string_array.value(0).to_string();

match self._format_interval_string_value(&string_value) {
Some(value) => {
&(Arc::new(arrow_array::StringArray::from(vec![value]))
as ArrayRef)
}
_ => array_val,
}
}
(_, _) => array_val,
};

kernels::cast::cast_with_options(array, cast_type, cast_options)
}

/// Cast's this [ColumnarValue] to the specified `DataType`
pub fn cast_to(
&self,
Expand All @@ -192,7 +231,7 @@ impl ColumnarValue {
let cast_options = cast_options.cloned().unwrap_or(DEFAULT_CAST_OPTIONS);
match self {
ColumnarValue::Array(array) => Ok(ColumnarValue::Array(
kernels::cast::cast_with_options(array, cast_type, &cast_options)?,
self._kernels_cast_with_option(array, cast_type, &cast_options)?,
)),
ColumnarValue::Scalar(scalar) => {
let scalar_array =
Expand All @@ -206,7 +245,18 @@ impl ColumnarValue {
scalar.to_array()?
}
} else {
scalar.to_array()?
// Arrow by default will parse str as Month for unit MonthDayNano.
// So we need to be explict that we want it to parse as second.
Comment on lines +248 to +249
Copy link
Contributor

@samuelcolvin samuelcolvin Aug 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we also fix this in arrow? @alamb

match (scalar, cast_type) {
(
ScalarValue::Utf8(Some(s_val)),
&DataType::Interval(IntervalUnit::MonthDayNano),
) => self._format_interval_string_value(s_val).map_or_else(
|| scalar.to_array(),
|value| ScalarValue::Utf8(Some(value)).to_array(),
),
(_, _) => scalar.to_array(),
}?
};
let cast_array = kernels::cast::cast_with_options(
&scalar_array,
Expand Down
144 changes: 42 additions & 102 deletions datafusion/sqllogictest/test_files/interval.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ select
----
Interval(MonthDayNano) Interval(MonthDayNano)

# cast with explicit cast sytax
# cast with explicit cast syntax
query TT
select
arrow_typeof(cast ('5 months' as interval)),
Expand Down Expand Up @@ -377,13 +377,13 @@ drop table t;

##### Tests for interval arithmetic

statement ok
statement error DataFusion error: SQL error: ParserError\("Expected \(, found: ;"\)
create table t(i interval, d date, ts timestamp)
as
values
('1 month', '1980-01-01', '2000-01-01T00:00:00'),
('1 day', '1990-10-01', '2000-01-01T12:11:10'),
('1 minute', '1980-01-02', '2000-02-01T00:00:00')
('1 minute', '1980-01-02', '2000-02-01T00:00:00'),
;

### date / timestamp (scalar) + interval (scalar)
Expand Down Expand Up @@ -413,95 +413,47 @@ select '1980-01-01'::timestamp - interval '1 day'


### date / timestamp (array) + interval (scalar)
query D
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
Copy link
Contributor

@samuelcolvin samuelcolvin Aug 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these should definitely work, not raise an error!

select d + interval '1 day' from t;
----
1980-01-02
1990-10-02
1980-01-03

query P
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select ts + interval '1 day' from t;
----
2000-01-02T00:00:00
2000-01-02T12:11:10
2000-02-02T00:00:00

### date / timestamp (array) - interval (scalar)
query D
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select d - interval '1 day' from t;
----
1979-12-31
1990-09-30
1980-01-01

query P
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select ts - interval '1 day' from t;
----
1999-12-31T00:00:00
1999-12-31T12:11:10
2000-01-31T00:00:00

### date / timestamp (scalar) + interval (array)
query D
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select '1980-01-01'::date + i from t;
----
1980-02-01
1980-01-02
1980-01-01

query P
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select '1980-01-01T12:00:00'::timestamp + i from t;
----
1980-02-01T12:00:00
1980-01-02T12:00:00
1980-01-01T12:01:00


query D
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select '1980-01-01'::date - i from t;
----
1979-12-01
1979-12-31
1980-01-01

query P
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select '1980-01-01T12:00:00'::timestamp - i from t;
----
1979-12-01T12:00:00
1979-12-31T12:00:00
1980-01-01T11:59:00

### date / timestamp (array) + interval (array)
query D
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select d + i from t;
----
1980-02-01
1990-10-02
1980-01-02

query P
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select ts + i from t;
----
2000-02-01T00:00:00
2000-01-02T12:11:10
2000-02-01T00:01:00


### date / timestamp (array) - interval (array)
query D
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select d - i from t;
----
1979-12-01
1990-09-30
1980-01-02

query P
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select ts - i from t;
----
1999-12-01T00:00:00
1999-12-31T12:11:10
2000-01-31T23:59:00


# Now reverse the argument order
Expand All @@ -523,48 +475,32 @@ query error DataFusion error: Error during planning: Cannot coerce arithmetic ex
select '1 month'::interval - '1980-01-01T12:00:00'::timestamp;

# interval (array) + date / timestamp (array)
query D
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select i + d from t;
----
1980-02-01
1990-10-02
1980-01-02

query P
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select i + ts from t;
----
2000-02-01T00:00:00
2000-01-02T12:11:10
2000-02-01T00:01:00

# expected error interval (array) - date / timestamp (array)
query error DataFusion error: Error during planning: Cannot coerce arithmetic expression Interval\(MonthDayNano\) \- Date32 to valid types
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select i - d from t;

query error DataFusion error: Error during planning: Cannot coerce arithmetic expression Interval\(MonthDayNano\) \- Timestamp\(Nanosecond, None\) to valid types
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select i - ts from t;


# interval (scalar) + date / timestamp (array)
query D
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select '1 month'::interval + d from t;
----
1980-02-01
1990-11-01
1980-02-02

query P
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select '1 month'::interval + ts from t;
----
2000-02-01T00:00:00
2000-02-01T12:11:10
2000-03-01T00:00:00

# expected error interval (scalar) - date / timestamp (array)
query error DataFusion error: Error during planning: Cannot coerce arithmetic expression Interval\(MonthDayNano\) \- Date32 to valid types
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select '1 month'::interval - d from t;

query error DataFusion error: Error during planning: Cannot coerce arithmetic expression Interval\(MonthDayNano\) \- Timestamp\(Nanosecond, None\) to valid types
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select '1 month'::interval - ts from t;

# interval + date
Expand All @@ -574,7 +510,7 @@ select interval '1 month' + '2012-01-01'::date;
2012-02-01

# is (not) distinct from
query BBBBBB
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select
i is distinct from null,
i is distinct from (interval '1 month'),
Expand All @@ -583,21 +519,13 @@ select
i is not distinct from (interval '1 day'),
i is not distinct from i
from t;
----
true false false false false true
true true false false true true
true true false false false true

### interval (array) cmp interval (array)
query BBBBBB
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select i = i, i != i, i < i, i <= i, i > i, i >= i from t;
----
true false false true false true
true false false true false true
true false false true false true

### interval (array) cmp interval (scalar)
query BBBBBB
query error DataFusion error: Error during planning: table 'datafusion\.public\.t' not found
select
(interval '1 day') = i,
(interval '1 day') != i,
Expand All @@ -606,10 +534,6 @@ select
i > (interval '1 day'),
i >= (interval '1 day')
from t;
----
false true false false true true
true false false true false true
false true true true false false

### interval (scalar) cmp interval (scalar)
query BBBBBB
Expand All @@ -623,5 +547,21 @@ select
----
true true true true true true

### interval with string literal default as second
query ????
SELECT interval '1', '-12'::interval, '1'::interval, '1'::interval + '1'::interval
Copy link
Contributor

@samuelcolvin samuelcolvin Aug 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is very hard to read, better to do separate tests.

----
0 years 0 mons 0 days 0 hours 0 mins 1.000000000 secs 0 years 0 mons 0 days 0 hours 0 mins -12.000000000 secs 0 years 0 mons 0 days 0 hours 0 mins 1.000000000 secs 0 years 0 mons 0 days 0 hours 0 mins 2.000000000 secs

### interval with column string literal
statement ok
create table t(i1 VARCHAR(2), i2 VARCHAR(2)) as
values ('1', '-12');

query ???
select i1::interval, i2::interval, i1::interval + i2::interval from t;
----
0 years 0 mons 0 days 0 hours 0 mins 1.000000000 secs 0 years 0 mons 0 days 0 hours 0 mins -12.000000000 secs 0 years 0 mons 0 days 0 hours 0 mins -11.000000000 secs

statement ok
drop table t