Skip to content

Spanner cherry-picks #37330

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
damccorm merged 2 commits into from
Jan 16, 2026
+15 −4
Merged

Spanner cherry-picks #37330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7367761
Pin spanner to old version in gcp bom (#37329)
damccorm Jan 16, 2026
7ebd7f4
Fix spanner io hang by closing connections (#37327)
damccorm Jan 16, 2026
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
12 changes: 11 additions & 1 deletion sdks/java/bom/gcp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,17 @@ apply from: '../common.gradle'

dependencies {
api platform(project(":sdks:java:bom"))
api platform(project.library.java.google_cloud_platform_libraries_bom)
api platform(project.library.java.google_cloud_spanner_bom)
api platform(project.library.java.google_cloud_platform_libraries_bom) {
// TODO(https://github.com/apache/beam/issues/37328) remove exclude and google_cloud_spanner_bom after upstream and/or tests fixed
exclude group: "com.google.cloud", module: "google-cloud-spanner"
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-v1"
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-admin-instance-v1"
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-admin-database-v1"
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-v1"
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-admin-instance-v1"
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-admin-database-v1"
}
constraints {
api project.library.java.guava
}
Expand Down
7 changes: 4 additions & 3 deletions .../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2101,9 +2101,10 @@ private static Dialect getDialect(SpannerConfig spannerConfig, PipelineOptions p
// Allow passing the credential from pipeline options to the getDialect() call.
SpannerConfig spannerConfigWithCredential =
buildSpannerConfigWithCredential(spannerConfig, pipelineOptions);
DatabaseClient databaseClient =
SpannerAccessor.getOrCreate(spannerConfigWithCredential).getDatabaseClient();
return databaseClient.getDialect();
try (SpannerAccessor sa = SpannerAccessor.getOrCreate(spannerConfigWithCredential)) {
DatabaseClient databaseClient = sa.getDatabaseClient();
return databaseClient.getDialect();
}
}

/**
Expand Down
Loading