Skip to content

Add support for dropping corrupted tables to Iceberg Nessie Catalog #20360

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
Jan 31, 2024
Merged

Add support for dropping corrupted tables to Iceberg Nessie Catalog #20360

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
11 changes: 10 additions & 1 deletion ...rino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/TrinoNessieCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.trino.spi.connector.RelationType;
import io.trino.spi.connector.SchemaNotFoundException;
import io.trino.spi.connector.SchemaTableName;
import io.trino.spi.connector.TableNotFoundException;
import io.trino.spi.security.TrinoPrincipal;
import io.trino.spi.type.TypeManager;
import org.apache.iceberg.BaseTable;
Expand All @@ -47,6 +48,7 @@
import org.apache.iceberg.catalog.Namespace;
import org.apache.iceberg.exceptions.NoSuchNamespaceException;
import org.apache.iceberg.nessie.NessieIcebergClient;
import org.projectnessie.model.IcebergTable;

import java.util.Iterator;
import java.util.List;
Expand Down Expand Up @@ -255,7 +257,14 @@ public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
@Override
public void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaTableName)
{
throw new TrinoException(NOT_SUPPORTED, "Cannot drop corrupted table %s from Iceberg Nessie catalog".formatted(schemaTableName));
IcebergTable table = nessieClient.table(toIdentifier(schemaTableName));
if (table == null) {
throw new TableNotFoundException(schemaTableName);
}
nessieClient.dropTable(toIdentifier(schemaTableName), true);
String tableLocation = table.getMetadataLocation().replaceFirst("/metadata/[^/]*$", "");
deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, tableLocation);
invalidateTableCache(schemaTableName);
}

@Override
Expand Down
8 changes: 0 additions & 8 deletions ...va/io/trino/plugin/iceberg/catalog/nessie/TestIcebergNessieCatalogConnectorSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,14 +261,6 @@ public void testDropTableWithMissingManifestListFile()
.hasMessageContaining("metadata location for register_table is not supported");
}

@Test
@Override
public void testDropTableWithNonExistentTableLocation()
{
assertThatThrownBy(super::testDropTableWithNonExistentTableLocation)
.hasMessageMatching("Cannot drop corrupted table (.*)");
}

@Override
protected boolean isFileSorted(Location path, String sortColumnName)
{
Expand Down