Addeng best effort flag, shorten ACL test timing to match changes in dgraph

Author: Lucas Wang

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

@@ -44,6 +44,7 @@ public class AsyncTransaction implements AutoCloseable {
   private volatile boolean mutated;
   private volatile boolean finished;
   private volatile boolean readOnly;
+  private volatile boolean bestEffort;
 
   private final DgraphAsyncClient client;
   private final DgraphStub stub;
@@ -53,6 +54,7 @@ public class AsyncTransaction implements AutoCloseable {
     this.client = client;
     this.stub = stub;
     this.readOnly = false;
+    this.bestEffort = false;
   }
 
   AsyncTransaction(DgraphAsyncClient client, DgraphStub stub, final boolean readOnly) {
@@ -81,6 +83,7 @@ public CompletableFuture<Response> queryWithVars(
             .setStartTs(context.getStartTs())
             .setLinRead(lr.build())
             .setReadOnly(readOnly)
+            .setBestEffort(bestEffort)
             .build();
 
     LOG.debug("Sending request to Dgraph...");
@@ -111,6 +114,18 @@ public CompletableFuture<Response> query(final String query) {
     return queryWithVars(query, Collections.emptyMap());
   }
 
+  /**
+   * Sets the best effort flag for this transaction. The Best effort flag can only be set for
+   * read-only transactions, and setting the best effort flag will enable a read-only transaction to
+   * see mutations made by other transactions even if those mutations have not been committed.
+   */
+  public void setBestEffort(boolean bestEffort) {
+    if (!this.readOnly) {
+      throw new RuntimeException("Best effort only works for read-only queries");
+    }
+    this.bestEffort = bestEffort;
+  }
+
   /**
    * Allows data stored on dgraph instances to be modified. The fields in Mutation come in pairs,
    * set and delete. Mutations can either be encoded as JSON or as RDFs.

src/main/proto/api.proto

@@ -50,6 +50,7 @@ message Request {
 	uint64 start_ts = 13;
 	LinRead lin_read = 14;
 	bool read_only = 15;
+	bool best_effort = 16;
 }
 
 message Response {

src/test/java/io/dgraph/AclTest.java

@@ -66,8 +66,8 @@ public void testAuthorization() throws Exception {
     alterPredicateWithUserAccount(false);
 
     createGroupAndAcls(UNUSED_GROUP, false);
-    System.out.println("Sleep for 35 seconds for acl caches to be refreshed");
-    Thread.sleep(35 * 1000);
+    System.out.println("Sleep for 6 seconds for acl caches to be refreshed");
+    Thread.sleep(6 * 1000);
 
     // now all the operations should fail since there are rules defined on the unusedGroup
     queryPredicateWithUserAccount(true);
@@ -77,18 +77,18 @@ public void testAuthorization() throws Exception {
 
     // create the dev group and add the user to it
     createGroupAndAcls(DEV_GROUP, true);
-    System.out.println("Sleep for 35 seconds for acl caches to be refreshed");
-    Thread.sleep(35 * 1000);
+    System.out.println("Sleep for 6 seconds for acl caches to be refreshed");
+    Thread.sleep(6 * 1000);
 
     // now the operations should succeed again through the dev group
     queryPredicateWithUserAccount(false);
     // sleep long enough (10s per the docker-compose.yml in this directory)
     // for the accessJwt to expire in order to test auto login through refresh jwt
-    System.out.println("Sleep for 12 seconds for the accessJwt to expire");
-    Thread.sleep(12 * 1000);
+    System.out.println("Sleep for 4 seconds for the accessJwt to expire");
+    Thread.sleep(4 * 1000);
     mutatePredicateWithUserAccount(false);
-    System.out.println("Sleep for 12 seconds for the accessJwt to expire");
-    Thread.sleep(12 * 1000);
+    System.out.println("Sleep for 4 seconds for the accessJwt to expire");
+    Thread.sleep(4 * 1000);
     alterPredicateWithUserAccount(false);
   }
 
@@ -144,7 +144,7 @@ private void createGroupAndAcls(String group, boolean addUserToGroup)
         group,
         "-p",
         PREDICATE_TO_READ,
-        "-P",
+        "-m",
         "4",
         "-x",
         GROOT_PASSWORD);
@@ -161,7 +161,7 @@ private void createGroupAndAcls(String group, boolean addUserToGroup)
         group,
         "-p",
         QUERY_ATTR,
-        "-P",
+        "-m",
         "4",
         "-x",
         GROOT_PASSWORD);
@@ -177,7 +177,7 @@ private void createGroupAndAcls(String group, boolean addUserToGroup)
         group,
         "-p",
         PREDICATE_TO_WRITE,
-        "-P",
+        "-m",
         "2",
         "-x",
         GROOT_PASSWORD);
@@ -192,7 +192,7 @@ private void createGroupAndAcls(String group, boolean addUserToGroup)
         group,
         "-p",
         PREDICATE_TO_ALTER,
-        "-P",
+        "-m",
         "1",
         "-x",
         GROOT_PASSWORD);