Spark: Deprecate unused methods in SparkTableUtil and SparkSchemaUtil (apache#14308)

* Spark: Deprecate unused methods from SparkTableUtil and SparkSchemaUtil

* fixup! Spark: Deprecate unused methods from SparkTableUtil and SparkSchemaUtil

Author: ebyhr

spark/v4.0/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java

@@ -199,7 +199,9 @@ public static Schema convert(Schema baseSchema, StructType sparkType, boolean ca
    * @param sparkType a Spark StructType
    * @return the equivalent Schema
    * @throws IllegalArgumentException if the type cannot be converted or there are missing ids
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static Schema convertWithFreshIds(Schema baseSchema, StructType sparkType) {
     return convertWithFreshIds(baseSchema, sparkType, true);
   }
@@ -263,7 +265,9 @@ public static Schema prune(Schema schema, StructType requestedType) {
    * @param filters a list of filters
    * @return a Schema corresponding to the Spark projection
    * @throws IllegalArgumentException if the Spark type does not match the Schema
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static Schema prune(Schema schema, StructType requestedType, List<Expression> filters) {
     Set<Integer> filterRefs = Binder.boundReferences(schema.asStruct(), filters, true);
     return new Schema(

spark/v4.0/spark/src/main/java/org/apache/iceberg/spark/SparkTableUtil.java

@@ -143,7 +143,9 @@ private SparkTableUtil() {}
    * @param spark a Spark session
    * @param table a table name and (optional) database
    * @return a DataFrame of the table's partitions
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static Dataset<Row> partitionDF(SparkSession spark, String table) {
     List<SparkPartition> partitions = getPartitions(spark, table);
     return spark
@@ -158,7 +160,9 @@ public static Dataset<Row> partitionDF(SparkSession spark, String table) {
    * @param table name of the table.
    * @param expression The expression whose matching partitions are returned.
    * @return a DataFrame of the table partitions.
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static Dataset<Row> partitionDFByFilter(
       SparkSession spark, String table, String expression) {
     List<SparkPartition> partitions = getPartitionsByFilter(spark, table, expression);
@@ -173,7 +177,9 @@ public static Dataset<Row> partitionDFByFilter(
    * @param spark a Spark session
    * @param table a table name and (optional) database
    * @return all table's partitions
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static List<SparkPartition> getPartitions(SparkSession spark, String table) {
     try {
       TableIdentifier tableIdent = spark.sessionState().sqlParser().parseTableIdentifier(table);
@@ -228,7 +234,9 @@ public static List<SparkPartition> getPartitions(
    * @param table a table name and (optional) database
    * @param predicate a predicate on partition columns
    * @return matching table's partitions
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static List<SparkPartition> getPartitionsByFilter(
       SparkSession spark, String table, String predicate) {
     TableIdentifier tableIdent;
@@ -258,7 +266,9 @@ public static List<SparkPartition> getPartitionsByFilter(
    * @param tableIdent a table identifier
    * @param predicateExpr a predicate expression on partition columns
    * @return matching table's partitions
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static List<SparkPartition> getPartitionsByFilter(
       SparkSession spark, TableIdentifier tableIdent, Expression predicateExpr) {
     try {
@@ -411,7 +421,9 @@ private static Iterator<ManifestFile> buildManifest(
    * @param partitionFilter only import partitions whose values match those in the map, can be
    *     partially defined
    * @param checkDuplicateFiles if true, throw exception if import results in a duplicate data file
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static void importSparkTable(
       SparkSession spark,
       TableIdentifier sourceTableIdent,
@@ -434,7 +446,9 @@ public static void importSparkTable(
    * @param targetTable an Iceberg table where to import the data
    * @param stagingDir a staging directory to store temporary manifest files
    * @param parallelism number of threads to use for file reading
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static void importSparkTable(
       SparkSession spark,
       TableIdentifier sourceTableIdent,
@@ -627,7 +641,9 @@ public static void importSparkTable(
    * @param targetTable an Iceberg table where to import the data
    * @param stagingDir a staging directory to store temporary manifest files
    * @param checkDuplicateFiles if true, throw exception if import results in a duplicate data file
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static void importSparkTable(
       SparkSession spark,
       TableIdentifier sourceTableIdent,
@@ -732,7 +748,9 @@ private static void importUnpartitionedSparkTable(
    * @param spec a partition spec
    * @param stagingDir a staging directory to store temporary manifest files
    * @param checkDuplicateFiles if true, throw exception if import results in a duplicate data file
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static void importSparkPartitions(
       SparkSession spark,
       List<SparkPartition> partitions,
@@ -930,7 +948,9 @@ public static void importSparkPartitions(
    * @param targetTable an Iceberg table where to import the data
    * @param spec a partition spec
    * @param stagingDir a staging directory to store temporary manifest files
+   * @deprecated since 1.11.0, will be removed in 1.12.0
    */
+  @Deprecated
   public static void importSparkPartitions(
       SparkSession spark,
       List<SparkPartition> partitions,
@@ -940,6 +960,10 @@ public static void importSparkPartitions(
     importSparkPartitions(spark, partitions, targetTable, spec, stagingDir, false, 1);
   }
 
+  /**
+   * @deprecated since 1.11.0, will be removed in 1.12.0
+   */
+  @Deprecated
   public static List<SparkPartition> filterPartitions(
       List<SparkPartition> partitions, Map<String, String> partitionFilter) {
     if (partitionFilter.isEmpty()) {