Skip to content

GCP: Avoid duplicate BigQuery namespace loads #17871

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
charliec05 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −10
Open

GCP: Avoid duplicate BigQuery namespace loads #17871

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
8 changes: 0 additions & 8 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 @@ -249,16 +249,8 @@ public boolean setProperties(Namespace namespace, Map<String, String> properties

@Override
public boolean removeProperties(Namespace namespace, Set<String> properties) {
if (!namespaceExists(namespace)) {
throw new NoSuchNamespaceException("Namespace does not exist: %s", namespace);
}

Preconditions.checkNotNull(properties, "Invalid properties to remove: null");

if (properties.isEmpty()) {
return false;
}

return client.removeParameters(toDatasetReference(namespace), properties);
}

Expand Down
23 changes: 21 additions & 2 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 @@ -22,11 +22,17 @@
import static org.apache.iceberg.CatalogUtil.ICEBERG_CATALOG_TYPE_BIGQUERY;
import static org.apache.iceberg.gcp.bigquery.BigQueryProperties.PROJECT_ID;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

import com.google.api.services.bigquery.model.DatasetReference;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.iceberg.CatalogProperties;
import org.apache.iceberg.catalog.CatalogTests;
import org.apache.iceberg.catalog.Namespace;
Expand All @@ -45,6 +51,7 @@
public class TestBigQueryCatalog extends CatalogTests<BigQueryMetastoreCatalog> {
@TempDir private File tempFolder;
private BigQueryMetastoreCatalog catalog;
private FakeBigQueryMetastoreClient client;

@BeforeEach
public void before() throws Exception {
Expand Down Expand Up @@ -99,7 +106,7 @@ protected BigQueryMetastoreCatalog initCatalog(
String catalogName, Map<String, String> additionalProperties) {

String warehouseLocation = tempFolder.toPath().resolve("hive-warehouse").toString();
FakeBigQueryMetastoreClient fakeBigQueryClient = new FakeBigQueryMetastoreClient();
this.client = spy(new FakeBigQueryMetastoreClient());

Map<String, String> properties =
Map.of(
Expand Down Expand Up @@ -129,7 +136,7 @@ protected BigQueryMetastoreCatalog initCatalog(
.build(),
"project-id",
"us-central1",
fakeBigQueryClient);
client);

return tmpCatalog;
}
Expand Down Expand Up @@ -208,4 +215,16 @@ public void testIsValidIdentifierWithEmptyNamespace() {
assertThat(catalog.isValidIdentifier(TableIdentifier.of(Namespace.empty(), "table1")))
.isFalse();
}

@Test
public void removePropertiesLoadsNamespaceOnce() {
Namespace namespace = Namespace.of("namespace");
catalog.createNamespace(namespace, ImmutableMap.of("key", "value"));
clearInvocations(client);

assertThat(catalog.removeProperties(namespace, Set.of("key"))).isTrue();

verify(client, times(1))
.load(new DatasetReference().setProjectId("project-id").setDatasetId("namespace"));
}
}
Loading