Structure data for strong consistency

Ajay Kannan · Ajay Kannan · commit 8a10c6be3f3e · 2016-02-19T16:40:47.000-08:00
diff --git a/managed_vms/sparkjava/pom.xml b/managed_vms/sparkjava/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.google.gcloud</groupId>
       <artifactId>gcloud-java</artifactId>
-      <version>0.1.3</version>
+      <version>0.1.4</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
@@ -22,8 +22,10 @@
 import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
 import com.google.gcloud.datastore.KeyFactory;
+import com.google.gcloud.datastore.PathElement;
 import com.google.gcloud.datastore.Query;
 import com.google.gcloud.datastore.QueryResults;
+import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,16 +44,20 @@ public class UserService {
    */
   public UserService(Datastore datastore, String kind) {
     this.datastore = datastore;
-    this.keyFactory = datastore.newKeyFactory().kind(kind);
+    this.keyFactory =
+        datastore.newKeyFactory().ancestors(PathElement.of("SparkJavaDemo", "default")).kind(kind);
     this.kind = kind;
   }
 
   /**
    * Return a list of all users.
    */
   public List<User> getAllUsers() {
-    Query<Entity> query =
-        Query.gqlQueryBuilder(Query.ResultType.ENTITY, "SELECT * FROM " + kind).build();
+    Query<Entity> query = Query.entityQueryBuilder()
+        .kind(kind)
+        .filter(PropertyFilter.hasAncestor(
+            datastore.newKeyFactory().kind("SparkJavaDemo").newKey("default")))
+        .build();
     QueryResults<Entity> results = datastore.run(query);
     List<User> users = new ArrayList<>();
     while (results.hasNext()) {
@@ -83,7 +89,9 @@ public User createUser(String name, String email) {
    */
   public String deleteUser(String id) {
     Key key = keyFactory.newKey(id);
-    datastore.delete(key);
+    if (datastore.get(key) != null) {
+      datastore.delete(key);
+    }
     return "ok";
   }
 
diff --git a/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java b/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
@@ -26,9 +26,10 @@
 import com.google.gcloud.datastore.DatastoreOptions;
 import com.google.gcloud.datastore.Entity;
 import com.google.gcloud.datastore.Key;
+import com.google.gcloud.datastore.PathElement;
 import com.google.gcloud.datastore.Query;
 import com.google.gcloud.datastore.QueryResults;
-import com.google.gcloud.datastore.StructuredQuery;
+import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
 import com.google.gcloud.datastore.testing.LocalGcdHelper;
 
 import org.junit.AfterClass;
@@ -48,7 +49,9 @@ public class UserServiceTest {
   private static final String USER_EMAIL = "my@email.com";
   private static final User USER = new User(USER_ID, USER_NAME, USER_EMAIL);
   private static final String KIND = "DemoUser";
-  private static final Key USER_KEY = Key.builder(PROJECT_ID, KIND, USER_ID).build();
+  private static final Key USER_KEY = Key.builder(PROJECT_ID, KIND, USER_ID)
+      .ancestors(PathElement.of("SparkJavaDemo", "default"))
+      .build();
   private static final Entity USER_RECORD = Entity.builder(USER_KEY)
       .set("id", USER_ID)
       .set("name", USER_NAME)
@@ -61,7 +64,7 @@ public class UserServiceTest {
   @BeforeClass
   public static void beforeClass() throws IOException, InterruptedException {
     if (!LocalGcdHelper.isActive(PROJECT_ID, PORT)) {
-      gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT);
+      gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT, 0.0);
     }
     datastore = DatastoreOptions.builder()
         .projectId(PROJECT_ID)
@@ -73,7 +76,11 @@ public static void beforeClass() throws IOException, InterruptedException {
 
   @Before
   public void setUp() {
-    StructuredQuery<Key> query = Query.keyQueryBuilder().build();
+    Query<Key> query = Query.keyQueryBuilder()
+        .filter(PropertyFilter.hasAncestor(
+            datastore.newKeyFactory().kind("SparkJavaDemo").newKey("default")))
+        .kind(KIND)
+        .build();
     QueryResults<Key> result = datastore.run(query);
     datastore.delete(Iterators.toArray(result, Key.class));
     datastore.add(USER_RECORD);
