killQuery

Author: Mark

src/main/java/com/arangodb/ArangoDatabase.java

@@ -777,6 +777,36 @@ private Request clearSlowQueriesRequest() {
 		return new Request(name, RequestType.DELETE, ArangoDBConstants.PATH_API_QUERY_SLOW);
 	}
 
+	/**
+	 * Kills a running query. The query will be terminated at the next cancelation point.
+	 * 
+	 * @see <a href= "https://docs.arangodb.com/current/HTTP/AqlQuery/index.html#kills-a-running-aql-query">API
+	 *      Documentation</a>
+	 * @param id
+	 *            The id of the query
+	 * @throws ArangoDBException
+	 */
+	public void killQuery(final String id) throws ArangoDBException {
+		executeSync(killQueryRequest(id), Void.class);
+	}
+
+	/**
+	 * Kills a running query. The query will be terminated at the next cancelation point.
+	 * 
+	 * @see <a href= "https://docs.arangodb.com/current/HTTP/AqlQuery/index.html#kills-a-running-aql-query">API
+	 *      Documentation</a>
+	 * @param id
+	 *            The id of the query
+	 * @return void
+	 */
+	public CompletableFuture<Void> killQueryAsync(final String id) {
+		return executeAsync(killQueryRequest(id), Void.class);
+	}
+
+	private Request killQueryRequest(final String id) {
+		return new Request(name, RequestType.DELETE, createPath(ArangoDBConstants.PATH_API_QUERY, id));
+	}
+
 	/**
 	 * Create a new AQL user function
 	 * 

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

@@ -21,6 +21,7 @@
 package com.arangodb;
 
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
@@ -610,6 +611,22 @@ public void getAndClearSlowQueries() throws InterruptedException, ExecutionExcep
 		}
 	}
 
+	@Test
+	public void killQuery() throws InterruptedException, ExecutionException {
+		final CompletableFuture<ArangoCursor<Void>> query = db.queryAsync("return sleep(0.1)", null, null, Void.class);
+		query.whenComplete((r, e) -> {
+			assertThat(r, is(nullValue()));
+			assertThat(e, is(notNullValue()));
+		});
+
+		final Collection<QueryEntity> currentlyRunningQueries = db.getCurrentlyRunningQueries();
+		assertThat(currentlyRunningQueries, is(notNullValue()));
+		assertThat(currentlyRunningQueries.size(), is(1));
+
+		final QueryEntity queryEntity = currentlyRunningQueries.stream().findFirst().get();
+		db.killQuery(queryEntity.getId());
+	}
+
 	@Test
 	public void createGetDeleteAqlFunction() {
 		final Collection<AqlFunctionEntity> aqlFunctionsInitial = db.getAqlFunctions(null);