Skip to content
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

#398 Do not correct decimals in schema if it is correct already. #413

Merged
merged 1 commit into from
May 21, 2024
Merged

#398 Do not correct decimals in schema if it is correct already. #413

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
8 changes: 5 additions & 3 deletions pramen/core/src/main/scala/za/co/absa/pramen/core/utils/JdbcSparkUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,13 +276,15 @@ object JdbcSparkUtils {
case t: DecimalType if t.scale == 0 && t.precision <= 18 =>
log.info(s"Correct '${field.name}' (prec=${t.precision}, scale=${t.scale}) to long")
newSchema += s"${field.name} long"
case t: DecimalType if t.scale >= 18 =>
case t: DecimalType if t.scale > 18 =>
log.info(s"Correct '${field.name}' (prec=${t.precision}, scale=${t.scale}) to decimal(38, 18)")
newSchema += s"${field.name} decimal(38, 18)"
case t: DecimalType if fixPrecision && t.scale > 0 =>
val fixedPrecision = if (t.precision + t.scale > 38) 38 else t.precision + t.scale
log.info(s"Correct '${field.name}' (prec=${t.precision}, scale=${t.scale}) to decimal($fixedPrecision, ${t.scale})")
newSchema += s"${field.name} decimal($fixedPrecision, ${t.scale})"
if (fixedPrecision > t.precision) {
log.info(s"Correct '${field.name}' (prec=${t.precision}, scale=${t.scale}) to decimal($fixedPrecision, ${t.scale})")
newSchema += s"${field.name} decimal($fixedPrecision, ${t.scale})"
}
case _ =>
field
}
Expand Down
13 changes: 13 additions & 0 deletions pramen/core/src/test/scala/za/co/absa/pramen/core/tests/utils/JdbcSparkUtilsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,19 @@ class JdbcSparkUtilsSuite extends AnyWordSpec with BeforeAndAfterAll with SparkT
assert(customFields.contains("value decimal(38, 18)"))
}

"correct invalid precision with small scale" in {
val schema = StructType(Array(StructField("value", DecimalType(30, 16))))

val dfOrig: DataFrame = Seq("1234567890").toDF("value")
.withColumn("value", $"value".cast("decimal(38, 18)"))

val df = spark.createDataFrame(dfOrig.rdd, schema)

val customFields = JdbcSparkUtils.getCorrectedDecimalsSchema(df, fixPrecision = true)

assert(customFields.contains("value decimal(38, 16)"))
}

"do nothing if the field is okay" in {
val df: DataFrame = Seq("12345").toDF("value")
.withColumn("value", $"value".cast("int"))
Expand Down
Loading