Skip to content

Spark: Add named constant for NO_ADVISORY_PARTITION_SIZE #15681

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
singhpk234 merged 2 commits into from
Mar 20, 2026
Merged

Spark: Add named constant for NO_ADVISORY_PARTITION_SIZE #15681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a441cab
Add named constant for `NO_ADVISORY_PARTITION_SIZE`
jbewing Mar 19, 2026
0ff2adb
PR feedback
jbewing Mar 20, 2026
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
13 changes: 9 additions & 4 deletions spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/SparkWriteRequirements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
/** A set of requirements such as distribution and ordering reported to Spark during writes. */
public class SparkWriteRequirements {

private static final long NO_ADVISORY_PARTITION_SIZE = 0;
public static final SparkWriteRequirements EMPTY =
new SparkWriteRequirements(Distributions.unspecified(), new SortOrder[0], 0);
new SparkWriteRequirements(
Distributions.unspecified(), new SortOrder[0], NO_ADVISORY_PARTITION_SIZE);

private final Distribution distribution;
private final SortOrder[] ordering;
Expand All @@ -37,7 +39,11 @@ public class SparkWriteRequirements {
Distribution distribution, SortOrder[] ordering, long advisoryPartitionSize) {
this.distribution = distribution;
this.ordering = ordering;
this.advisoryPartitionSize = advisoryPartitionSize;
// Spark prohibits requesting a particular advisory partition size without distribution
this.advisoryPartitionSize =
distribution instanceof UnspecifiedDistribution
? NO_ADVISORY_PARTITION_SIZE
: advisoryPartitionSize;
}

public Distribution distribution() {
Expand All @@ -53,7 +59,6 @@ public boolean hasOrdering() {
}

public long advisoryPartitionSize() {
// Spark prohibits requesting a particular advisory partition size without distribution
return distribution instanceof UnspecifiedDistribution ? 0 : advisoryPartitionSize;
return advisoryPartitionSize;
}
}
13 changes: 9 additions & 4 deletions spark/v4.0/spark/src/main/java/org/apache/iceberg/spark/SparkWriteRequirements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
/** A set of requirements such as distribution and ordering reported to Spark during writes. */
public class SparkWriteRequirements {

private static final long NO_ADVISORY_PARTITION_SIZE = 0;
public static final SparkWriteRequirements EMPTY =
new SparkWriteRequirements(Distributions.unspecified(), new SortOrder[0], 0);
new SparkWriteRequirements(
Distributions.unspecified(), new SortOrder[0], NO_ADVISORY_PARTITION_SIZE);

private final Distribution distribution;
private final SortOrder[] ordering;
Expand All @@ -37,7 +39,11 @@ public class SparkWriteRequirements {
Distribution distribution, SortOrder[] ordering, long advisoryPartitionSize) {
this.distribution = distribution;
this.ordering = ordering;
this.advisoryPartitionSize = advisoryPartitionSize;
// Spark prohibits requesting a particular advisory partition size without distribution
this.advisoryPartitionSize =
distribution instanceof UnspecifiedDistribution
? NO_ADVISORY_PARTITION_SIZE
: advisoryPartitionSize;
}

public Distribution distribution() {
Expand All @@ -53,7 +59,6 @@ public boolean hasOrdering() {
}

public long advisoryPartitionSize() {
// Spark prohibits requesting a particular advisory partition size without distribution
return distribution instanceof UnspecifiedDistribution ? 0 : advisoryPartitionSize;
return advisoryPartitionSize;
}
}
13 changes: 9 additions & 4 deletions spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/SparkWriteRequirements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
/** A set of requirements such as distribution and ordering reported to Spark during writes. */
public class SparkWriteRequirements {

private static final long NO_ADVISORY_PARTITION_SIZE = 0;
public static final SparkWriteRequirements EMPTY =
new SparkWriteRequirements(Distributions.unspecified(), new SortOrder[0], 0);
new SparkWriteRequirements(
Distributions.unspecified(), new SortOrder[0], NO_ADVISORY_PARTITION_SIZE);

private final Distribution distribution;
private final SortOrder[] ordering;
Expand All @@ -37,7 +39,11 @@ public class SparkWriteRequirements {
Distribution distribution, SortOrder[] ordering, long advisoryPartitionSize) {
this.distribution = distribution;
this.ordering = ordering;
this.advisoryPartitionSize = advisoryPartitionSize;
// Spark prohibits requesting a particular advisory partition size without distribution
this.advisoryPartitionSize =
distribution instanceof UnspecifiedDistribution
? NO_ADVISORY_PARTITION_SIZE
: advisoryPartitionSize;
}

public Distribution distribution() {
Expand All @@ -53,7 +59,6 @@ public boolean hasOrdering() {
}

public long advisoryPartitionSize() {
// Spark prohibits requesting a particular advisory partition size without distribution
return distribution instanceof UnspecifiedDistribution ? 0 : advisoryPartitionSize;
return advisoryPartitionSize;
}
}
Loading