Skip to content

Commit 0d2152c

Browse files
chore(spanner): accomodate experimental host in samples
1 parent 5c890f8 commit 0d2152c

6 files changed

Lines changed: 61 additions & 31 deletions

File tree

java-spanner/samples/snippets/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>com.google.cloud</groupId>
3636
<artifactId>libraries-bom</artifactId>
37-
<version>26.76.0</version>
37+
<version>26.79.0</version>
3838
<type>pom</type>
3939
<scope>import</scope>
4040
</dependency>
@@ -228,7 +228,7 @@
228228
<archive>
229229
<index>false</index>
230230
<manifest>
231-
<mainClass>com.example.spanner.admin.archived.SpannerSample</mainClass>
231+
<mainClass>com.example.spanner.SpannerSample</mainClass>
232232
<addClasspath>true</addClasspath>
233233
<classpathPrefix>lib/</classpathPrefix>
234234
</manifest>

java-spanner/samples/snippets/src/main/java/com/example/spanner/MutableCredentialsExample.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.concurrent.ScheduledExecutorService;
3434
import java.util.concurrent.ThreadFactory;
3535
import java.util.concurrent.TimeUnit;
36+
import java.util.concurrent.atomic.AtomicReference;
3637

3738
public class MutableCredentialsExample {
3839

java-spanner/samples/snippets/src/main/java/com/example/spanner/PgSpannerSample.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package com.example.spanner;
1818

19+
import static com.google.cloud.spanner.testing.ExperimentalHostHelper.isExperimentalHost;
20+
import static com.google.cloud.spanner.testing.ExperimentalHostHelper.setExperimentalHostSpannerOptions;
21+
1922
import com.google.api.gax.paging.Page;
2023
import com.google.cloud.ByteArray;
2124
import com.google.cloud.Date;
@@ -1192,17 +1195,19 @@ static void queryWithNumeric(DatabaseClient dbClient) {
11921195

11931196
// [START spanner_postgresql_create_client_with_query_options]
11941197
static void clientWithQueryOptions(DatabaseId db) {
1195-
SpannerOptions options =
1196-
SpannerOptions.newBuilder()
1197-
.setDefaultQueryOptions(
1198+
SpannerOptions.Builder builder = SpannerOptions.newBuilder();
1199+
builder.setDefaultQueryOptions(
11981200
db, ExecuteSqlRequest.QueryOptions
11991201
.newBuilder()
12001202
.setOptimizerVersion("1")
12011203
// The list of available statistics packages can be found by querying the
12021204
// "INFORMATION_SCHEMA.spanner_postgresql_STATISTICS" table.
12031205
.setOptimizerStatisticsPackage("latest")
1204-
.build())
1205-
.build();
1206+
.build());
1207+
if (isExperimentalHost()) {
1208+
setExperimentalHostSpannerOptions(builder);
1209+
}
1210+
SpannerOptions options = builder.build();
12061211
Spanner spanner = options.getService();
12071212
DatabaseClient dbClient = spanner.getDatabaseClient(db);
12081213
try (ResultSet resultSet =
@@ -1548,7 +1553,11 @@ public static void main(String[] args) {
15481553
printUsageAndExit();
15491554
}
15501555
// [START spanner_init_client]
1551-
SpannerOptions options = SpannerOptions.newBuilder().build();
1556+
SpannerOptions.Builder builder = SpannerOptions.newBuilder();
1557+
if (isExperimentalHost()) {
1558+
setExperimentalHostSpannerOptions(builder);
1559+
}
1560+
SpannerOptions options = builder.build();
15521561
Spanner spanner = options.getService();
15531562
DatabaseAdminClient dbAdminClient = null;
15541563
try {

java-spanner/samples/snippets/src/main/java/com/example/spanner/QueryInformationSchemaDatabaseOptionsSample.java

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616

1717
package com.example.spanner;
1818

19-
//[START spanner_query_information_schema_database_options]
19+
// [START spanner_query_information_schema_database_options]
20+
21+
import static com.google.cloud.spanner.testing.ExperimentalHostHelper.isExperimentalHost;
22+
import static com.google.cloud.spanner.testing.ExperimentalHostHelper.setExperimentalHostSpannerOptions;
2023

2124
import com.google.cloud.spanner.DatabaseClient;
2225
import com.google.cloud.spanner.DatabaseId;
@@ -37,33 +40,34 @@ static void queryInformationSchemaDatabaseOptions() {
3740

3841
static void queryInformationSchemaDatabaseOptions(
3942
String projectId, String instanceId, String databaseId) {
40-
try (Spanner spanner = SpannerOptions
41-
.newBuilder()
42-
.setProjectId(projectId)
43-
.build()
44-
.getService()) {
43+
SpannerOptions.Builder builder = SpannerOptions.newBuilder();
44+
builder.setProjectId(projectId);
45+
if (isExperimentalHost()) {
46+
setExperimentalHostSpannerOptions(builder);
47+
}
48+
try (Spanner spanner = builder.build().getService()) {
4549
final DatabaseId id = DatabaseId.of(projectId, instanceId, databaseId);
4650
final DatabaseClient databaseClient = spanner.getDatabaseClient(id);
4751

48-
try (ResultSet resultSet = databaseClient
49-
.singleUse()
50-
.executeQuery(Statement.of(
51-
"SELECT OPTION_NAME, OPTION_VALUE"
52-
+ " FROM INFORMATION_SCHEMA.DATABASE_OPTIONS"
53-
+ " WHERE OPTION_NAME = 'default_leader'")
54-
)) {
52+
try (ResultSet resultSet =
53+
databaseClient
54+
.singleUse()
55+
.executeQuery(
56+
Statement.of(
57+
"SELECT OPTION_NAME, OPTION_VALUE"
58+
+ " FROM INFORMATION_SCHEMA.DATABASE_OPTIONS"
59+
+ " WHERE OPTION_NAME = 'default_leader'"))) {
5560
if (resultSet.next()) {
5661
final String optionName = resultSet.getString("OPTION_NAME");
5762
final String optionValue = resultSet.getString("OPTION_VALUE");
5863

5964
System.out.println("The " + optionName + " for " + id + " is " + optionValue);
6065
} else {
6166
System.out.println(
62-
"Database " + id + " does not have a value for option 'default_leader'"
63-
);
67+
"Database " + id + " does not have a value for option 'default_leader'");
6468
}
6569
}
6670
}
6771
}
6872
}
69-
//[END spanner_query_information_schema_database_options]
73+
// [END spanner_query_information_schema_database_options]

java-spanner/samples/snippets/src/main/java/com/example/spanner/SpannerGraphSample.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package com.example.spanner;
1818

19+
import static com.google.cloud.spanner.testing.ExperimentalHostHelper.isExperimentalHost;
20+
import static com.google.cloud.spanner.testing.ExperimentalHostHelper.setExperimentalHostSpannerOptions;
21+
1922
import com.google.cloud.Timestamp;
2023
import com.google.cloud.spanner.DatabaseClient;
2124
import com.google.cloud.spanner.DatabaseId;
@@ -554,7 +557,11 @@ public static void main(String[] args) {
554557
if (args.length != 3 && args.length != 4) {
555558
printUsageAndExit();
556559
}
557-
SpannerOptions options = SpannerOptions.newBuilder().build();
560+
SpannerOptions.Builder builder = SpannerOptions.newBuilder();
561+
if (isExperimentalHost()) {
562+
setExperimentalHostSpannerOptions(builder);
563+
}
564+
SpannerOptions options = builder.build();
558565
Spanner spanner = options.getService();
559566
DatabaseAdminClient dbAdminClient = null;
560567
try {

java-spanner/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package com.example.spanner;
1818

19+
import static com.google.cloud.spanner.testing.ExperimentalHostHelper.isExperimentalHost;
20+
import static com.google.cloud.spanner.testing.ExperimentalHostHelper.setExperimentalHostSpannerOptions;
21+
1922
import static com.google.cloud.spanner.Type.StructField;
2023

2124
import com.google.api.gax.longrunning.OperationFuture;
@@ -1503,17 +1506,19 @@ static void queryWithNumeric(DatabaseClient dbClient) {
15031506

15041507
// [START spanner_create_client_with_query_options]
15051508
static void clientWithQueryOptions(DatabaseId db) {
1506-
SpannerOptions options =
1507-
SpannerOptions.newBuilder()
1508-
.setDefaultQueryOptions(
1509+
SpannerOptions.Builder builder = SpannerOptions.newBuilder();
1510+
builder.setDefaultQueryOptions(
15091511
db, QueryOptions
15101512
.newBuilder()
15111513
.setOptimizerVersion("1")
15121514
// The list of available statistics packages can be found by querying the
15131515
// "INFORMATION_SCHEMA.SPANNER_STATISTICS" table.
15141516
.setOptimizerStatisticsPackage("latest")
1515-
.build())
1516-
.build();
1517+
.build());
1518+
if (isExperimentalHost()) {
1519+
setExperimentalHostSpannerOptions(builder);
1520+
}
1521+
SpannerOptions options = builder.build();
15171522
Spanner spanner = options.getService();
15181523
DatabaseClient dbClient = spanner.getDatabaseClient(db);
15191524
try (ResultSet resultSet =
@@ -2231,7 +2236,11 @@ public static void main(String[] args) {
22312236
printUsageAndExit();
22322237
}
22332238
// [START init_client]
2234-
SpannerOptions options = SpannerOptions.newBuilder().build();
2239+
SpannerOptions.Builder builder = SpannerOptions.newBuilder();
2240+
if (isExperimentalHost()) {
2241+
setExperimentalHostSpannerOptions(builder);
2242+
}
2243+
SpannerOptions options = builder.build();
22352244
Spanner spanner = options.getService();
22362245
DatabaseAdminClient dbAdminClient = null;
22372246
try {

0 commit comments

Comments
 (0)