Skip to content

fix: support non-string types for iceberg partition listing #436

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

Merged
merged 2 commits into from
Feb 25, 2025
Merged

fix: support non-string types for iceberg partition listing #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74b6cc4
fix: support non-string types for iceberg partition listing
tchow-zlai Feb 25, 2025
779cd0d
use tableutils
tchow-zlai Feb 25, 2025
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
2 changes: 1 addition & 1 deletion cloud_gcp/src/main/scala/ai/chronon/integrations/cloud_gcp/BigQueryFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ case class BigQueryFormat(project: String, bqClient: BigQuery, override val opti
// TODO: remove temporary hack. this is done because the existing raw data is in the date format yyyy-MM-dd
// but partition values in bigquery's INFORMATION_SCHEMA.PARTITIONS are in yyyyMMdd format.
// moving forward, for bigquery gcp we should default to storing raw data in yyyyMMdd format.
val partitionFormat = sparkSession.conf.get("spark.chronon.partition.format", "yyyyMMdd")
val partitionFormat = TableUtils(sparkSession).partitionFormat

val partitionInfoDf = sparkSession.read
.format("bigquery")
Expand Down
2 changes: 1 addition & 1 deletion spark/src/main/scala/ai/chronon/spark/TableUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class TableUtils(@transient val sparkSession: SparkSession) extends Serializable
.withZone(ZoneId.systemDefault())
val partitionColumn: String =
sparkSession.conf.get("spark.chronon.partition.column", "ds")
private[spark] val partitionFormat: String =
val partitionFormat: String =
sparkSession.conf.get("spark.chronon.partition.format", "yyyy-MM-dd")
val partitionSpec: PartitionSpec = PartitionSpec(partitionFormat, WindowUtils.Day.millis)
val smallModelEnabled: Boolean =
Expand Down
8 changes: 5 additions & 3 deletions spark/src/main/scala/ai/chronon/spark/format/Iceberg.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package ai.chronon.spark.format

import ai.chronon.spark.TableUtils
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.functions.{col, date_format}
import org.apache.spark.sql.types.StructType

case object Iceberg extends Format {
Expand Down Expand Up @@ -29,12 +31,12 @@ case object Iceberg extends Format {
.load(s"$tableName.partitions")

val index = partitionsDf.schema.fieldIndex("partition")

val partitionFmt = TableUtils(sparkSession).partitionFormat
if (partitionsDf.schema(index).dataType.asInstanceOf[StructType].fieldNames.contains("hr")) {
// Hour filter is currently buggy in iceberg. https://github.com/apache/iceberg/issues/4718
// so we collect and then filter.
partitionsDf
.select("partition.ds", "partition.hr")
.select(date_format(col("partition.ds"), partitionFmt), col("partition.hr"))
.collect()
.filter(_.get(1) == null)
.map(_.getString(0))
Expand All @@ -43,7 +45,7 @@ case object Iceberg extends Format {
} else {

partitionsDf
.select("partition.ds")
.select(date_format(col("partition.ds"), partitionFmt))
.collect()
.map(_.getString(0))
.toSeq
Expand Down