Skip to content

fix(spark): accept STRING and TIMESTAMP start dates in next_day #26127

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

Open
harsh-ande wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(spark): accept STRING and TIMESTAMP start dates in next_day #26127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daa6ce9
fix(spark): accept STRING and TIMESTAMP start dates in next_day
harsh-ande Oct 7, 2026
8478be5
Merge branch 'main' into fix-next-day-coercion
harsh-ande Oct 7, 2026
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
24 changes: 20 additions & 4 deletions datafusion/spark/src/function/datetime/next_day.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ use std::sync::Arc;
use arrow::array::{ArrayRef, AsArray, Date32Array, StringArrayType};
use arrow::datatypes::{DataType, Date32Type, Field, FieldRef};
use chrono::{Datelike, Weekday};
use datafusion_common::types::{NativeType, logical_date, logical_string};
use datafusion_common::{Result, ScalarValue, exec_err, internal_err};
use datafusion_expr::{
ColumnarValue, ReturnFieldArgs, ScalarFunctionArgs, ScalarUDFImpl, Signature,
Volatility,
Coercion, ColumnarValue, ReturnFieldArgs, ScalarFunctionArgs, ScalarUDFImpl,
Signature, TypeSignatureClass, Volatility,
};

/// <https://spark.apache.org/docs/latest/api/sql/index.html#next_day>
Expand All @@ -41,8 +42,23 @@ impl Default for SparkNextDay {
impl SparkNextDay {
pub fn new() -> Self {
Self {
signature: Signature::exact(
vec![DataType::Date32, DataType::Utf8],
// Spark casts the start date to DATE, so STRING and TIMESTAMP are accepted
signature: Signature::coercible(
vec![
Coercion::new_implicit(
TypeSignatureClass::Native(logical_date()),
vec![
TypeSignatureClass::Native(logical_string()),
TypeSignatureClass::Timestamp,
],
NativeType::Date,
),
Coercion::new_implicit(
TypeSignatureClass::Native(logical_string()),
vec![TypeSignatureClass::Numeric],
NativeType::String,
),
],
Volatility::Immutable,
),
}
Expand Down
59 changes: 54 additions & 5 deletions datafusion/sqllogictest/test_files/spark/datetime/next_day.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,22 @@ SELECT next_day('2015-01-14'::DATE, ' MO '::string);
----
NULL

query error Failed to coerce arguments to satisfy a call to 'next_day' function
query error Function 'next_day' expects 2 arguments but received 1
SELECT next_day('2015-07-27'::DATE);

query error Failed to coerce arguments to satisfy a call to 'next_day' function
query error Function 'next_day' expects 2 arguments but received 1
SELECT next_day('Sun'::string);

query error 'next_day' does not support zero arguments
SELECT next_day();

query error Failed to coerce arguments to satisfy a call to 'next_day' function
query error Function 'next_day' requires Date, but received Int32
SELECT next_day(1::int, 'Sun'::string);

query error Failed to coerce arguments to satisfy a call to 'next_day' function
query error Function 'next_day' expects 2 arguments but received 3
SELECT next_day('2015-07-27'::DATE, 'Sat'::string, 'Sun'::string);

query error Failed to coerce arguments to satisfy a call to 'next_day' function
query error Cannot cast string 'invalid_date' to value of Date32 type
SELECT next_day('invalid_date'::string, 'Mon'::string);

query D
Expand Down Expand Up @@ -100,3 +100,52 @@ query I
SELECT arrow_cast(next_day(arrow_cast(95026230, 'Date32'), 'Tue'::string), 'Int32');
----
95026237

# https://github.com/apache/datafusion/issues/23889
# Spark casts the start date to DATE, so STRING and TIMESTAMP are accepted
query D
SELECT next_day('2015-07-23'::string, 'Mon'::string);
----
2015-07-27

query D
SELECT next_day('2015-07-23 12:12:12'::string, 'Mon'::string);
----
2015-07-27

query D
SELECT next_day('2015-07-23 12:12:12'::timestamp, 'Mon'::string);
----
2015-07-27

query D
SELECT next_day(a, 'Mon'::string)
FROM VALUES
('2015-07-23'::string),
(NULL::string) as t(a);
----
2015-07-27
NULL

# Timestamp column with a day-of-week column
query D
SELECT next_day(a, b)
FROM VALUES
('2015-07-23 12:12:12'::timestamp, 'Mon'::string),
('2015-07-23 23:59:59'::timestamp, 'Fri'::string),
(NULL::timestamp, 'Mon'::string) as t(a, b);
----
2015-07-27
2015-07-24
NULL

# String start date and LargeUtf8 / Utf8View day-of-week
query D
SELECT next_day('2015-07-23', arrow_cast('Mon', 'LargeUtf8'));
----
2015-07-27

query D
SELECT next_day('2015-07-23', arrow_cast('Mon', 'Utf8View'));
----
2015-07-27