Skip to content

AWS: Fix the missing StorageDescriptor parameter after ALTER TABLE RENAME TO by iceberg. #3468

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
yyanyy merged 1 commit into from
Nov 4, 2021
Merged

AWS: Fix the missing StorageDescriptor parameter after ALTER TABLE RENAME TO by iceberg. #3468

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: 2 additions & 1 deletion aws/src/main/java/org/apache/iceberg/aws/glue/GlueCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ public void renameTable(TableIdentifier from, TableIdentifier to) {
TableInput.Builder tableInputBuilder = TableInput.builder()
.owner(fromTable.owner())
.tableType(fromTable.tableType())
.parameters(fromTable.parameters());
.parameters(fromTable.parameters())
.storageDescriptor(fromTable.storageDescriptor());

glue.createTable(CreateTableRequest.builder()
.catalogId(awsProperties.glueCatalogId())
Expand Down
44 changes: 44 additions & 0 deletions aws/src/test/java/org/apache/iceberg/aws/glue/GlueCatalogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import software.amazon.awssdk.services.glue.GlueClient;
import software.amazon.awssdk.services.glue.model.CreateDatabaseRequest;
import software.amazon.awssdk.services.glue.model.CreateDatabaseResponse;
import software.amazon.awssdk.services.glue.model.CreateTableRequest;
import software.amazon.awssdk.services.glue.model.CreateTableResponse;
import software.amazon.awssdk.services.glue.model.Database;
import software.amazon.awssdk.services.glue.model.DeleteDatabaseRequest;
import software.amazon.awssdk.services.glue.model.DeleteDatabaseResponse;
Expand All @@ -56,6 +58,7 @@
import software.amazon.awssdk.services.glue.model.GetTableResponse;
import software.amazon.awssdk.services.glue.model.GetTablesRequest;
import software.amazon.awssdk.services.glue.model.GetTablesResponse;
import software.amazon.awssdk.services.glue.model.StorageDescriptor;
import software.amazon.awssdk.services.glue.model.Table;
import software.amazon.awssdk.services.glue.model.UpdateDatabaseRequest;
import software.amazon.awssdk.services.glue.model.UpdateDatabaseResponse;
Expand Down Expand Up @@ -235,6 +238,47 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
Assert.assertEquals(0, counter.get());
}

@Test
public void renameTableWithStorageDescriptor() {
AtomicInteger counter = new AtomicInteger(1);

Map<String, String> parameters = new HashMap<>();
parameters.put(BaseMetastoreTableOperations.TABLE_TYPE_PROP,
BaseMetastoreTableOperations.ICEBERG_TABLE_TYPE_VALUE);

Map<String, String> storageDescriptorParameters = new HashMap<>();
storageDescriptorParameters.put("key_0", "value_0");

StorageDescriptor storageDescriptor = StorageDescriptor.builder().parameters(storageDescriptorParameters).build();

Mockito.doReturn(GetTableResponse.builder().table(
Table.builder()
.databaseName("db")
.name("t_renamed")
.parameters(parameters)
.storageDescriptor(storageDescriptor).build()).build()
).when(glue).getTable(Mockito.any(GetTableRequest.class));
Mockito.doReturn(GetTablesResponse.builder().build())
.when(glue).getTables(Mockito.any(GetTablesRequest.class));
Mockito.doReturn(GetDatabaseResponse.builder()
.database(Database.builder().name("db").build()).build())
.when(glue).getDatabase(Mockito.any(GetDatabaseRequest.class));

Mockito.doAnswer(new Answer() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
CreateTableRequest createTableRequest = (CreateTableRequest) invocation.getArguments()[0];
if (createTableRequest.tableInput().storageDescriptor().hasParameters()) {
counter.decrementAndGet();
}
return CreateTableResponse.builder().build();
}
}).when(glue).createTable(Mockito.any(CreateTableRequest.class));

glueCatalog.renameTable(TableIdentifier.of("db", "t"), TableIdentifier.of("db", "x_renamed"));
Assert.assertEquals(0, counter.get());
}

@Test
public void createNamespace() {
Mockito.doReturn(CreateDatabaseResponse.builder().build())
Expand Down