Skip to content

BigQuery: Add table validity check for BigQueryMetastoreCatalog #14113

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
kevinjqliu merged 8 commits into from
Sep 19, 2025
Merged

BigQuery: Add table validity check for BigQueryMetastoreCatalog #14113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bef7569
fix: Add table validity check for BigQueryMetastoreCatalog
thomaschow Sep 19, 2025
b050563
lint
thomaschow Sep 19, 2025
9a2e653
move test
thomaschow Sep 19, 2025
acddd8f
Update bigquery/src/test/java/org/apache/iceberg/gcp/bigquery/TestBig…
nastra Sep 19, 2025
8a33121
Apply suggestions from code review
nastra Sep 19, 2025
c9979c1
Update bigquery/src/test/java/org/apache/iceberg/gcp/bigquery/TestBig…
nastra Sep 19, 2025
16a835a
Apply suggestions from code review
nastra Sep 19, 2025
056da20
review feedback
thomaschow Sep 19, 2025
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
10 changes: 10 additions & 0 deletions 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 @@ -280,6 +280,16 @@ public Map<String, String> loadNamespaceMetadata(Namespace namespace) {
}
}

@Override
protected boolean isValidIdentifier(TableIdentifier identifier) {
try {
validateNamespace(identifier.namespace());
} catch (IllegalArgumentException e) {
return false;
}
return true;
}

@Override
public String name() {
return catalogName;
Expand Down
32 changes: 28 additions & 4 deletions bigquery/src/test/java/org/apache/iceberg/gcp/bigquery/TestBigQueryCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.apache.iceberg.CatalogUtil.ICEBERG_CATALOG_TYPE;
import static org.apache.iceberg.CatalogUtil.ICEBERG_CATALOG_TYPE_BIGQUERY;
import static org.apache.iceberg.gcp.bigquery.BigQueryMetastoreCatalog.PROJECT_ID;
import static org.assertj.core.api.Assertions.assertThat;

import java.io.File;
import java.util.List;
Expand Down Expand Up @@ -144,10 +145,6 @@ public void createTableTransaction(int formatVersion) {
@Test
public void testCreateTableWithDefaultColumnValue() {}

@Disabled("BigQuery Metastore does not support multi layer namespaces")
@Test
public void testLoadMetadataTable() {}

@Disabled("BigQuery Metastore does not support rename tables")
@Test
public void testRenameTable() {
Expand All @@ -171,4 +168,31 @@ public void renameTableNamespaceMissing() {
public void testRenameTableMissingSourceTable() {
super.testRenameTableMissingSourceTable();
}

@Test
public void testIsValidIdentifierWithValidSingleLevelNamespace() {
assertThat(catalog.isValidIdentifier(TableIdentifier.of("dataset1", "table1"))).isTrue();
}

@Test
public void testIsValidIdentifierWithInvalidMultiLevelNamespace() {
assertThat(
catalog.isValidIdentifier(
TableIdentifier.of(Namespace.of("level1", "level2"), "table1")))
.isFalse();
}

@Test
public void testIsValidIdentifierWithThreeLevelNamespace() {
assertThat(
catalog.isValidIdentifier(
TableIdentifier.of(Namespace.of("level1", "level2", "level3"), "table1")))
.isFalse();
}

@Test
public void testIsValidIdentifierWithEmptyNamespace() {
assertThat(catalog.isValidIdentifier(TableIdentifier.of(Namespace.empty(), "table1")))
.isFalse();
}
}