Skip to content

Fix disappearance issue of renamed schema in File metastore #13309

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
ebyhr merged 1 commit into from
Aug 3, 2022
Merged

Fix disappearance issue of renamed schema in File metastore #13309

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
18 changes: 17 additions & 1 deletion plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/FileHiveMetastore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,12 @@ public synchronized void renameDatabase(String databaseName, String newDatabaseN
getRequiredDatabase(databaseName);
verifyDatabaseNotExists(newDatabaseName);

Path oldDatabaseMetadataDirectory = getDatabaseMetadataDirectory(databaseName);
Path newDatabaseMetadataDirectory = getDatabaseMetadataDirectory(newDatabaseName);
try {
if (!metadataFileSystem.rename(getDatabaseMetadataDirectory(databaseName), getDatabaseMetadataDirectory(newDatabaseName))) {
renameSchemaFile(DATABASE, oldDatabaseMetadataDirectory, newDatabaseMetadataDirectory);

if (!metadataFileSystem.rename(oldDatabaseMetadataDirectory, newDatabaseMetadataDirectory)) {
throw new TrinoException(HIVE_METASTORE_ERROR, "Could not rename database metadata directory");
}
}
Expand Down Expand Up @@ -1331,6 +1335,18 @@ private <T> void writeFile(String type, Path path, JsonCodec<T> codec, T value,
}
}

private void renameSchemaFile(SchemaType type, Path oldMetadataDirectory, Path newMetadataDirectory)
{
try {
if (!metadataFileSystem.rename(getSchemaPath(type, oldMetadataDirectory), getSchemaPath(type, newMetadataDirectory))) {
throw new TrinoException(HIVE_METASTORE_ERROR, "Could not rename " + type + " schema");
}
}
catch (IOException e) {
throw new TrinoException(HIVE_METASTORE_ERROR, "Could not rename " + type + " schema", e);
}
}

private void deleteSchemaFile(SchemaType type, Path metadataDirectory)
{
try {
Expand Down
1 change: 1 addition & 0 deletions testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1792,6 +1792,7 @@ public void testRenameSchema()
try {
assertUpdate("CREATE SCHEMA " + schemaName);
assertUpdate("ALTER SCHEMA " + schemaName + " RENAME TO " + schemaName + "_renamed");
assertThat(computeActual("SHOW SCHEMAS").getOnlyColumnAsSet()).contains(schemaName + "_renamed");
}
finally {
assertUpdate("DROP SCHEMA IF EXISTS " + schemaName);
Expand Down