Skip to content

Commit ed85ea6

Browse files
committed
address_review_comments
1 parent 8ef844d commit ed85ea6

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

native/spark-expr/src/static_invoke/char_varchar_utils/read_side_padding.rs

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -83,34 +83,13 @@ fn spark_read_side_padding2(
8383
DataType::Utf8 => spark_read_side_padding_internal::<i32>(
8484
array,
8585
truncate,
86-
ColumnarValue::Array(Arc::<dyn arrow::array::Array>::clone(array_int)),
86+
ColumnarValue::Array(Arc::<dyn Array>::clone(array_int)),
8787
),
8888
DataType::LargeUtf8 => spark_read_side_padding_internal::<i64>(
8989
array,
9090
truncate,
91-
ColumnarValue::Array(Arc::<dyn arrow::array::Array>::clone(array_int)),
91+
ColumnarValue::Array(Arc::<dyn Array>::clone(array_int)),
9292
),
93-
// Dictionary support required for SPARK-48498
94-
DataType::Dictionary(_, value_type) => {
95-
let dict = as_dictionary_array::<Int32Type>(array);
96-
let col = if value_type.as_ref() == &DataType::Utf8 {
97-
spark_read_side_padding_internal::<i32>(
98-
dict.values(),
99-
truncate,
100-
ColumnarValue::Array(Arc::<dyn arrow::array::Array>::clone(array_int)),
101-
)?
102-
} else {
103-
spark_read_side_padding_internal::<i64>(
104-
dict.values(),
105-
truncate,
106-
ColumnarValue::Array(Arc::<dyn arrow::array::Array>::clone(array_int)),
107-
)?
108-
};
109-
// col consists of an array, so arg of to_array() is not used. Can be anything
110-
let values = col.to_array(0)?;
111-
let result = DictionaryArray::try_new(dict.keys().clone(), values)?;
112-
Ok(ColumnarValue::Array(make_array(result.into())))
113-
}
11493
other => Err(DataFusionError::Internal(format!(
11594
"Unsupported data type {other:?} for function rpad/read_side_padding",
11695
))),

spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
322322
checkSparkAnswer("SELECT try_add(_1, _2) FROM tbl")
323323
}
324324
}
325-
test("fix_rpad") {
325+
test("Verify rpad expr support for second arg instead of just literal") {
326326
withTable("t1") {
327327
val value = "IfIWasARoadIWouldBeBent"
328328
sql("create table t1(c1 varchar(100), c2 int) using parquet")

0 commit comments

Comments
 (0)