Repository navigation
IcebergIO and AddFiles multi bucket catalog validation - #39907
Merged
Merged
Conversation
claudevdm
force-pushed
the
multi-bucket-catalog
branch
from
October 1, 2026 15:50
cdd7a9c to
59ceb8e
Compare
claudevdm
marked this pull request as ready for review
October 1, 2026 20:59
Collaborator
Author
|
R: @ahmedabu98 |
Contributor
|
Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment |
ahmedabu98
approved these changes
Oct 1, 2026
ahmedabu98
left a comment
Contributor
There was a problem hiding this comment.
Lets rename everything (utility classes, comments, etc) from "BigLake" to "Lakehouse"
Besides that, this LGTM
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Moves the BigLake REST catalog integration tests (
RESTCatalogBLMSIT,AddFilesIT) from a legacy single-bucket catalog (gs://bucketwarehouse) to a multiple-bucket catalog (bl://projects/P/catalogs/Cwarehouse), and adds coverage for tables that live outside the catalog's default location.Test-only change: no IcebergIO production code is touched. IcebergIO passes
catalog_propertiesstraight to Iceberg'sRESTCatalogand writes wherever the catalog places the table, so it needed no changes.Why
Google now documents single-bucket catalogs as legacy and recommends multiple-bucket catalogs (docs). In a multiple-bucket catalog the catalog name is independent of any bucket, and namespaces can be placed in any of the catalog's allowed locations. The existing tests assumed "catalog id == bucket name == data bucket" throughout.
What changed
BigLakeTestCatalog.java(new)beam.iceberg.biglake.warehouseandbeam.iceberg.biglake.locations.build.gradleintegrationTestsets those two properties. Defaults:bl://projects/apache-beam-testing/catalogs/beam-lakehouse-it, locationsgs://beam-lakehouse-it,gs://beam-lakehouse-it-added-path. Override with-PbiglakeWarehouse/-PbiglakeLocations.RESTCatalogBLMSIT.javatestWriteReadTableInAdditionalLocation. OverridescatalogCleanupto also delete table files.AddFilesIT.javatestBatchParquetImportToTableInAdditionalLocation.IcebergCatalogBaseIT.javareadRecordsis nowprotected. The GCS sweep incleanUpno longer throws when the warehouse is a bare bucket.IO_Iceberg_Integration_Tests.jsonNew tests
RESTCatalogBLMSIT.testWriteReadTableInAdditionalLocation: creates a namespace in the catalog's second bucket, writes withManaged.write(ICEBERG), and asserts the data files and table metadata are in that bucket.AddFilesIT.testBatchParquetImportToTableInAdditionalLocation: destination table in the second bucket, source parquet files in the default bucket. Verifies the files register and read back through both Iceberg and BigQueryIO.BigLake behaviour that shaped the tests
locationproperty rather than callingwithLocationon the table.dropNamespacesAndFilestherefore records each table's location before dropping it and deletes those objects afterwards. Previously every BigLake test run left its files behind.X-Iceberg-Access-Delegation: vended-credentialsheader. The helper always sends it; it is ignored by end-user-credential catalogs.Failed to refresh storage credentials ... Invalid credentials endpoint: nullfromGCSFileIOon Iceberg 1.11.0. It comes from a background refresh that fails harmlessly; the storage client refreshes its token through a separate path.Infra this depends on
beam-lakehouse-itinapache-beam-testing, with default locationgs://beam-lakehouse-itand additional locationgs://beam-lakehouse-it-added-path.storage.buckets.get(e.g.roles/storage.bucketViewer) for the BigQuery read in the cross-bucket AddFiles test.Running locally
The first location must be the catalog's default location and the second must be in a different bucket. A legacy
gs://bucketwarehouse is still accepted.Testing
Run against an equivalent multiple-bucket catalog in a separate GCP project:
RESTCatalogBLMSITandAddFilesITsuites passed before the rebase onto current master.AddFilesITtests, plusRESTCatalogBLMSIT.testWriteandtestWriteReadTableInAdditionalLocation, passed, with no objects left in either bucket.RESTCatalogBLMSIT.testWriteandAddFilesIT.testBatchParquetImportalso passed against a vended-credentials catalog, andtestWriteagainst a legacy single-bucket catalog.