Skip to content

BigQuery: Only load table metadata when dropping with purge #16885

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

Open
thswlsqls wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −1
Open

BigQuery: Only load table metadata when dropping with purge #16885

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
13 changes: 12 additions & 1 deletion bigquery/src/main/java/org/apache/iceberg/gcp/bigquery/BigQueryMetastoreCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.apache.iceberg.catalog.TableIdentifier;
import org.apache.iceberg.exceptions.NoSuchNamespaceException;
import org.apache.iceberg.exceptions.NoSuchTableException;
import org.apache.iceberg.exceptions.NotFoundException;
import org.apache.iceberg.hadoop.Configurable;
import org.apache.iceberg.io.CloseableGroup;
import org.apache.iceberg.io.FileIO;
Expand Down Expand Up @@ -183,7 +184,17 @@ public List<TableIdentifier> listTables(Namespace namespace) {
public boolean dropTable(TableIdentifier identifier, boolean purge) {
try {
TableOperations ops = newTableOps(identifier);
TableMetadata lastMetadata = ops.current();
TableMetadata lastMetadata = null;
if (purge) {
try {
lastMetadata = ops.current();
} catch (NotFoundException e) {
LOG.warn(
"Failed to load table metadata for table: {}, continuing drop without purge",
identifier,
e);
}
}

client.delete(toTableReference(identifier));

Expand Down
24 changes: 24 additions & 0 deletions bigquery/src/test/java/org/apache/iceberg/gcp/bigquery/TestBigQueryTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand Down Expand Up @@ -244,6 +245,29 @@ public void createTableCommitSucceeds() throws Exception {
assertThat(loadedTable.schema().asStruct()).isEqualTo(SCHEMA.asStruct());
}

@Test
public void dropTableWithoutPurgeDoesNotLoadMetadata() {
catalog.dropTable(IDENTIFIER, false);

// A plain drop must not trigger a tables.get on BigQuery, since the metadata is only needed for
// purge.
verify(client, never()).load(TABLE_REFERENCE);
verify(client, times(1)).delete(TABLE_REFERENCE);
}

@Test
public void dropTableWithPurgeLoadsMetadata() throws Exception {
Table createdTable = createTestTable();
reset(client);
when(client.load(TABLE_REFERENCE)).thenReturn(createdTable);

catalog.dropTable(IDENTIFIER, true);

// Purge needs the current metadata to delete the table's data files, so it must load it.
verify(client, times(1)).load(TABLE_REFERENCE);
verify(client, times(1)).delete(TABLE_REFERENCE);
}

/** Creates a test table to have Iceberg metadata files in place. */
private Table createTestTable() throws Exception {
when(client.load(TABLE_REFERENCE))
Expand Down