Fixed running multiple upserts within one transaction (#137)

src/main/java/io/dgraph/AsyncTransaction.java

@@ -147,19 +147,21 @@ public CompletableFuture<Response> doRequest(Request request) {
       mutated = true;
     }
 
+    Request requestStartTs = Request.newBuilder(request).setStartTs(context.getStartTs()).build();
+
     return client
         .runWithRetries(
             "doRequest",
             () -> {
               StreamObserverBridge<Response> bridge = new StreamObserverBridge<>();
               DgraphStub localStub = client.getStubWithJwt(stub);
-              localStub.query(request, bridge);
+              localStub.query(requestStartTs, bridge);
 
               return bridge
                   .getDelegate()
                   .thenApply(
                       (response) -> {
-                        if (request.getCommitNow()) {
+                        if (requestStartTs.getCommitNow()) {
                           finished = true;
                         }
                         mergeContext(response.getTxn());

src/test/java/io/dgraph/UpsertBlockTest.java

@@ -2,6 +2,7 @@
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -307,6 +308,47 @@ public void upsertZeroMutations() {
     }
   }
 
+  @Test
+  public void upsertMultipleWithinSingleTransactionTest() {
+    DgraphProto.Operation op =
+        DgraphProto.Operation.newBuilder()
+            .setSchema("email: string @index(exact) @upsert .")
+            .build();
+    dgraphClient.alter(op);
+
+    JsonArray jsonData = new JsonArray();
+    JsonObject person = new JsonObject();
+    person.addProperty("uid", "uid(v)");
+    person.addProperty("name", "wrong");
+    jsonData.add(person);
+
+    JsonObject person2 = new JsonObject();
+    person2.addProperty("email", "[email protected]");
+    person2.addProperty("uid", "uid(v)");
+    jsonData.add(person2);
+
+    String query =
+        "{\n"
+            + "    me(func: eq(email, \"[email protected]\")) {\n"
+            + "        v as uid\n"
+            + "    }\n"
+            + "}\n";
+    Mutation mu =
+        Mutation.newBuilder().setSetJson(ByteString.copyFromUtf8(jsonData.toString())).build();
+    Request request = Request.newBuilder().addMutations(mu).setQuery(query).build();
+
+    Transaction transaction = dgraphClient.newTransaction();
+    transaction.doRequest(request);
+
+    try {
+      transaction.doRequest(request);
+    } catch (RuntimeException e) {
+      fail(e.getMessage());
+    }
+
+    transaction.discard();
+  }
+
   static class User {
     String branch;
   }