Feature/3.6/query timeout (#327)

* added timeout option for AQL queries

* async tests

* changelog upd

* renamed cursor timeout to maxRuntime

* doc upd

Author: rashtao

ChangeLog.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [6.5.0] - 2019-xx-xx
 
+- timeout option for AQL queries (ArangoDB v3.6)
 - enhancedNgramAnalyzer and enhancedTextAnalyzer (ArangoDB v3.6)
 
 ## [6.4.1] - 2019-10-23

src/main/java/com/arangodb/model/AqlQueryOptions.java

@@ -174,6 +174,16 @@ public AqlQueryOptions failOnWarning(final Boolean failOnWarning) {
 		return this;
 	}
 
+    /**
+     * @param timeout The query has to be executed within the given runtime or it will be killed. The value is specified
+	 *                in seconds. The default value is 0.0 (no timeout).
+     * @return options
+     */
+    public AqlQueryOptions maxRuntime(final Double timeout) {
+        getOptions().maxRuntime = timeout;
+        return this;
+    }
+
 	/**
 	 * @return If set to true, then the additional query profiling information will be returned in the sub-attribute
 	 * profile of the extra return attribute if the query result is not served from the query cache.
@@ -396,6 +406,7 @@ private static class Options implements Serializable {
 		private Integer maxPlans;
 		private Boolean stream;
 		private Collection<String> shardIds;
+		private Double maxRuntime;
 
 		protected Optimizer getOptimizer() {
 			if (optimizer == null) {

src/test/java/com/arangodb/ArangoDatabaseTest.java

@@ -774,6 +774,17 @@ public void queryWithFailOnWarningFalse() {
         assertThat(cursor.next(), is("null"));
     }
 
+    @Test
+    public void queryWithTimeout() {
+        assumeTrue(isAtLeastVersion(3, 6));
+        try {
+            db.query("RETURN SLEEP(1)", null, new AqlQueryOptions().maxRuntime(0.1), String.class).next();
+            fail();
+        } catch (ArangoDBException e) {
+            assertThat(e.getResponseCode(), is(410));
+        }
+    }
+
     @Test
     public void queryWithMaxWarningCount() {
         final ArangoCursor<String> cursorWithWarnings = db

src/test/java/com/arangodb/async/ArangoDatabaseTest.java

@@ -447,6 +447,19 @@ public void queryStream() throws InterruptedException, ExecutionException {
         }
     }
 
+    @Test
+    public void queryWithTimeout() throws ExecutionException, InterruptedException {
+        assumeTrue(isAtLeastVersion(3, 6));
+
+        try {
+            db.query("RETURN SLEEP(1)", null, new AqlQueryOptions().maxRuntime(0.1), String.class).get().next();
+            fail();
+        } catch (ExecutionException e) {
+            assertThat(e.getCause(), instanceOf(ArangoDBException.class));
+            assertThat(((ArangoDBException) e.getCause()).getResponseCode(), is(410));
+        }
+    }
+
     @Test
     public void queryWithCount() throws InterruptedException, ExecutionException {
         try {