Skip to content

[CORE] Optimize Iceberg schema field matching #12233

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
wankunde wants to merge 1 commit into from
+3 −3
Closed

[CORE] Optimize Iceberg schema field matching #12233

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
6 changes: 3 additions & 3 deletions gluten-iceberg/src/main/scala/org/apache/gluten/execution/IcebergScanTransformer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import org.apache.spark.sql.execution.datasources.v2.BatchScanExec
import org.apache.spark.sql.execution.metric.SQLMetrics
import org.apache.spark.sql.types.{ArrayType, DataType, StructType}

import org.apache.iceberg.{BaseTable, MetadataColumns, Schema, SnapshotSummary, TableProperties}
import org.apache.iceberg.{BaseTable, MetadataColumns, SnapshotSummary, TableProperties}
import org.apache.iceberg.avro.AvroSchemaUtil
import org.apache.iceberg.spark.source.{GlutenIcebergSourceUtil, SparkTable}
import org.apache.iceberg.spark.source.metrics.NumSplits
Expand Down Expand Up @@ -271,12 +271,12 @@ case class IcebergScanTransformer(
case (iceberg: Types.StructType, currentType: Types.StructType, sparkStruct: StructType) =>
sparkStruct.forall {
sparkField =>
val currentField = new Schema(currentType.fields()).findField(sparkField.name)
val currentField = currentType.field(sparkField.name)
// Find not exists column
if (currentField == null) {
false
} else {
val field = new Schema(iceberg.fields()).findField(currentField.fieldId())
val field = iceberg.field(currentField.fieldId())
// The field does not exist in old schema, add column case
if (field == null) {
true
Expand Down
Loading