kosiew commented on code in PR #18761:
URL: https://github.com/apache/datafusion/pull/18761#discussion_r2534121251
##########
datafusion/expr-common/src/columnar_value.rs:
##########
@@ -275,16 +282,69 @@ impl ColumnarValue {
) -> Result<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)?,
- )),
+ ColumnarValue::Array(array) => {
+ ensure_date_array_timestamp_bounds(array, cast_type)?;
+ Ok(ColumnarValue::Array(kernels::cast::cast_with_options(
+ array,
+ cast_type,
+ &cast_options,
+ )?))
+ }
ColumnarValue::Scalar(scalar) => Ok(ColumnarValue::Scalar(
scalar.cast_to_with_options(cast_type, &cast_options)?,
)),
}
}
}
+fn ensure_date_array_timestamp_bounds(
+ array: &ArrayRef,
+ cast_type: &DataType,
+) -> Result<()> {
+ let source_type = array.data_type().clone();
+ let Some(multiplier) = date_to_timestamp_multiplier(&source_type,
cast_type) else {
+ return Ok(());
+ };
+
+ if multiplier <= 1 {
+ return Ok(());
+ }
+
+ let iter: Box<dyn Iterator<Item = i64> + '_> = match &source_type {
+ DataType::Date32 => {
+ let arr = array
+ .as_any()
+ .downcast_ref::<Date32Array>()
+ .ok_or_else(|| {
+ internal_datafusion_err!(
+ "Expected Date32Array but found {}",
+ array.data_type()
+ )
+ })?;
+ Box::new(arr.iter().flatten().map(|v| v as i64))
+ }
+ DataType::Date64 => {
+ let arr = array
+ .as_any()
+ .downcast_ref::<Date64Array>()
+ .ok_or_else(|| {
+ internal_datafusion_err!(
+ "Expected Date64Array but found {}",
+ array.data_type()
+ )
+ })?;
+ Box::new(arr.iter().flatten())
+ }
+ _ => return Ok(()), // Not a date type, nothing to do
+ };
+
+ for value in iter {
+ ensure_timestamp_in_bounds(value, multiplier, &source_type,
cast_type)?;
Review Comment:
Good idea — we should only need to check extremes.
Will amend accordingly.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
