Skip to content

Commit e7a09b5

Browse files
committed
#847 Fix PR suggestions covering more cases in Spark 4+.
1 parent 8a074f7 commit e7a09b5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

spark-cobol/src/main/scala/za/co/absa/cobrix/spark/cobol/utils/SparkUtils.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ object SparkUtils extends Logging {
129129
case _ =>
130130
val newFieldNamePrefix = s"${fieldNamePrefix}${i}"
131131
val newFieldName = getNewFieldName(s"$newFieldNamePrefix")
132-
fields += expr(s"$path`${structField.name}`[$i]").as(newFieldName, structField.metadata)
132+
fields += expr(s"${getArrayIndexExpr(fieldName, i)}").as(newFieldName, structField.metadata)
133133
stringFields += s"""expr("${getArrayIndexExpr(fieldName, i)} AS `$newFieldName`")"""
134134
}
135135
i += 1
@@ -197,7 +197,7 @@ object SparkUtils extends Logging {
197197
case _ =>
198198
val newFieldName = getNewFieldName(s"$fieldNamePrefix${field.name}")
199199
fields += expr(s"$path`${field.name}`").as(newFieldName, field.metadata)
200-
if (path.contains('['))
200+
if (path.contains('[') || path.contains('('))
201201
stringFields += s"""expr("$path`${field.name}` AS `$newFieldName`")"""
202202
else
203203
stringFields += s"""col("$path`${field.name}`").as("$newFieldName")"""

0 commit comments

Comments
 (0)