(iceberg) branch main updated: Spark: Simplify SparkSchemaUtil#schemaForTable (#10137)

[amoghj]

This is an automated email from the ASF dual-hosted git repository.

amoghj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/main by this push:
     new fb657b413e Spark: Simplify SparkSchemaUtil#schemaForTable (#10137)
fb657b413e is described below

commit fb657b413e2bb7f6c5e2c78465173df0426d3527
Author: Amogh Jahagirdar <am...@tabular.io>
AuthorDate: Sun Apr 14 07:44:28 2024 -0600

    Spark: Simplify SparkSchemaUtil#schemaForTable (#10137)
---
 .../spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java | 4 +---
 .../spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java | 4 +---
 .../spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git 
a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java 
b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java
index 6075aba7ac..b1cc0ac620 100644
--- 
a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java
+++ 
b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java
@@ -59,9 +59,7 @@ public class SparkSchemaUtil {
    * @return a Schema for the table, if found
    */
   public static Schema schemaForTable(SparkSession spark, String name) {
-    StructType sparkType = spark.table(name).schema();
-    Type converted = SparkTypeVisitor.visit(sparkType, new 
SparkTypeToType(sparkType));
-    return new Schema(converted.asNestedType().asStructType().fields());
+    return convert(spark.table(name).schema());
   }
 
   /**
diff --git 
a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java 
b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java
index 21a1d92a11..d0f77bcdd9 100644
--- 
a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java
+++ 
b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java
@@ -59,9 +59,7 @@ public class SparkSchemaUtil {
    * @return a Schema for the table, if found
    */
   public static Schema schemaForTable(SparkSession spark, String name) {
-    StructType sparkType = spark.table(name).schema();
-    Type converted = SparkTypeVisitor.visit(sparkType, new 
SparkTypeToType(sparkType));
-    return new Schema(converted.asNestedType().asStructType().fields());
+    return convert(spark.table(name).schema());
   }
 
   /**
diff --git 
a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java 
b/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java
index 21a1d92a11..d0f77bcdd9 100644
--- 
a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java
+++ 
b/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java
@@ -59,9 +59,7 @@ public class SparkSchemaUtil {
    * @return a Schema for the table, if found
    */
   public static Schema schemaForTable(SparkSession spark, String name) {
-    StructType sparkType = spark.table(name).schema();
-    Type converted = SparkTypeVisitor.visit(sparkType, new 
SparkTypeToType(sparkType));
-    return new Schema(converted.asNestedType().asStructType().fields());
+    return convert(spark.table(name).schema());
   }
 
   /**