Skip to content
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

Fix update-requirement check to handle "no current snapshot" requirement properly #10064

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Fix update-requirement check to handle "no current snapshot" requirement properly #10064

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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ as necessary. Empty sections will not end in the release notes.

### Fixes

- Fix handling of Iceberg update-requirement "no current snapshot"

### Commits

## [0.101.0] Release (2024-12-06)
Expand Down
12 changes: 12 additions & 0 deletions ...g/src/main/java/org/projectnessie/catalog/formats/iceberg/rest/IcebergMetadataUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,15 @@ interface SetSnapshotRef extends IcebergMetadataUpdate {

@Override
default void applyToTable(IcebergTableMetadataUpdateState state) {
checkState(
"main".equals(refName()) && "branch".equals(type()),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be hard-coded to main or set to the repository's default branch?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is "Iceberg's main" - not Nessie's default branch. (Confusing, yea...)

"Nessie only supports the current snapshot-ref 'main', use Nessie's branches instead");
var currentSnapshotId = state.snapshot().icebergSnapshotId();
checkState(
Objects.equals(snapshotId(), state.snapshot().icebergSnapshotId()),
"Snapshot ID mismatch, must be %s, but is %s",
currentSnapshotId,
snapshotId());
state.addCatalogOp(CatalogOps.META_SET_SNAPSHOT_REF);
// NOP - This class is used for JSON deserialization only.
// Nessie has catalog-level branches and tags.
Expand All @@ -718,6 +727,9 @@ interface RemoveSnapshotRef extends IcebergMetadataUpdate {

@Override
default void applyToTable(IcebergTableMetadataUpdateState state) {
checkState(
"main".equals(refName()),
"Nessie only supports the Iceberg snapshot-ref 'main', use Nessie's branches instead");
state.addCatalogOp(CatalogOps.META_REMOVE_SNAPSHOT_REF);
// NOP - This class is used for JSON deserialization only.
// Nessie has catalog-level branches and tags.
Expand Down
29 changes: 22 additions & 7 deletions ...rc/main/java/org/projectnessie/catalog/formats/iceberg/rest/IcebergUpdateRequirement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.projectnessie.catalog.formats.iceberg.rest;

import static java.lang.String.format;
import static org.projectnessie.catalog.formats.iceberg.meta.IcebergTableMetadata.NO_SNAPSHOT_ID;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonSubTypes;
Expand Down Expand Up @@ -96,7 +97,7 @@ interface AssertUUID extends IcebergUpdateRequirement {
default void check(ContentKey key, NessieEntitySnapshot<?> snapshot) {
String tableUuid = snapshot.entity().icebergUuid();
checkState(
uuid().equals(tableUuid),
Objects.equals(uuid(), tableUuid),
key,
"Requirement failed: UUID does not match: expected %s != %s",
tableUuid,
Expand Down Expand Up @@ -172,13 +173,27 @@ default void checkForTable(
NessieTableSnapshot snapshot, boolean tableExists, ContentKey contentKey) {
// Cannot really check the reference name, because the ref-name in a table-metadata is
// something very different from Nessie references
Long id = snapshotId();
if (id != null) {
checkState(
"main".equals(ref()),
contentKey,
"Requirement failed: ref must be 'main', but is '%s'",
ref());

Long expectedId = snapshotId();
Long currentId = snapshot.icebergSnapshotId();
if (expectedId != null) {
checkState(
Objects.equals(id, snapshot.icebergSnapshotId()),
Objects.equals(expectedId, currentId),
contentKey,
"Requirement failed: snapshot id changed: expected %s != %s",
id,
expectedId,
snapshotId());
} else {
// 'null' means "no current snapshot"
checkState(
currentId == null || currentId == NO_SNAPSHOT_ID,
contentKey,
"Requirement failed: snapshot id mismatch: expected no current snapshot, but has %s",
snapshotId());
}
}
Expand All @@ -196,7 +211,7 @@ default void checkForTable(
NessieTableSnapshot snapshot, boolean tableExists, ContentKey contentKey) {
Integer id = snapshot.icebergLastColumnId();
checkState(
lastAssignedFieldId() == id,
Objects.equals(id, lastAssignedFieldId()),
contentKey,
"Requirement failed: last assigned field id changed: expected %s != %s",
id,
Expand Down Expand Up @@ -246,7 +261,7 @@ default void checkForTable(
NessieTableSnapshot snapshot, boolean tableExists, ContentKey contentKey) {
Integer id = snapshot.icebergLastPartitionId();
checkState(
lastAssignedPartitionId() == id,
Objects.equals(lastAssignedPartitionId(), id),
contentKey,
"Requirement failed: last assigned partition id changed: expected %s != %s",
id,
Expand Down