ajantha-bhat commented on code in PR #5037:
URL: https://github.com/apache/iceberg/pull/5037#discussion_r901453932
##########
nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java:
##########
@@ -356,6 +361,107 @@ public void testListTables() {
Assertions.assertThat(catalog.tableExists(TABLE_IDENTIFIER)).isTrue();
}
+ private void testRegister(TableIdentifier identifier, List<String>
metadataVersionFiles) {
+ Assertions.assertThat(catalog.dropTable(identifier, false)).isFalse();
+ Assertions.assertThat(catalog.registerTable(
+ identifier,
Review Comment:
Indentations are still not correct. Please recheck the newly added codes
again.
##########
nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java:
##########
@@ -356,6 +361,107 @@ public void testListTables() {
Assertions.assertThat(catalog.tableExists(TABLE_IDENTIFIER)).isTrue();
}
+ private void testRegister(TableIdentifier identifier, List<String>
metadataVersionFiles) {
+ Assertions.assertThat(catalog.dropTable(identifier, false)).isFalse();
+ Assertions.assertThat(catalog.registerTable(
+ identifier,
+ "file:" + metadataVersionFiles.get(0))).isNotNull();
+ Table newTable = catalog.loadTable(identifier);
+ Assertions.assertThat(newTable).isNotNull();
+ TableOperations ops = ((HasTableOperations) newTable).operations();
+ String metadataLocation = ((NessieTableOperations)
ops).currentMetadataLocation();
+ Assertions.assertThat("file:" +
metadataVersionFiles.get(0)).isEqualTo(metadataLocation);
+ Assertions.assertThat(catalog.tableExists(identifier)).isTrue();
Review Comment:
load table is called above. So, this check is not needed as both are same
functionality.
##########
nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java:
##########
@@ -356,6 +361,107 @@ public void testListTables() {
Assertions.assertThat(catalog.tableExists(TABLE_IDENTIFIER)).isTrue();
}
+ private void testRegister(TableIdentifier identifier, List<String>
metadataVersionFiles) {
+ Assertions.assertThat(catalog.dropTable(identifier, false)).isFalse();
+ Assertions.assertThat(catalog.registerTable(
+ identifier,
+ "file:" + metadataVersionFiles.get(0))).isNotNull();
+ Table newTable = catalog.loadTable(identifier);
+ Assertions.assertThat(newTable).isNotNull();
+ TableOperations ops = ((HasTableOperations) newTable).operations();
+ String metadataLocation = ((NessieTableOperations)
ops).currentMetadataLocation();
+ Assertions.assertThat("file:" +
metadataVersionFiles.get(0)).isEqualTo(metadataLocation);
+ Assertions.assertThat(catalog.tableExists(identifier)).isTrue();
+ }
+
+ @Test
+ public void testRegisterTableWithGivenBranch() {
+ List<String> metadataVersionFiles = metadataVersionFiles(TABLE_NAME);
+ Assertions.assertThat(1).isEqualTo(metadataVersionFiles.size());
+ ImmutableTableReference tableReference =
+
ImmutableTableReference.builder().reference("main").name(TABLE_NAME).build();
+ TableIdentifier identifier = TableIdentifier.of(DB_NAME,
tableReference.toString());
+ testRegister(identifier, metadataVersionFiles);
+ }
+
+ @Test
+ public void testRegisterTableNegativeScenarios() throws
NessieConflictException, NessieNotFoundException {
+ List<String> metadataVersionFiles = metadataVersionFiles(TABLE_NAME);
+ Assertions.assertThat(1).isEqualTo(metadataVersionFiles.size());
+ // Case 1: Branch does not exist
+ Assertions.assertThatThrownBy(
+ () -> catalog.registerTable(
+ TableIdentifier.of(DB_NAME, "`" + TABLE_NAME +
"`@default"),
+ "file:" + metadataVersionFiles.get(0)))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Nessie ref 'default' does not exist");
+ // Case 2: Table Already Exists
+ Assertions.assertThatThrownBy(() ->
catalog.registerTable(TABLE_IDENTIFIER, "file:" + metadataVersionFiles.get(0)))
+ .isInstanceOf(AlreadyExistsException.class)
+ .hasMessage(
+ "Table already exists: db.tbl");
+ // Case 3: Registering using a tag
+ api.createReference().sourceRefName(BRANCH).reference(Tag.of("tag_1",
catalog.currentHash())).create();
+ Assertions.assertThatThrownBy(
+ () -> catalog.registerTable(
+ TableIdentifier.of(DB_NAME, "`" + TABLE_NAME +
"`@tag_1"),
+ "file:" + metadataVersionFiles.get(0)))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("You can only mutate tables when using a branch
without a hash or timestamp.");
+ // Case 4: non-null metadata path with null metadata location
+ Assertions.assertThat(catalog.dropTable(TABLE_IDENTIFIER, false)).isTrue();
+ Assertions.assertThatThrownBy(
+ () -> catalog.registerTable(TABLE_IDENTIFIER, "file:" +
metadataVersionFiles.get(0) + "invalidName"))
+ .isInstanceOf(NotFoundException.class);
+ }
+
+ @Test
+ public void testRegisterTableWithDefaultBranch() {
+ List<String> metadataVersionFiles = metadataVersionFiles(TABLE_NAME);
+ Assertions.assertThat(1).isEqualTo(metadataVersionFiles.size());
+ Assertions.assertThat(catalog.dropTable(TABLE_IDENTIFIER)).isTrue();
+ Assertions.assertThat(catalog.registerTable(TABLE_IDENTIFIER, "file:" +
metadataVersionFiles.get(0))).isNotNull();
Review Comment:
suppose to reuse testRegister here?
##########
nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java:
##########
@@ -356,6 +361,107 @@ public void testListTables() {
Assertions.assertThat(catalog.tableExists(TABLE_IDENTIFIER)).isTrue();
}
+ private void testRegister(TableIdentifier identifier, List<String>
metadataVersionFiles) {
+ Assertions.assertThat(catalog.dropTable(identifier, false)).isFalse();
+ Assertions.assertThat(catalog.registerTable(
+ identifier,
+ "file:" + metadataVersionFiles.get(0))).isNotNull();
+ Table newTable = catalog.loadTable(identifier);
+ Assertions.assertThat(newTable).isNotNull();
+ TableOperations ops = ((HasTableOperations) newTable).operations();
+ String metadataLocation = ((NessieTableOperations)
ops).currentMetadataLocation();
+ Assertions.assertThat("file:" +
metadataVersionFiles.get(0)).isEqualTo(metadataLocation);
+ Assertions.assertThat(catalog.tableExists(identifier)).isTrue();
+ }
+
+ @Test
+ public void testRegisterTableWithGivenBranch() {
+ List<String> metadataVersionFiles = metadataVersionFiles(TABLE_NAME);
+ Assertions.assertThat(1).isEqualTo(metadataVersionFiles.size());
+ ImmutableTableReference tableReference =
+
ImmutableTableReference.builder().reference("main").name(TABLE_NAME).build();
+ TableIdentifier identifier = TableIdentifier.of(DB_NAME,
tableReference.toString());
+ testRegister(identifier, metadataVersionFiles);
Review Comment:
testRegister has some validation, it was suppose to check against "main"?
I think it is checking with default branch.
##########
nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java:
##########
@@ -356,6 +361,107 @@ public void testListTables() {
Assertions.assertThat(catalog.tableExists(TABLE_IDENTIFIER)).isTrue();
}
+ private void testRegister(TableIdentifier identifier, List<String>
metadataVersionFiles) {
+ Assertions.assertThat(catalog.dropTable(identifier, false)).isFalse();
+ Assertions.assertThat(catalog.registerTable(
+ identifier,
+ "file:" + metadataVersionFiles.get(0))).isNotNull();
+ Table newTable = catalog.loadTable(identifier);
+ Assertions.assertThat(newTable).isNotNull();
+ TableOperations ops = ((HasTableOperations) newTable).operations();
+ String metadataLocation = ((NessieTableOperations)
ops).currentMetadataLocation();
+ Assertions.assertThat("file:" +
metadataVersionFiles.get(0)).isEqualTo(metadataLocation);
+ Assertions.assertThat(catalog.tableExists(identifier)).isTrue();
+ }
+
+ @Test
+ public void testRegisterTableWithGivenBranch() {
+ List<String> metadataVersionFiles = metadataVersionFiles(TABLE_NAME);
+ Assertions.assertThat(1).isEqualTo(metadataVersionFiles.size());
+ ImmutableTableReference tableReference =
+
ImmutableTableReference.builder().reference("main").name(TABLE_NAME).build();
+ TableIdentifier identifier = TableIdentifier.of(DB_NAME,
tableReference.toString());
+ testRegister(identifier, metadataVersionFiles);
+ }
+
+ @Test
+ public void testRegisterTableNegativeScenarios() throws
NessieConflictException, NessieNotFoundException {
+ List<String> metadataVersionFiles = metadataVersionFiles(TABLE_NAME);
+ Assertions.assertThat(1).isEqualTo(metadataVersionFiles.size());
+ // Case 1: Branch does not exist
+ Assertions.assertThatThrownBy(
+ () -> catalog.registerTable(
+ TableIdentifier.of(DB_NAME, "`" + TABLE_NAME +
"`@default"),
+ "file:" + metadataVersionFiles.get(0)))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Nessie ref 'default' does not exist");
+ // Case 2: Table Already Exists
+ Assertions.assertThatThrownBy(() ->
catalog.registerTable(TABLE_IDENTIFIER, "file:" + metadataVersionFiles.get(0)))
+ .isInstanceOf(AlreadyExistsException.class)
+ .hasMessage(
+ "Table already exists: db.tbl");
+ // Case 3: Registering using a tag
+ api.createReference().sourceRefName(BRANCH).reference(Tag.of("tag_1",
catalog.currentHash())).create();
+ Assertions.assertThatThrownBy(
+ () -> catalog.registerTable(
+ TableIdentifier.of(DB_NAME, "`" + TABLE_NAME +
"`@tag_1"),
+ "file:" + metadataVersionFiles.get(0)))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("You can only mutate tables when using a branch
without a hash or timestamp.");
+ // Case 4: non-null metadata path with null metadata location
+ Assertions.assertThat(catalog.dropTable(TABLE_IDENTIFIER, false)).isTrue();
+ Assertions.assertThatThrownBy(
+ () -> catalog.registerTable(TABLE_IDENTIFIER, "file:" +
metadataVersionFiles.get(0) + "invalidName"))
+ .isInstanceOf(NotFoundException.class);
+ }
+
+ @Test
+ public void testRegisterTableWithDefaultBranch() {
+ List<String> metadataVersionFiles = metadataVersionFiles(TABLE_NAME);
+ Assertions.assertThat(1).isEqualTo(metadataVersionFiles.size());
+ Assertions.assertThat(catalog.dropTable(TABLE_IDENTIFIER)).isTrue();
+ Assertions.assertThat(catalog.registerTable(TABLE_IDENTIFIER, "file:" +
metadataVersionFiles.get(0))).isNotNull();
+
+ Table newTable = catalog.loadTable(TABLE_IDENTIFIER);
+ Assertions.assertThat(newTable).isNotNull();
+ TableOperations ops = ((HasTableOperations) newTable).operations();
+ String metadataLocation = ((NessieTableOperations)
ops).currentMetadataLocation();
+ Assertions.assertThat("file:" +
metadataVersionFiles.get(0)).isEqualTo(metadataLocation);
+ Assertions.assertThat(catalog.tableExists(TABLE_IDENTIFIER)).isTrue();
+ }
+
+ @Ignore
+ public void testRegisterTableMoreThanOneBranch() throws
NessieConflictException, NessieNotFoundException {
+ // Dependency on PR #5033 for the backend bug fixes in drop table.
+ List<String> metadataVersionFiles = metadataVersionFiles(TABLE_NAME);
+ Assertions.assertThat(1).isEqualTo(metadataVersionFiles.size());
+ catalog.dropTable(TableIdentifier.of(DB_NAME, "`" + TABLE_NAME +
"@main`"), false);
Review Comment:
Test case is ignored but the comments of using TableReference and
indentation etc are still applicable to this testcase
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
