Skip to content

Spark: Validate Z-order rewrite does not conflict with internal ICEZVALUE column name #15706

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
RussellSpitzer merged 1 commit into from
Mar 27, 2026
Merged

Spark: Validate Z-order rewrite does not conflict with internal ICEZVALUE column name #15706

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions ....4/spark/src/main/java/org/apache/iceberg/spark/actions/SparkZOrderFileRewriteRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,13 @@ private List<String> validZOrderColNames(
Set<Integer> identityPartitionFieldIds = table.spec().identitySourceIds();
boolean caseSensitive = SparkUtil.caseSensitive(spark);

Preconditions.checkArgument(
caseSensitive
? schema.findField(Z_COLUMN) == null
: schema.caseInsensitiveFindField(Z_COLUMN) == null,
"Cannot zorder because the table has a column named '%s', which conflicts with Iceberg's internal Z-order column name",
Z_COLUMN);

List<String> validZOrderColNames = Lists.newArrayList();

for (String colName : inputZOrderColNames) {
Expand Down
20 changes: 20 additions & 0 deletions ...v3.4/spark/src/test/java/org/apache/iceberg/spark/actions/TestRewriteDataFilesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1766,6 +1766,26 @@ public void testCommitStateUnknownException() {
shouldHaveSnapshots(table, 2); // Commit actually Succeeded
}

@TestTemplate
public void testZOrderWithZColumnCollision() {
Schema schema =
new Schema(
optional(1, "c1", Types.IntegerType.get()),
optional(2, "c2", Types.StringType.get()),
optional(3, "ICEZVALUE", Types.StringType.get()));

Table table =
TABLES.create(
schema,
PartitionSpec.unpartitioned(),
ImmutableMap.of(TableProperties.FORMAT_VERSION, String.valueOf(formatVersion)),
tableLocation);

assertThatThrownBy(() -> basicRewrite(table).zOrder("c1", "c2").execute())
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("Cannot zorder because the table has a column named 'ICEZVALUE'");
}

@TestTemplate
public void testZOrderSort() {
int originalFiles = 20;
Expand Down
7 changes: 7 additions & 0 deletions ....5/spark/src/main/java/org/apache/iceberg/spark/actions/SparkZOrderFileRewriteRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,13 @@ private List<String> validZOrderColNames(
Set<Integer> identityPartitionFieldIds = table.spec().identitySourceIds();
boolean caseSensitive = SparkUtil.caseSensitive(spark);

Preconditions.checkArgument(
caseSensitive
? schema.findField(Z_COLUMN) == null
: schema.caseInsensitiveFindField(Z_COLUMN) == null,
"Cannot zorder because the table has a column named '%s', which conflicts with Iceberg's internal Z-order column name",
Z_COLUMN);

List<String> validZOrderColNames = Lists.newArrayList();

for (String colName : inputZOrderColNames) {
Expand Down
20 changes: 20 additions & 0 deletions ...v3.5/spark/src/test/java/org/apache/iceberg/spark/actions/TestRewriteDataFilesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1766,6 +1766,26 @@ public void testCommitStateUnknownException() {
shouldHaveSnapshots(table, 2); // Commit actually Succeeded
}

@TestTemplate
public void testZOrderWithZColumnCollision() {
Schema schema =
new Schema(
optional(1, "c1", Types.IntegerType.get()),
optional(2, "c2", Types.StringType.get()),
optional(3, "ICEZVALUE", Types.StringType.get()));

Table table =
TABLES.create(
schema,
PartitionSpec.unpartitioned(),
ImmutableMap.of(TableProperties.FORMAT_VERSION, String.valueOf(formatVersion)),
tableLocation);

assertThatThrownBy(() -> basicRewrite(table).zOrder("c1", "c2").execute())
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("Cannot zorder because the table has a column named 'ICEZVALUE'");
}

@TestTemplate
public void testZOrderSort() {
int originalFiles = 20;
Expand Down
7 changes: 7 additions & 0 deletions ....0/spark/src/main/java/org/apache/iceberg/spark/actions/SparkZOrderFileRewriteRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,13 @@ private List<String> validZOrderColNames(
Set<Integer> identityPartitionFieldIds = table.spec().identitySourceIds();
boolean caseSensitive = SparkUtil.caseSensitive(spark);

Preconditions.checkArgument(
caseSensitive
? schema.findField(Z_COLUMN) == null
: schema.caseInsensitiveFindField(Z_COLUMN) == null,
"Cannot zorder because the table has a column named '%s', which conflicts with Iceberg's internal Z-order column name",
Z_COLUMN);

List<String> validZOrderColNames = Lists.newArrayList();

for (String colName : inputZOrderColNames) {
Expand Down
20 changes: 20 additions & 0 deletions ...v4.0/spark/src/test/java/org/apache/iceberg/spark/actions/TestRewriteDataFilesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1769,6 +1769,26 @@ public void testCommitStateUnknownException() {
shouldHaveSnapshots(table, 2); // Commit actually Succeeded
}

@TestTemplate
public void testZOrderWithZColumnCollision() {
Schema schema =
new Schema(
optional(1, "c1", Types.IntegerType.get()),
optional(2, "c2", Types.StringType.get()),
optional(3, "ICEZVALUE", Types.StringType.get()));

Table table =
TABLES.create(
schema,
PartitionSpec.unpartitioned(),
ImmutableMap.of(TableProperties.FORMAT_VERSION, String.valueOf(formatVersion)),
tableLocation);

assertThatThrownBy(() -> basicRewrite(table).zOrder("c1", "c2").execute())
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("Cannot zorder because the table has a column named 'ICEZVALUE'");
}

@TestTemplate
public void testZOrderSort() {
int originalFiles = 20;
Expand Down
7 changes: 7 additions & 0 deletions ....1/spark/src/main/java/org/apache/iceberg/spark/actions/SparkZOrderFileRewriteRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,13 @@ private List<String> validZOrderColNames(
Set<Integer> identityPartitionFieldIds = table.spec().identitySourceIds();
boolean caseSensitive = SparkUtil.caseSensitive(spark);

Preconditions.checkArgument(
caseSensitive
? schema.findField(Z_COLUMN) == null
: schema.caseInsensitiveFindField(Z_COLUMN) == null,
"Cannot zorder because the table has a column named '%s', which conflicts with Iceberg's internal Z-order column name",
Z_COLUMN);

List<String> validZOrderColNames = Lists.newArrayList();

for (String colName : inputZOrderColNames) {
Expand Down
20 changes: 20 additions & 0 deletions ...v4.1/spark/src/test/java/org/apache/iceberg/spark/actions/TestRewriteDataFilesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1769,6 +1769,26 @@ public void testCommitStateUnknownException() {
shouldHaveSnapshots(table, 2); // Commit actually Succeeded
}

@TestTemplate
public void testZOrderWithZColumnCollision() {
Schema schema =
new Schema(
optional(1, "c1", Types.IntegerType.get()),
optional(2, "c2", Types.StringType.get()),
optional(3, "ICEZVALUE", Types.StringType.get()));

Table table =
TABLES.create(
schema,
PartitionSpec.unpartitioned(),
ImmutableMap.of(TableProperties.FORMAT_VERSION, String.valueOf(formatVersion)),
tableLocation);

assertThatThrownBy(() -> basicRewrite(table).zOrder("c1", "c2").execute())
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("Cannot zorder because the table has a column named 'ICEZVALUE'");
}

@TestTemplate
public void testZOrderSort() {
int originalFiles = 20;
Expand Down
Loading