Update Leaderboard to use Batch DML.

spanner/leaderboard/README.md

@@ -6,12 +6,12 @@ using the [Google Cloud Client Library for Java](https://github.com/GoogleCloudP
 
 This sample requires [Java](https://www.java.com/en/download/) and [Maven](http://maven.apache.org/) for building the application.
 
-This sample includes extra directories `step5`, `step6`, and `step7` that contain partial versions of this sample application. These directories are intended to provide guidance as part of a separate Codelab walk-through where the application is built in the following stages
+This sample includes extra directories `step4`, `step5`, and `step6` that contain partial versions of this sample application. These directories are intended to provide guidance as part of a separate Codelab walk-through where the application is built in the following stages
 that correspond to the steps in Codelab:
 
-* step5 - Create the sample database along with the tables Players and Scores.
-* step6 - Populate the Players and Scores tables with sample data.
-* step7 - Run sample queries including sorting the results by timestamp.
+* step4 - Create the sample database along with the tables Players and Scores.
+* step5 - Populate the Players and Scores tables with sample data.
+* step6 - Run sample queries including sorting the results by timestamp.
 
 If you only want to run the complete sample refer to the application in the `complete` directory.
 

spanner/leaderboard/complete/pom.xml

@@ -33,7 +33,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-bom</artifactId>
-        <version>0.73.0-alpha</version>
+        <version>0.83.0-alpha</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

spanner/leaderboard/complete/src/main/java/com/google/codelabs/App.java

@@ -37,7 +37,9 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneOffset;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ThreadLocalRandom;
@@ -126,18 +128,24 @@ public Void run(TransactionContext transaction) throws Exception {
                   numberOfPlayers = resultSet.getLong("PlayerCount");
                 }
                 // Insert 100 player records into the Players table.
+                List<Statement> stmts = new ArrayList<Statement>();
                 long randomId;
                 for (int x = 1; x <= 100; x++) {
                   numberOfPlayers++;
                   randomId = (long) Math.floor(Math.random() * 9_000_000_000L) + 1_000_000_000L;
-                  transaction.buffer(
-                      Mutation.newInsertBuilder("Players")
-                          .set("PlayerId")
-                          .to(randomId)
-                          .set("PlayerName")
-                          .to("Player " + numberOfPlayers)
-                          .build());
+                  Statement statement =
+                      Statement
+                        .newBuilder(
+                            "INSERT INTO Players (PlayerId, PlayerName) "
+                            + "VALUES (@PlayerId, @PlayerName) ")
+                        .bind("PlayerId")
+                        .to(randomId)
+                        .bind("PlayerName")
+                        .to("Player " + numberOfPlayers)
+                        .build();
+                  stmts.add(statement);
                 }
+                transaction.batchUpdate(stmts);
                 return null;
               }
             });
@@ -168,6 +176,7 @@ public Void run(TransactionContext transaction) throws Exception {
                   LocalDate startDate = LocalDate.of(startYear, startMonth, startDay);
                   long start = startDate.toEpochDay();
                   Random r = new Random();
+                  List<Statement> stmts = new ArrayList<Statement>();
                   // Insert 4 score records into the Scores table 
                   // for each player in the Players table.
                   for (int x = 1; x <= 4; x++) {
@@ -180,20 +189,24 @@ public Void run(TransactionContext transaction) throws Exception {
                         r.nextInt(23), r.nextInt(59), r.nextInt(59), r.nextInt(9999));
                     LocalDateTime randomDate = LocalDateTime.of(randomDayDate, randomTime);
                     Instant randomInstant = randomDate.toInstant(ZoneOffset.UTC);
-                    transaction.buffer(
-                        Mutation.newInsertBuilder("Scores")
-                            .set("PlayerId")
-                            .to(playerId)
-                            .set("Score")
-                            .to(randomScore)
-                            .set("Timestamp")
-                            .to(randomInstant.toString())
-                            .build());
+                    Statement statement =
+                        Statement
+                        .newBuilder(
+                          "INSERT INTO Scores (PlayerId, Score, Timestamp) "
+                          + "VALUES (@PlayerId, @Score, @Timestamp) ")
+                        .bind("PlayerId")
+                        .to(playerId)
+                        .bind("Score")
+                        .to(randomScore)
+                        .bind("Timestamp")
+                        .to(randomInstant.toString())
+                        .build();
+                    stmts.add(statement);
                   }
+                  transaction.batchUpdate(stmts);
                   return null;
                 }
               });
-
     }
     if (!playerRecordsFound) {
       System.out.println("Parameter 'scores' is invalid since "

spanner/leaderboard/complete/src/test/java/com/google/codelabs/AppTest.java

@@ -99,6 +99,18 @@ public void testSample() throws Exception {
     out = runSample("insert", "scores");
     assertThat(out).contains("Done inserting score records");
 
+    out = runSample("insert", "scores");
+    assertThat(out).contains("Done inserting score records");
+
+    out = runSample("insert", "scores");
+    assertThat(out).contains("Done inserting score records");
+
+    out = runSample("insert", "scores");
+    assertThat(out).contains("Done inserting score records");
+
+    out = runSample("insert", "scores");
+    assertThat(out).contains("Done inserting score records");
+
     // Query Top Ten Players of all time.
     out = runSample("query");
     assertThat(out).contains("PlayerId: ");

spanner/leaderboard/step7/pom.xml → spanner/leaderboard/step4/pom.xml

@@ -17,7 +17,7 @@
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
   </properties>
-  
+
   <!--
     The parent pom defines common style checks and testing strategies for our samples.
     Removing or replacing it should not affect the execution of the samples in anyway.
@@ -33,7 +33,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-bom</artifactId>
-        <version>0.73.0-alpha</version>
+        <version>0.83.0-alpha</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

spanner/leaderboard/step4/src/main/java/com/google/codelabs/App.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.codelabs;
+
+import com.google.api.gax.longrunning.OperationFuture;
+import com.google.cloud.spanner.Database;
+import com.google.cloud.spanner.DatabaseAdminClient;
+import com.google.cloud.spanner.DatabaseClient;
+import com.google.cloud.spanner.DatabaseId;
+import com.google.cloud.spanner.Spanner;
+import com.google.cloud.spanner.SpannerException;
+import com.google.cloud.spanner.SpannerExceptionFactory;
+import com.google.cloud.spanner.SpannerOptions;
+import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
+import java.util.Arrays;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * Example code for using the Cloud Spanner API with the Google Cloud Java client library
+ * to create a simple leaderboard.
+ * 
+ * This example demonstrates:
+ *
+ * <p>
+ *
+ * <ul>
+ *   <li>Creating a Cloud Spanner database.
+ * </ul>
+ */
+public class App {
+
+  static void create(DatabaseAdminClient dbAdminClient, DatabaseId db) {
+    OperationFuture<Database, CreateDatabaseMetadata> op =
+        dbAdminClient.createDatabase(
+            db.getInstanceId().getInstance(),
+            db.getDatabase(),
+            Arrays.asList(
+                "CREATE TABLE Players(\n"
+                    + "  PlayerId INT64 NOT NULL,\n"
+                    + "  PlayerName STRING(2048) NOT NULL\n"
+                    + ") PRIMARY KEY(PlayerId)",
+                "CREATE TABLE Scores(\n"
+                    + "  PlayerId INT64 NOT NULL,\n"
+                    + "  Score INT64 NOT NULL,\n"
+                    + "  Timestamp TIMESTAMP NOT NULL\n"
+                    + "  OPTIONS(allow_commit_timestamp=true)\n"
+                    + ") PRIMARY KEY(PlayerId, Timestamp),\n"
+                    + "INTERLEAVE IN PARENT Players ON DELETE NO ACTION"));
+    try {
+      // Initiate the request which returns an OperationFuture.
+      Database dbOperation = op.get();
+      System.out.println("Created database [" + dbOperation.getId() + "]");
+    } catch (ExecutionException e) {
+      // If the operation failed during execution, expose the cause.
+      throw (SpannerException) e.getCause();
+    } catch (InterruptedException e) {
+      // Throw when a thread is waiting, sleeping, or otherwise occupied,
+      // and the thread is interrupted, either before or during the activity.
+      throw SpannerExceptionFactory.propagateInterrupt(e);
+    }
+  }
+
+  static void printUsageAndExit() {
+    System.out.println("Leaderboard 1.0.0");
+    System.out.println("Usage:");
+    System.out.println("  java -jar leaderboard.jar "
+        + "<command> <instance_id> <database_id> [command_option]");
+    System.out.println("");
+    System.out.println("Examples:");
+    System.out.println("  java -jar leaderboard.jar create my-instance example-db");
+    System.out.println("      - Create a sample Cloud Spanner database along with "
+        + "sample tables in your project.\n");
+    System.exit(1);
+  }
+
+  public static void main(String[] args) throws Exception {
+    if (!(args.length == 3 || args.length == 4)) {
+      printUsageAndExit();
+    }
+    SpannerOptions options = SpannerOptions.newBuilder().build();
+    Spanner spanner = options.getService();
+    try {
+      String command = args[0];
+      DatabaseId db = DatabaseId.of(options.getProjectId(), args[1], args[2]);
+      DatabaseClient dbClient = spanner.getDatabaseClient(db);
+      DatabaseAdminClient dbAdminClient = spanner.getDatabaseAdminClient();
+      switch (command) {
+        case "create":
+          create(dbAdminClient, db);
+          break;
+        default:
+          printUsageAndExit();
+      }
+    } finally {
+      spanner.close();
+    }
+    System.out.println("Closed client");
+  }
+}

spanner/leaderboard/step5/pom.xml

@@ -33,7 +33,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-bom</artifactId>
-        <version>0.73.0-alpha</version>
+        <version>0.83.0-alpha</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>