Skip to content

chore: enable experimentalHost support for pgAdapter #3883

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
merged 2 commits into from
May 20, 2025
Merged

chore: enable experimentalHost support for pgAdapter #3883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de1f11b
chore: enable experimentalHost support for pgAdapter
sagnghos May 20, 2025
4d901d9
Merge branch 'main' into sagnghos/experimentalHostPG
rahul2393 May 20, 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
11 changes: 9 additions & 2 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/SpannerPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ static class SpannerPoolKey {
private final boolean enableEndToEndTracing;
private final String clientCertificate;
private final String clientCertificateKey;
private final boolean isExperimentalHost;

@VisibleForTesting
static SpannerPoolKey of(ConnectionOptions options) {
Expand Down Expand Up @@ -196,6 +197,7 @@ private SpannerPoolKey(ConnectionOptions options) throws IOException {
this.enableEndToEndTracing = options.isEndToEndTracingEnabled();
this.clientCertificate = options.getClientCertificate();
this.clientCertificateKey = options.getClientCertificateKey();
this.isExperimentalHost = options.isExperimentalHost();
}

@Override
Expand All @@ -220,7 +222,8 @@ public boolean equals(Object o) {
&& Objects.equals(this.enableApiTracing, other.enableApiTracing)
&& Objects.equals(this.enableEndToEndTracing, other.enableEndToEndTracing)
&& Objects.equals(this.clientCertificate, other.clientCertificate)
&& Objects.equals(this.clientCertificateKey, other.clientCertificateKey);
&& Objects.equals(this.clientCertificateKey, other.clientCertificateKey)
&& Objects.equals(this.isExperimentalHost, other.isExperimentalHost);
}

@Override
Expand All @@ -241,7 +244,8 @@ public int hashCode() {
this.enableApiTracing,
this.enableEndToEndTracing,
this.clientCertificate,
this.clientCertificateKey);
this.clientCertificateKey,
this.isExperimentalHost);
}
}

Expand Down Expand Up @@ -405,6 +409,9 @@ Spanner createSpanner(SpannerPoolKey key, ConnectionOptions options) {
if (key.clientCertificate != null && key.clientCertificateKey != null) {
builder.useClientCert(key.clientCertificate, key.clientCertificateKey);
}
if (key.isExperimentalHost) {
builder.setExperimentalHost(key.host);
}
if (options.getConfigurator() != null) {
options.getConfigurator().configure(builder);
}
Expand Down
Loading