Skip to content

[lake/iceberg] Fix Iceberg table rebinding with different Fluss properties #4220

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

Open
litiliu wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −0
Open

[lake/iceberg] Fix Iceberg table rebinding with different Fluss properties #4220

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
3 changes: 3 additions & 0 deletions ...ke/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/IcebergLakeCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,9 @@ boolean isIcebergSortOrderCompatible(
boolean isIcebergPropertiesCompatible(
Map<String, String> existingProperties, Map<String, String> expectedProperties) {
for (Map.Entry<String, String> entry : expectedProperties.entrySet()) {
if (entry.getKey().startsWith(FLUSS_CONF_PREFIX)) {
continue;
}
String actual = existingProperties.get(entry.getKey());
Comment on lines +522 to 525
if (actual == null || !actual.equals(entry.getValue())) {
return false;
Expand Down
5 changes: 5 additions & 0 deletions ...luss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/IcebergLakeCatalogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1775,6 +1775,11 @@ void testIsIcebergPropertiesCompatible() {
existing.put("engine.internal", "whatever");
assertThat(flussIcebergCatalog.isIcebergPropertiesCompatible(existing, expected)).isTrue();

// Fluss properties are metadata owned by Fluss and may differ between descriptors.
expected.put("fluss.table.replication.factor", "1");
existing.put("fluss.table.replication.factor", "2");
assertThat(flussIcebergCatalog.isIcebergPropertiesCompatible(existing, expected)).isTrue();

// Existing missing an expected key -> incompatible.
existing = new HashMap<>();
existing.put("k1", "v1");
Comment on lines +1778 to 1785
Expand Down
Loading