Skip to content

[SPARK-51830] Exception handling for partition datatype conversion call #50610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Madhukar525722 wants to merge 1 commit into from
Closed

[SPARK-51830] Exception handling for partition datatype conversion call #50610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/PartitioningUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import org.apache.spark.sql.catalyst.expressions.{Attribute, Cast, Literal}
import org.apache.spark.sql.catalyst.types.DataTypeUtils
import org.apache.spark.sql.catalyst.util.{CaseInsensitiveMap, DateFormatter, DateTimeUtils, TimeFormatter, TimestampFormatter}
import org.apache.spark.sql.errors.{QueryCompilationErrors, QueryExecutionErrors}
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.types._
import org.apache.spark.sql.util.SchemaUtils
import org.apache.spark.unsafe.types.UTF8String
Expand Down Expand Up @@ -361,12 +362,21 @@ object PartitioningUtils extends SQLConfHelper {
}.mkString("/")
}

def removeLeadingZerosFromNumberTypePartition(value: String, dataType: DataType): String =
dataType match {
case ByteType | ShortType | IntegerType | LongType | FloatType | DoubleType =>
Option(castPartValueToDesiredType(dataType, value, null)).map(_.toString).orNull
case _ => value
def removeLeadingZerosFromNumberTypePartition(value: String, dataType: DataType): String = {
try {
dataType match {
case ByteType | ShortType | IntegerType | LongType | FloatType | DoubleType =>
Option(castPartValueToDesiredType(dataType, value, null)).map(_.toString).orNull
case _ => value
}
} catch {
case NonFatal(_) =>
if (SQLConf.get.validatePartitionColumns) {
throw QueryExecutionErrors.failedToCastValueToDataTypeForPartitionColumnError(
value, dataType, null)
} else value
}
}

def getPathFragment(spec: TablePartitionSpec, partitionColumns: Seq[Attribute]): String = {
getPathFragment(spec, DataTypeUtils.fromAttributes(partitionColumns))
Expand Down
8 changes: 8 additions & 0 deletions ...a/org/apache/spark/sql/execution/datasources/parquet/ParquetPartitionDiscoverySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,14 @@ class ParquetV2PartitionDiscoverySuite extends ParquetPartitionDiscoverySuite {
assert("p_int=10/p_float=1.0" === path)
}

test("SPARK-51830 handle exception and validate partition column as false") {
SQLConf.get.setConf(SQLConf.VALIDATE_PARTITION_COLUMNS, false)
val spec = Map("p_int" -> "not_a_number")
val schema = new StructType().add("p_int", "int")
val path = PartitioningUtils.getPathFragment(spec, schema)
assert("p_int=not_a_number" === path)
}

test("SPARK-39417: Null partition value") {
// null partition value is replaced by DEFAULT_PARTITION_NAME before hitting getPathFragment.
val spec = Map("p_int"-> ExternalCatalogUtils.DEFAULT_PARTITION_NAME)
Expand Down