Nessie: Use latest hash for catalog APIs #6789
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.iceberg.nessie; | ||
|
|
||
| import static org.apache.iceberg.types.Types.NestedField.required; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.URI; | ||
| import java.util.AbstractMap; | ||
| import java.util.Collections; | ||
| import org.apache.iceberg.Schema; | ||
| import org.apache.iceberg.Table; | ||
| import org.apache.iceberg.TableMetadata; | ||
| import org.apache.iceberg.TableOperations; | ||
| import org.apache.iceberg.catalog.Namespace; | ||
| import org.apache.iceberg.catalog.TableIdentifier; | ||
| import org.apache.iceberg.exceptions.CommitFailedException; | ||
| import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; | ||
| import org.apache.iceberg.types.Types; | ||
| import org.assertj.core.api.Assertions; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.projectnessie.client.ext.NessieClientFactory; | ||
| import org.projectnessie.client.ext.NessieClientUri; | ||
|
|
||
| public class TestMultipleClients extends BaseTestIceberg { | ||
|
|
||
| private static final String BRANCH = "multiple-clients-test"; | ||
| private static final Schema schema = | ||
| new Schema(Types.StructType.of(required(1, "id", Types.LongType.get())).fields()); | ||
|
|
||
| public TestMultipleClients() { | ||
| super(BRANCH); | ||
| } | ||
|
|
||
| // another client that connects to the same nessie server. | ||
| NessieCatalog anotherCatalog; | ||
|
|
||
| @Override | ||
| @BeforeEach | ||
| public void beforeEach(NessieClientFactory clientFactory, @NessieClientUri URI nessieUri) | ||
| throws IOException { | ||
| super.beforeEach(clientFactory, nessieUri); | ||
| anotherCatalog = initCatalog(branch); | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void afterEach() throws Exception { | ||
| anotherCatalog.close(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testListNamespaces() { | ||
| catalog.createNamespace(Namespace.of("db1"), Collections.emptyMap()); | ||
| Assertions.assertThat(catalog.listNamespaces()).containsExactlyInAnyOrder(Namespace.of("db1")); | ||
|
|
||
| // another client creates a namespace with the same nessie server | ||
| anotherCatalog.createNamespace(Namespace.of("db2"), Collections.emptyMap()); | ||
| Assertions.assertThat(anotherCatalog.listNamespaces()) | ||
| .containsExactlyInAnyOrder(Namespace.of("db1"), Namespace.of("db2")); | ||
|
|
||
| Assertions.assertThat(catalog.listNamespaces()) | ||
| .containsExactlyInAnyOrder(Namespace.of("db1"), Namespace.of("db2")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testLoadNamespaceMetadata() { | ||
| catalog.createNamespace(Namespace.of("namespace1"), Collections.emptyMap()); | ||
| Assertions.assertThat(catalog.listNamespaces()) | ||
| .containsExactlyInAnyOrder(Namespace.of("namespace1")); | ||
|
|
||
| // another client adds a metadata to the same namespace | ||
| anotherCatalog.setProperties(Namespace.of("namespace1"), Collections.singletonMap("k1", "v1")); | ||
| AbstractMap.SimpleEntry<String, String> entry = new AbstractMap.SimpleEntry<>("k1", "v1"); | ||
| Assertions.assertThat(anotherCatalog.loadNamespaceMetadata(Namespace.of("namespace1"))) | ||
| .containsExactly(entry); | ||
|
|
||
| Assertions.assertThat(catalog.loadNamespaceMetadata(Namespace.of("namespace1"))) | ||
| .containsExactly(entry); | ||
| } | ||
|
|
||
| @Test | ||
| public void testListTables() { | ||
| catalog.createTable(TableIdentifier.parse("foo.tbl1"), schema); | ||
| Assertions.assertThat(catalog.listTables(Namespace.of("foo"))) | ||
| .containsExactlyInAnyOrder(TableIdentifier.parse("foo.tbl1")); | ||
|
|
||
| // another client creates a table with the same nessie server | ||
| anotherCatalog.createTable(TableIdentifier.parse("foo.tbl2"), schema); | ||
| Assertions.assertThat(anotherCatalog.listTables(Namespace.of("foo"))) | ||
| .containsExactlyInAnyOrder( | ||
| TableIdentifier.parse("foo.tbl1"), TableIdentifier.parse("foo.tbl2")); | ||
|
|
||
| Assertions.assertThat(catalog.listTables(Namespace.of("foo"))) | ||
| .containsExactlyInAnyOrder( | ||
|
Member
Author
There was a problem hiding this comment. This particular check fails without this PR. As, |
||
| TableIdentifier.parse("foo.tbl1"), TableIdentifier.parse("foo.tbl2")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCommits() { | ||
| TableIdentifier identifier = TableIdentifier.parse("foo.tbl1"); | ||
| catalog.createTable(identifier, schema); | ||
| Table tableFromCatalog = catalog.loadTable(identifier); | ||
| tableFromCatalog.updateSchema().addColumn("x1", Types.LongType.get()).commit(); | ||
|
|
||
| Table tableFromAnotherCatalog = anotherCatalog.loadTable(identifier); | ||
| tableFromAnotherCatalog.updateSchema().addColumn("x2", Types.LongType.get()).commit(); | ||
|
|
||
| tableFromCatalog.updateSchema().addColumn("x3", Types.LongType.get()).commit(); | ||
| tableFromAnotherCatalog.updateSchema().addColumn("x4", Types.LongType.get()).commit(); | ||
|
|
||
| Assertions.assertThat(catalog.loadTable(identifier).schema().columns()).hasSize(5); | ||
| Assertions.assertThat(anotherCatalog.loadTable(identifier).schema().columns()).hasSize(5); | ||
| } | ||
|
|
||
| @Test | ||
| public void testConcurrentCommitsWithRefresh() { | ||
| TableIdentifier identifier = TableIdentifier.parse("foo.tbl1"); | ||
| catalog.createTable(identifier, schema); | ||
|
|
||
| String hashBefore = catalog.currentHash(); | ||
|
|
||
| TableOperations ops1 = catalog.newTableOps(identifier); | ||
| TableMetadata metadata1 = | ||
| TableMetadata.buildFrom(ops1.current()).setProperties(ImmutableMap.of("k1", "v1")).build(); | ||
|
|
||
| // commit should succeed | ||
| TableOperations ops2 = catalog.newTableOps(identifier); | ||
| TableMetadata metadata2 = | ||
| TableMetadata.buildFrom(ops2.current()).setProperties(ImmutableMap.of("k2", "v2")).build(); | ||
| ops2.commit(ops2.current(), metadata2); | ||
|
|
||
| // refresh the catalog's client. | ||
| String hashAfter = catalog.currentHash(); | ||
| Assertions.assertThat(hashBefore).isNotEqualTo(hashAfter); | ||
|
|
||
| // client refresh should not affect the ongoing commits (commit should still fail due staleness) | ||
| Assertions.assertThatThrownBy(() -> ops1.commit(ops1.current(), metadata1)) | ||
| .isInstanceOf(CommitFailedException.class) | ||
| .hasMessageContaining( | ||
| "Cannot commit: Reference hash is out of date. Update the reference 'multiple-clients-test' and try again"); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This method a safe cast - you replaced it (not clear for which reason) with an unconditional cast (and BTW left another then unused method).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
because all the places where this was called, already there is a check for
getRef().checkMutable(). So, no need for one more method call that checks if it is a branch. Hence, directly casting to branch.I will remove
isBranchtoo.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: how about returning a
BranchfromcheckMutableto avoid type casts in the calling code? (just a thought, no need to delay this PR because of this).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think
checkMutableis an early check to ensure we are working on a branch which will later be modified by a commit. WhereasgetReforgetAsBranchis to get the current state of the reference. I am not sure about combining them at the moment. I will explore this in a follow-up a suggested.