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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ apache-rat-*.jar
venv
dev/release/comet-rm/workdir
spark/benchmarks
/comet-event-trace.json
18 changes: 16 additions & 2 deletions native/spark-expr/src/conversion_funcs/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1031,8 +1031,22 @@ fn cast_array(
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)?)
(List(from), List(to))
if can_cast_types(from_type, to_type)
|| (matches!(from.data_type(), Decimal128(_, _))
&& matches!(to.data_type(), Boolean)) =>
{
let list_array = array.as_list::<i32>();
Ok(Arc::new(ListArray::new(
Arc::clone(to),
list_array.offsets().clone(),
cast_array(
Arc::clone(list_array.values()),
to.data_type(),
cast_options,
)?,
list_array.nulls().cloned(),
)) as ArrayRef)
}
(UInt8 | UInt16 | UInt32 | UInt64, Int8 | Int16 | Int32 | Int64)
if cast_options.allow_cast_unsigned_ints =>
Expand Down
28 changes: 26 additions & 2 deletions spark/src/test/scala/org/apache/comet/CometCastSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,30 @@ class CometCastSuite extends CometTestBase with AdaptiveSparkPlanHelper {
}
}

test("cast ArrayType to ArrayType") {
val types = Seq(
BooleanType,
StringType,
ByteType,
IntegerType,
LongType,
ShortType,
DecimalType(10, 2),
DecimalType(38, 18))
for (fromType <- types) {
for (toType <- types) {
if (fromType != toType &&
!tags
.get(s"cast $fromType to $toType")
.exists(s => s.contains("org.scalatest.Ignore")) &&
Cast.canCast(fromType, toType) &&
CometCast.isSupported(fromType, toType, None, CometEvalMode.LEGACY) == Compatible()) {
castTest(generateArrays(100, fromType), ArrayType(toType))
}
}
}
}

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

private def generateArrays(rowSize: Int, elementType: DataType): DataFrame = {
private def generateArrays(rowNum: 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)
spark.createDataFrame(gen.generateRows(rowNum, schema).asJava, schema)
}

// https://github.com/apache/datafusion-comet/issues/2038
Expand Down
Loading