Skip to content

Commit 798e1a4

Browse files
authored
Spanner cherry-picks (#37330)
* Pin spanner to old version in gcp bom (#37329) * Fix spanner io hang by closing connections (#37327)
1 parent d31db5b commit 798e1a4

2 files changed

Lines changed: 15 additions & 4 deletions

File tree

sdks/java/bom/gcp/build.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,17 @@ apply from: '../common.gradle'
2020

2121
dependencies {
2222
api platform(project(":sdks:java:bom"))
23-
api platform(project.library.java.google_cloud_platform_libraries_bom)
23+
api platform(project.library.java.google_cloud_spanner_bom)
24+
api platform(project.library.java.google_cloud_platform_libraries_bom) {
25+
// TODO(https://github.com/apache/beam/issues/37328) remove exclude and google_cloud_spanner_bom after upstream and/or tests fixed
26+
exclude group: "com.google.cloud", module: "google-cloud-spanner"
27+
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-v1"
28+
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-admin-instance-v1"
29+
exclude group: "com.google.api.grpc", module: "proto-google-cloud-spanner-admin-database-v1"
30+
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-v1"
31+
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-admin-instance-v1"
32+
exclude group: "com.google.api.grpc", module: "grpc-google-cloud-spanner-admin-database-v1"
33+
}
2434
constraints {
2535
api project.library.java.guava
2636
}

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2101,9 +2101,10 @@ private static Dialect getDialect(SpannerConfig spannerConfig, PipelineOptions p
21012101
// Allow passing the credential from pipeline options to the getDialect() call.
21022102
SpannerConfig spannerConfigWithCredential =
21032103
buildSpannerConfigWithCredential(spannerConfig, pipelineOptions);
2104-
DatabaseClient databaseClient =
2105-
SpannerAccessor.getOrCreate(spannerConfigWithCredential).getDatabaseClient();
2106-
return databaseClient.getDialect();
2104+
try (SpannerAccessor sa = SpannerAccessor.getOrCreate(spannerConfigWithCredential)) {
2105+
DatabaseClient databaseClient = sa.getDatabaseClient();
2106+
return databaseClient.getDialect();
2107+
}
21072108
}
21082109

21092110
/**

0 commit comments

Comments
 (0)