Skip to content

Commit 76e3b40

Browse files
sgorse12sgorse12
committed
Formatted last statement sample files
1 parent 60cc30d commit 76e3b40

File tree

4 files changed

+126
-138
lines changed

4 files changed

+126
-138
lines changed

‎samples/snippets/src/main/java/com/example/spanner/LastStatementSample.java‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,47 @@
2424
import com.google.cloud.spanner.Statement;
2525

2626
/**
27-
* Sample showing how to set the last statement option when a DML statement is the last statement in a transaction.
27+
* Sample showing how to set the last statement option when a DML statement is the last statement in
28+
* a transaction.
2829
*/
2930
public class LastStatementSample {
3031

31-
static void insertAndUpdateUsingLastStatement() {
32-
// TODO(developer): Replace these variables before running the sample.
33-
final String projectId = "my-project";
34-
final String instanceId = "my-instance";
35-
final String databaseId = "my-database";
32+
static void insertAndUpdateUsingLastStatement() {
33+
// TODO(developer): Replace these variables before running the sample.
34+
final String projectId = "my-project";
35+
final String instanceId = "my-instance";
36+
final String databaseId = "my-database";
3637

37-
try (Spanner spanner =
38-
SpannerOptions.newBuilder().setProjectId(projectId).build().getService()) {
39-
final DatabaseClient databaseClient =
40-
spanner.getDatabaseClient(DatabaseId.of(projectId, instanceId, databaseId));
41-
insertAndUpdateUsingLastStatement(databaseClient);
42-
}
38+
try (Spanner spanner =
39+
SpannerOptions.newBuilder().setProjectId(projectId).build().getService()) {
40+
final DatabaseClient databaseClient =
41+
spanner.getDatabaseClient(DatabaseId.of(projectId, instanceId, databaseId));
42+
insertAndUpdateUsingLastStatement(databaseClient);
4343
}
44+
}
4445

45-
// [START spanner_last_statement]
46-
static void insertAndUpdateUsingLastStatement(DatabaseClient client) {
47-
client
48-
.readWriteTransaction()
49-
.run(
50-
transaction -> {
51-
transaction.executeUpdate(
52-
Statement.of(
53-
"INSERT Singers (SingerId, FirstName, LastName)\n"
54-
+ "VALUES (54213, 'John', 'Do')"));
55-
System.out.println("New singer inserted.");
46+
// [START spanner_last_statement]
47+
static void insertAndUpdateUsingLastStatement(DatabaseClient client) {
48+
client
49+
.readWriteTransaction()
50+
.run(
51+
transaction -> {
52+
transaction.executeUpdate(
53+
Statement.of(
54+
"INSERT Singers (SingerId, FirstName, LastName)\n"
55+
+ "VALUES (54213, 'John', 'Do')"));
56+
System.out.println("New singer inserted.");
5657

57-
// Pass in the `lastStatement` option to the last DML statement of the transaction.
58-
transaction.executeUpdate(
59-
Statement.of(
60-
"UPDATE Singers SET Singers.LastName = 'Doe' WHERE SingerId = 54213\n"),
61-
Options.lastStatement());
62-
System.out.println("Singer last name updated.");
58+
// Pass in the `lastStatement` option to the last DML statement of the transaction.
59+
transaction.executeUpdate(
60+
Statement.of(
61+
"UPDATE Singers SET Singers.LastName = 'Doe' WHERE SingerId = 54213\n"),
62+
Options.lastStatement());
63+
System.out.println("Singer last name updated.");
6364

64-
return null;
65-
});
66-
}
67-
// [END spanner_last_statement]
65+
return null;
66+
});
67+
}
68+
// [END spanner_last_statement]
6869

6970
}

‎samples/snippets/src/main/java/com/example/spanner/PgLastStatementSample.java‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,46 @@
2424
import com.google.cloud.spanner.Statement;
2525

2626
/**
27-
* Sample showing how to set the last statement option when a DML statement is the last statement in a transaction.
27+
* Sample showing how to set the last statement option when a DML statement is the last statement in
28+
* a transaction.
2829
*/
2930
public class PgLastStatementSample {
3031

31-
static void insertAndUpdateUsingLastStatement() {
32-
// TODO(developer): Replace these variables before running the sample.
33-
final String projectId = "my-project";
34-
final String instanceId = "my-instance";
35-
final String databaseId = "my-database";
32+
static void insertAndUpdateUsingLastStatement() {
33+
// TODO(developer): Replace these variables before running the sample.
34+
final String projectId = "my-project";
35+
final String instanceId = "my-instance";
36+
final String databaseId = "my-database";
3637

37-
try (Spanner spanner =
38-
SpannerOptions.newBuilder().setProjectId(projectId).build().getService()) {
39-
final DatabaseClient databaseClient =
40-
spanner.getDatabaseClient(DatabaseId.of(projectId, instanceId, databaseId));
41-
insertAndUpdateUsingLastStatement(databaseClient);
42-
}
38+
try (Spanner spanner =
39+
SpannerOptions.newBuilder().setProjectId(projectId).build().getService()) {
40+
final DatabaseClient databaseClient =
41+
spanner.getDatabaseClient(DatabaseId.of(projectId, instanceId, databaseId));
42+
insertAndUpdateUsingLastStatement(databaseClient);
4343
}
44+
}
4445

45-
// [START spanner_postgresql_last_statement]
46-
static void insertAndUpdateUsingLastStatement(DatabaseClient client) {
47-
client
48-
.readWriteTransaction()
49-
.run(
50-
transaction -> {
51-
transaction.executeUpdate(
52-
Statement.of(
53-
"INSERT INTO Singers (SingerId, FirstName, LastName) "
54-
+ "VALUES (54214, 'John', 'Do')"));
55-
System.out.println("New singer inserted.");
46+
// [START spanner_postgresql_last_statement]
47+
static void insertAndUpdateUsingLastStatement(DatabaseClient client) {
48+
client
49+
.readWriteTransaction()
50+
.run(
51+
transaction -> {
52+
transaction.executeUpdate(
53+
Statement.of(
54+
"INSERT INTO Singers (SingerId, FirstName, LastName) "
55+
+ "VALUES (54214, 'John', 'Do')"));
56+
System.out.println("New singer inserted.");
5657

57-
// Pass in the `lastStatement` option to the last DML statement of the transaction.
58-
transaction.executeUpdate(
59-
Statement.of(
60-
"UPDATE Singers SET LastName = 'Doe' WHERE SingerId = 54214\n"),
61-
Options.lastStatement());
62-
System.out.println("Singer last name updated.");
58+
// Pass in the `lastStatement` option to the last DML statement of the transaction.
59+
transaction.executeUpdate(
60+
Statement.of("UPDATE Singers SET LastName = 'Doe' WHERE SingerId = 54214\n"),
61+
Options.lastStatement());
62+
System.out.println("Singer last name updated.");
6363

64-
return null;
65-
});
66-
}
67-
// [END spanner_postgresql_last_statement]
64+
return null;
65+
});
66+
}
67+
// [END spanner_postgresql_last_statement]
6868

6969
}

‎samples/snippets/src/test/java/com/example/spanner/LastStatementSampleIT.java‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,7 @@
2121

2222
import com.google.cloud.spanner.DatabaseClient;
2323
import com.google.cloud.spanner.DatabaseId;
24-
import com.google.cloud.spanner.KeySet;
25-
import com.google.cloud.spanner.Mutation;
2624
import com.google.common.collect.ImmutableList;
27-
import java.util.Arrays;
28-
import java.util.Collections;
29-
import org.junit.After;
30-
import org.junit.Before;
3125
import org.junit.BeforeClass;
3226
import org.junit.Test;
3327
import org.junit.runner.RunWith;
@@ -37,33 +31,31 @@
3731
@RunWith(JUnit4.class)
3832
public class LastStatementSampleIT extends SampleTestBase {
3933

40-
private static DatabaseId databaseId;
34+
private static DatabaseId databaseId;
4135

42-
@BeforeClass
43-
public static void createTestDatabase() throws Exception {
44-
final String database = idGenerator.generateDatabaseId();
45-
databaseAdminClient
46-
.createDatabase(
47-
instanceId,
48-
database,
49-
ImmutableList.of(
50-
"CREATE TABLE Singers ("
51-
+ " SingerId INT64 NOT NULL,"
52-
+ " FirstName STRING(1024),"
53-
+ " LastName STRING(1024),"
54-
+ " SingerInfo BYTES(MAX)"
55-
+ ") PRIMARY KEY (SingerId)"))
56-
.get();
57-
databaseId = DatabaseId.of(projectId, instanceId, database);
58-
}
36+
@BeforeClass
37+
public static void createTestDatabase() throws Exception {
38+
final String database = idGenerator.generateDatabaseId();
39+
databaseAdminClient
40+
.createDatabase(
41+
instanceId,
42+
database,
43+
ImmutableList.of(
44+
"CREATE TABLE Singers ("
45+
+ " SingerId INT64 NOT NULL,"
46+
+ " FirstName STRING(1024),"
47+
+ " LastName STRING(1024),"
48+
+ " SingerInfo BYTES(MAX)"
49+
+ ") PRIMARY KEY (SingerId)"))
50+
.get();
51+
databaseId = DatabaseId.of(projectId, instanceId, database);
52+
}
5953

60-
@Test
61-
public void testSetLastStatementOptionSample() throws Exception {
62-
final DatabaseClient client = spanner.getDatabaseClient(databaseId);
63-
String out =
64-
runSample(
65-
() -> LastStatementSample.insertAndUpdateUsingLastStatement(client));
66-
assertThat(out).contains("New singer inserted.");
67-
assertThat(out).contains("Singer last name updated.");
68-
}
54+
@Test
55+
public void testSetLastStatementOptionSample() throws Exception {
56+
final DatabaseClient client = spanner.getDatabaseClient(databaseId);
57+
String out = runSample(() -> LastStatementSample.insertAndUpdateUsingLastStatement(client));
58+
assertThat(out).contains("New singer inserted.");
59+
assertThat(out).contains("Singer last name updated.");
60+
}
6961
}

‎samples/snippets/src/test/java/com/example/spanner/PgLastStatementSampleIT.java‎

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@
2323
import com.google.cloud.spanner.DatabaseClient;
2424
import com.google.cloud.spanner.DatabaseId;
2525
import com.google.cloud.spanner.Dialect;
26-
import com.google.cloud.spanner.KeySet;
27-
import com.google.cloud.spanner.Mutation;
2826
import com.google.common.collect.ImmutableList;
2927
import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata;
30-
import java.util.Arrays;
3128
import java.util.Collections;
3229
import java.util.concurrent.TimeUnit;
3330
import org.junit.BeforeClass;
@@ -39,42 +36,40 @@
3936
@RunWith(JUnit4.class)
4037
public class PgLastStatementSampleIT extends SampleTestBase {
4138

42-
private static DatabaseId databaseId;
39+
private static DatabaseId databaseId;
4340

44-
@BeforeClass
45-
public static void createTestDatabase() throws Exception {
46-
final String database = idGenerator.generateDatabaseId();
47-
databaseAdminClient
48-
.createDatabase(
49-
databaseAdminClient
50-
.newDatabaseBuilder(DatabaseId.of(projectId, instanceId, database))
51-
.setDialect(Dialect.POSTGRESQL)
52-
.build(),
53-
Collections.emptyList())
54-
.get(10, TimeUnit.MINUTES);
55-
final OperationFuture<Void, UpdateDatabaseDdlMetadata> updateOperation =
56-
databaseAdminClient.updateDatabaseDdl(
57-
instanceId,
58-
database,
59-
ImmutableList.of(
60-
"CREATE TABLE Singers ("
61-
+ " SingerId bigint NOT NULL,"
62-
+ " FirstName character varying(1024),"
63-
+ " LastName character varying(1024),"
64-
+ " PRIMARY KEY (SingerId)"
65-
+ ")"),
66-
null);
67-
updateOperation.get(10, TimeUnit.MINUTES);
68-
databaseId = DatabaseId.of(projectId, instanceId, database);
69-
}
41+
@BeforeClass
42+
public static void createTestDatabase() throws Exception {
43+
final String database = idGenerator.generateDatabaseId();
44+
databaseAdminClient
45+
.createDatabase(
46+
databaseAdminClient
47+
.newDatabaseBuilder(DatabaseId.of(projectId, instanceId, database))
48+
.setDialect(Dialect.POSTGRESQL)
49+
.build(),
50+
Collections.emptyList())
51+
.get(10, TimeUnit.MINUTES);
52+
final OperationFuture<Void, UpdateDatabaseDdlMetadata> updateOperation =
53+
databaseAdminClient.updateDatabaseDdl(
54+
instanceId,
55+
database,
56+
ImmutableList.of(
57+
"CREATE TABLE Singers ("
58+
+ " SingerId bigint NOT NULL,"
59+
+ " FirstName character varying(1024),"
60+
+ " LastName character varying(1024),"
61+
+ " PRIMARY KEY (SingerId)"
62+
+ ")"),
63+
null);
64+
updateOperation.get(10, TimeUnit.MINUTES);
65+
databaseId = DatabaseId.of(projectId, instanceId, database);
66+
}
7067

71-
@Test
72-
public void testSetLastStatementOptionSample() throws Exception {
73-
final DatabaseClient client = spanner.getDatabaseClient(databaseId);
74-
String out =
75-
runSample(
76-
() -> PgLastStatementSample.insertAndUpdateUsingLastStatement(client));
77-
assertThat(out).contains("New singer inserted.");
78-
assertThat(out).contains("Singer last name updated.");
79-
}
68+
@Test
69+
public void testSetLastStatementOptionSample() throws Exception {
70+
final DatabaseClient client = spanner.getDatabaseClient(databaseId);
71+
String out = runSample(() -> PgLastStatementSample.insertAndUpdateUsingLastStatement(client));
72+
assertThat(out).contains("New singer inserted.");
73+
assertThat(out).contains("Singer last name updated.");
74+
}
8075
}

0 commit comments

Comments
 (0)