Skip to content

Commit 0011a85

Browse files
drexler-skydrexler-sky
authored
Spark: Migrate RollBackStageTable to use SupportsDeleteV2 (#16211)
1 parent 2f6606a commit 0011a85

4 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/RollbackStagedTable.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
import java.util.function.Function;
2525
import org.apache.spark.sql.connector.catalog.Identifier;
2626
import org.apache.spark.sql.connector.catalog.StagedTable;
27-
import org.apache.spark.sql.connector.catalog.SupportsDelete;
27+
import org.apache.spark.sql.connector.catalog.SupportsDeleteV2;
2828
import org.apache.spark.sql.connector.catalog.SupportsRead;
2929
import org.apache.spark.sql.connector.catalog.SupportsWrite;
3030
import org.apache.spark.sql.connector.catalog.Table;
3131
import org.apache.spark.sql.connector.catalog.TableCapability;
3232
import org.apache.spark.sql.connector.catalog.TableCatalog;
3333
import org.apache.spark.sql.connector.expressions.Transform;
34+
import org.apache.spark.sql.connector.expressions.filter.Predicate;
3435
import org.apache.spark.sql.connector.read.ScanBuilder;
3536
import org.apache.spark.sql.connector.write.LogicalWriteInfo;
3637
import org.apache.spark.sql.connector.write.WriteBuilder;
37-
import org.apache.spark.sql.sources.Filter;
3838
import org.apache.spark.sql.types.StructType;
3939
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
4040

@@ -58,7 +58,7 @@
5858
* #capabilities()}.
5959
*/
6060
public class RollbackStagedTable
61-
implements StagedTable, SupportsRead, SupportsWrite, SupportsDelete {
61+
implements StagedTable, SupportsRead, SupportsWrite, SupportsDeleteV2 {
6262
private final TableCatalog catalog;
6363
private final Identifier ident;
6464
private final Table table;
@@ -106,8 +106,8 @@ public Set<TableCapability> capabilities() {
106106
}
107107

108108
@Override
109-
public void deleteWhere(Filter[] filters) {
110-
call(SupportsDelete.class, t -> t.deleteWhere(filters));
109+
public void deleteWhere(Predicate[] predicates) {
110+
call(SupportsDeleteV2.class, t -> t.deleteWhere(predicates));
111111
}
112112

113113
@Override

‎spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/RollbackStagedTable.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
import java.util.function.Function;
2525
import org.apache.spark.sql.connector.catalog.Identifier;
2626
import org.apache.spark.sql.connector.catalog.StagedTable;
27-
import org.apache.spark.sql.connector.catalog.SupportsDelete;
27+
import org.apache.spark.sql.connector.catalog.SupportsDeleteV2;
2828
import org.apache.spark.sql.connector.catalog.SupportsRead;
2929
import org.apache.spark.sql.connector.catalog.SupportsWrite;
3030
import org.apache.spark.sql.connector.catalog.Table;
3131
import org.apache.spark.sql.connector.catalog.TableCapability;
3232
import org.apache.spark.sql.connector.catalog.TableCatalog;
3333
import org.apache.spark.sql.connector.expressions.Transform;
34+
import org.apache.spark.sql.connector.expressions.filter.Predicate;
3435
import org.apache.spark.sql.connector.read.ScanBuilder;
3536
import org.apache.spark.sql.connector.write.LogicalWriteInfo;
3637
import org.apache.spark.sql.connector.write.WriteBuilder;
37-
import org.apache.spark.sql.sources.Filter;
3838
import org.apache.spark.sql.types.StructType;
3939
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
4040

@@ -58,7 +58,7 @@
5858
* #capabilities()}.
5959
*/
6060
public class RollbackStagedTable
61-
implements StagedTable, SupportsRead, SupportsWrite, SupportsDelete {
61+
implements StagedTable, SupportsRead, SupportsWrite, SupportsDeleteV2 {
6262
private final TableCatalog catalog;
6363
private final Identifier ident;
6464
private final Table table;
@@ -106,8 +106,8 @@ public Set<TableCapability> capabilities() {
106106
}
107107

108108
@Override
109-
public void deleteWhere(Filter[] filters) {
110-
call(SupportsDelete.class, t -> t.deleteWhere(filters));
109+
public void deleteWhere(Predicate[] predicates) {
110+
call(SupportsDeleteV2.class, t -> t.deleteWhere(predicates));
111111
}
112112

113113
@Override

‎spark/v4.0/spark/src/main/java/org/apache/iceberg/spark/RollbackStagedTable.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
import java.util.function.Function;
2525
import org.apache.spark.sql.connector.catalog.Identifier;
2626
import org.apache.spark.sql.connector.catalog.StagedTable;
27-
import org.apache.spark.sql.connector.catalog.SupportsDelete;
27+
import org.apache.spark.sql.connector.catalog.SupportsDeleteV2;
2828
import org.apache.spark.sql.connector.catalog.SupportsRead;
2929
import org.apache.spark.sql.connector.catalog.SupportsWrite;
3030
import org.apache.spark.sql.connector.catalog.Table;
3131
import org.apache.spark.sql.connector.catalog.TableCapability;
3232
import org.apache.spark.sql.connector.catalog.TableCatalog;
3333
import org.apache.spark.sql.connector.expressions.Transform;
34+
import org.apache.spark.sql.connector.expressions.filter.Predicate;
3435
import org.apache.spark.sql.connector.read.ScanBuilder;
3536
import org.apache.spark.sql.connector.write.LogicalWriteInfo;
3637
import org.apache.spark.sql.connector.write.WriteBuilder;
37-
import org.apache.spark.sql.sources.Filter;
3838
import org.apache.spark.sql.types.StructType;
3939
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
4040

@@ -58,7 +58,7 @@
5858
* #capabilities()}.
5959
*/
6060
public class RollbackStagedTable
61-
implements StagedTable, SupportsRead, SupportsWrite, SupportsDelete {
61+
implements StagedTable, SupportsRead, SupportsWrite, SupportsDeleteV2 {
6262
private final TableCatalog catalog;
6363
private final Identifier ident;
6464
private final Table table;
@@ -106,8 +106,8 @@ public Set<TableCapability> capabilities() {
106106
}
107107

108108
@Override
109-
public void deleteWhere(Filter[] filters) {
110-
call(SupportsDelete.class, t -> t.deleteWhere(filters));
109+
public void deleteWhere(Predicate[] predicates) {
110+
call(SupportsDeleteV2.class, t -> t.deleteWhere(predicates));
111111
}
112112

113113
@Override

‎spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/RollbackStagedTable.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
import java.util.function.Function;
2525
import org.apache.spark.sql.connector.catalog.Identifier;
2626
import org.apache.spark.sql.connector.catalog.StagedTable;
27-
import org.apache.spark.sql.connector.catalog.SupportsDelete;
27+
import org.apache.spark.sql.connector.catalog.SupportsDeleteV2;
2828
import org.apache.spark.sql.connector.catalog.SupportsRead;
2929
import org.apache.spark.sql.connector.catalog.SupportsWrite;
3030
import org.apache.spark.sql.connector.catalog.Table;
3131
import org.apache.spark.sql.connector.catalog.TableCapability;
3232
import org.apache.spark.sql.connector.catalog.TableCatalog;
3333
import org.apache.spark.sql.connector.expressions.Transform;
34+
import org.apache.spark.sql.connector.expressions.filter.Predicate;
3435
import org.apache.spark.sql.connector.read.ScanBuilder;
3536
import org.apache.spark.sql.connector.write.LogicalWriteInfo;
3637
import org.apache.spark.sql.connector.write.WriteBuilder;
37-
import org.apache.spark.sql.sources.Filter;
3838
import org.apache.spark.sql.types.StructType;
3939
import org.apache.spark.sql.util.CaseInsensitiveStringMap;
4040

@@ -58,7 +58,7 @@
5858
* #capabilities()}.
5959
*/
6060
public class RollbackStagedTable
61-
implements StagedTable, SupportsRead, SupportsWrite, SupportsDelete {
61+
implements StagedTable, SupportsRead, SupportsWrite, SupportsDeleteV2 {
6262
private final TableCatalog catalog;
6363
private final Identifier ident;
6464
private final Table table;
@@ -106,8 +106,8 @@ public Set<TableCapability> capabilities() {
106106
}
107107

108108
@Override
109-
public void deleteWhere(Filter[] filters) {
110-
call(SupportsDelete.class, t -> t.deleteWhere(filters));
109+
public void deleteWhere(Predicate[] predicates) {
110+
call(SupportsDeleteV2.class, t -> t.deleteWhere(predicates));
111111
}
112112

113113
@Override

0 commit comments

Comments
 (0)