Skip to content
Open
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
100 changes: 99 additions & 1 deletion native/spark-expr/src/conversion_funcs/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{timezone, BinaryOutputStyle};
use crate::{EvalMode, SparkError, SparkResult};
use arrow::array::builder::StringBuilder;
use arrow::array::{
Decimal128Builder, DictionaryArray, GenericByteArray, StringArray, StructArray,
Decimal128Builder, DictionaryArray, GenericByteArray, ListArray, StringArray, StructArray,
};
use arrow::compute::can_cast_types;
use arrow::datatypes::{
Expand Down Expand Up @@ -1028,6 +1028,7 @@ fn cast_array(
to_type,
cast_options,
)?),
(List(_), Utf8) => Ok(cast_array_to_string(array.as_list(), cast_options)?),
(List(_), List(_)) if can_cast_types(from_type, to_type) => {
Ok(cast_with_options(&array, to_type, &CAST_OPTIONS)?)
}
Expand Down Expand Up @@ -1240,6 +1241,52 @@ fn cast_struct_to_struct(
}
}

fn cast_array_to_string(
array: &ListArray,
spark_cast_options: &SparkCastOptions,
) -> DataFusionResult<ArrayRef> {
let mut builder = StringBuilder::with_capacity(array.len(), array.len() * 16);
let mut str = String::with_capacity(array.len() * 16);

let casted_values = cast_array(
Arc::clone(array.values()),
&DataType::Utf8,
spark_cast_options,
)?;
let string_values = casted_values
.as_any()
.downcast_ref::<StringArray>()
.expect("Casted values should be StringArray");

let offsets = array.offsets();
for row_index in 0..array.len() {
if array.is_null(row_index) {
builder.append_null();
} else {
str.clear();
let start = offsets[row_index] as usize;
let end = offsets[row_index + 1] as usize;

str.push('[');
let mut first = true;
for idx in start..end {
if !first {
str.push_str(", ");
}
if string_values.is_null(idx) {
str.push_str(&spark_cast_options.null_string);
} else {
str.push_str(string_values.value(idx));
}
first = false;
}
str.push(']');
builder.append_value(&str);
}
}
Ok(Arc::new(builder.finish()))
}

fn casts_struct_to_string(
array: &StructArray,
spark_cast_options: &SparkCastOptions,
Expand Down Expand Up @@ -2928,4 +2975,55 @@ mod tests {
assert!(casted.is_null(8));
assert!(casted.is_null(9));
}

#[test]
fn test_cast_string_array_to_string() {
use arrow::array::ListArray;
use arrow::buffer::OffsetBuffer;
let values_array =
StringArray::from(vec![Some("a"), Some("b"), Some("c"), Some("a"), None, None]);
let offsets_buffer = OffsetBuffer::<i32>::new(vec![0, 3, 5, 6, 6].into());
let item_field = Arc::new(Field::new("item", DataType::Utf8, true));
let list_array = Arc::new(ListArray::new(
item_field,
offsets_buffer,
Arc::new(values_array),
None,
));
let string_array = cast_array_to_string(
&list_array,
&SparkCastOptions::new(EvalMode::Legacy, "UTC", false),
)
.unwrap();
let string_array = string_array.as_string::<i32>();
assert_eq!(r#"[a, b, c]"#, string_array.value(0));
assert_eq!(r#"[a, null]"#, string_array.value(1));
assert_eq!(r#"[null]"#, string_array.value(2));
assert_eq!(r#"[]"#, string_array.value(3));
}

#[test]
fn test_cast_i32_array_to_string() {
use arrow::array::ListArray;
use arrow::buffer::OffsetBuffer;
let values_array = Int32Array::from(vec![Some(1), Some(2), Some(3), Some(1), None, None]);
let offsets_buffer = OffsetBuffer::<i32>::new(vec![0, 3, 5, 6, 6].into());
let item_field = Arc::new(Field::new("item", DataType::Int32, true));
let list_array = Arc::new(ListArray::new(
item_field,
offsets_buffer,
Arc::new(values_array),
None,
));
let string_array = cast_array_to_string(
&list_array,
&SparkCastOptions::new(EvalMode::Legacy, "UTC", false),
)
.unwrap();
let string_array = string_array.as_string::<i32>();
assert_eq!(r#"[1, 2, 3]"#, string_array.value(0));
assert_eq!(r#"[1, null]"#, string_array.value(1));
assert_eq!(r#"[null]"#, string_array.value(2));
assert_eq!(r#"[]"#, string_array.value(3));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ object CometCast extends CometExpressionSerde[Cast] with CometExprShim {

(fromType, toType) match {
case (dt: ArrayType, _: ArrayType) if dt.elementType == NullType => Compatible()
case (dt: ArrayType, DataTypes.StringType) =>
isSupported(dt.elementType, DataTypes.StringType, timeZoneId, evalMode)
case (dt: ArrayType, dt1: ArrayType) =>
isSupported(dt.elementType, dt1.elementType, timeZoneId, evalMode)
case (dt: DataType, _) if dt.typeName == "timestamp_ntz" =>
Expand Down
35 changes: 34 additions & 1 deletion spark/src/test/scala/org/apache/comet/CometCastSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ package org.apache.comet

import java.io.File

import scala.collection.mutable.ListBuffer
import scala.util.Random
import scala.util.matching.Regex

Expand All @@ -30,10 +31,11 @@ import org.apache.spark.sql.catalyst.expressions.Cast
import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
import org.apache.spark.sql.functions.col
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.types.{DataType, DataTypes, DecimalType, StructField, StructType}
import org.apache.spark.sql.types.{ArrayType, BinaryType, BooleanType, ByteType, DataType, DataTypes, DecimalType, IntegerType, LongType, ShortType, StringType, StructField, StructType}

import org.apache.comet.CometSparkSessionExtensions.isSpark40Plus
import org.apache.comet.expressions.{CometCast, CometEvalMode}
import org.apache.comet.rules.CometScanTypeChecker
import org.apache.comet.serde.Compatible

class CometCastSuite extends CometTestBase with AdaptiveSparkPlanHelper {
Expand Down Expand Up @@ -1046,6 +1048,31 @@ class CometCastSuite extends CometTestBase with AdaptiveSparkPlanHelper {
castTest(generateDecimalsPrecision10Scale2(), DataTypes.createDecimalType(10, 0))
}

test("cast ArrayType to StringType") {
val hasIncompatibleType = (dt: DataType) =>
if (CometConf.COMET_NATIVE_SCAN_IMPL.get() == "auto") {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

For cases where the test is run without setting the environment variable COMET_PARQUET_SCAN_IMPL, such as when developing in IntelliJ IDEA.

true
} else {
!CometScanTypeChecker(CometConf.COMET_NATIVE_SCAN_IMPL.get())
.isTypeSupported(dt, "a", ListBuffer.empty)
}
Seq(
BooleanType,
StringType,
ByteType,
IntegerType,
LongType,
ShortType,
// FloatType,
// DoubleType,
DecimalType(10, 2),
DecimalType(38, 18),
BinaryType).foreach { dt =>
val input = generateArrays(100, dt)
castTest(input, StringType, hasIncompatibleType = hasIncompatibleType(input.schema))
}
}

private def generateFloats(): DataFrame = {
withNulls(gen.generateFloats(dataSize)).toDF("a")
}
Expand Down Expand Up @@ -1074,6 +1101,12 @@ class CometCastSuite extends CometTestBase with AdaptiveSparkPlanHelper {
withNulls(gen.generateLongs(dataSize)).toDF("a")
}

private def generateArrays(rowSize: Int, elementType: DataType): DataFrame = {
import scala.collection.JavaConverters._
val schema = StructType(Seq(StructField("a", ArrayType(elementType), true)))
spark.createDataFrame(gen.generateRows(rowSize, schema).asJava, schema)
}

// https://github.com/apache/datafusion-comet/issues/2038
test("test implicit cast to dictionary with case when and dictionary type") {
withSQLConf("parquet.enable.dictionary" -> "true") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@

package org.apache.spark.sql

import scala.collection.mutable.ListBuffer

import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.spark.sql.catalyst.analysis.UnresolvedAttribute
import org.apache.spark.sql.catalyst.expressions.{Alias, ToPrettyString}
import org.apache.spark.sql.catalyst.plans.logical.Project
import org.apache.spark.sql.types.DataTypes

import org.apache.comet.CometFuzzTestBase
import org.apache.comet.{CometConf, CometFuzzTestBase}
import org.apache.comet.expressions.{CometCast, CometEvalMode}
import org.apache.comet.rules.CometScanTypeChecker
import org.apache.comet.serde.Compatible

class CometToPrettyStringSuite extends CometFuzzTestBase {
Expand All @@ -47,7 +50,10 @@ class CometToPrettyStringSuite extends CometFuzzTestBase {
DataTypes.StringType,
Some(spark.sessionState.conf.sessionLocalTimeZone),
CometEvalMode.TRY) match {
case _: Compatible => checkSparkAnswerAndOperator(result)
case _: Compatible
if CometScanTypeChecker(CometConf.COMET_NATIVE_SCAN_IMPL.get())
.isTypeSupported(field.dataType, field.name, ListBuffer.empty) =>
checkSparkAnswerAndOperator(result)
case _ => checkSparkAnswer(result)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

package org.apache.spark.sql

import scala.collection.mutable.ListBuffer

import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.spark.sql.catalyst.analysis.UnresolvedAttribute
import org.apache.spark.sql.catalyst.expressions.{Alias, ToPrettyString}
Expand All @@ -28,8 +30,9 @@ import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.internal.SQLConf.BinaryOutputStyle
import org.apache.spark.sql.types.DataTypes

import org.apache.comet.CometFuzzTestBase
import org.apache.comet.{CometConf, CometFuzzTestBase}
import org.apache.comet.expressions.{CometCast, CometEvalMode}
import org.apache.comet.rules.CometScanTypeChecker
import org.apache.comet.serde.Compatible

class CometToPrettyStringSuite extends CometFuzzTestBase {
Expand Down Expand Up @@ -58,7 +61,10 @@ class CometToPrettyStringSuite extends CometFuzzTestBase {
DataTypes.StringType,
Some(spark.sessionState.conf.sessionLocalTimeZone),
CometEvalMode.TRY) match {
case _: Compatible => checkSparkAnswerAndOperator(result)
case _: Compatible
if CometScanTypeChecker(CometConf.COMET_NATIVE_SCAN_IMPL.get())
.isTypeSupported(field.dataType, field.name, ListBuffer.empty) =>
checkSparkAnswerAndOperator(result)
case _ => checkSparkAnswer(result)
}
}
Expand Down
Loading