added query functions

Author: a-brandt

src/main/java/com/arangodb/ArangoDriver.java

@@ -51,7 +51,9 @@
 import com.arangodb.entity.JobsEntity;
 import com.arangodb.entity.PlainEdgeEntity;
 import com.arangodb.entity.Policy;
+import com.arangodb.entity.QueriesResultEntity;
 import com.arangodb.entity.QueryCachePropertiesEntity;
+import com.arangodb.entity.QueryTrackingPropertiesEntity;
 import com.arangodb.entity.ReplicationApplierConfigEntity;
 import com.arangodb.entity.ReplicationApplierStateEntity;
 import com.arangodb.entity.ReplicationInventoryEntity;
@@ -5522,4 +5524,70 @@ public QueryCachePropertiesEntity setQueryCacheProperties(QueryCachePropertiesEn
 			throws ArangoException {
 		return queryCacheDriver.setQueryCacheProperties(properties);
 	}
+
+	/**
+	 * Returns the configuration for the AQL query tracking
+	 * 
+	 * @return the configuration
+	 * @throws ArangoException
+	 */
+	public QueryTrackingPropertiesEntity getQueryTrackingProperties() throws ArangoException {
+		return this.cursorDriver.getQueryTrackingProperties(getDefaultDatabase());
+	}
+
+	/**
+	 * Changes the configuration for the AQL query tracking
+	 * 
+	 * @param properties
+	 *            the configuration
+	 * @return the configuration
+	 * @throws ArangoException
+	 */
+	public QueryTrackingPropertiesEntity setQueryTrackingProperties(QueryTrackingPropertiesEntity properties)
+			throws ArangoException {
+		return this.cursorDriver.setQueryTrackingProperties(getDefaultDatabase(), properties);
+	}
+
+	/**
+	 * Returns a list of currently running AQL queries
+	 * 
+	 * @return a list of currently running AQL queries
+	 * @throws ArangoException
+	 */
+	public QueriesResultEntity getCurrentlyRunningQueries() throws ArangoException {
+		return this.cursorDriver.getCurrentlyRunningQueries(getDefaultDatabase());
+	}
+
+	/**
+	 * Returns a list of slow running AQL queries
+	 * 
+	 * @return a list of slow running AQL queries
+	 * @throws ArangoException
+	 */
+	public QueriesResultEntity getSlowQueries() throws ArangoException {
+		return this.cursorDriver.getSlowQueries(getDefaultDatabase());
+	}
+
+	/**
+	 * Clears the list of slow AQL queries
+	 * 
+	 * @return
+	 * @throws ArangoException
+	 */
+	public DefaultEntity deleteSlowQueries() throws ArangoException {
+		return this.cursorDriver.deleteSlowQueries(getDefaultDatabase());
+	}
+
+	/**
+	 * Kills an AQL query
+	 * 
+	 * @param id
+	 *            the identifier of a query
+	 * @return
+	 * @throws ArangoException
+	 */
+	public DefaultEntity killQuery(String id) throws ArangoException {
+		return this.cursorDriver.killQuery(getDefaultDatabase(), id);
+	}
+
 }

src/main/java/com/arangodb/InternalCursorDriver.java

@@ -5,6 +5,8 @@
 import com.arangodb.entity.CursorEntity;
 import com.arangodb.entity.DefaultEntity;
 import com.arangodb.entity.DocumentEntity;
+import com.arangodb.entity.QueriesResultEntity;
+import com.arangodb.entity.QueryTrackingPropertiesEntity;
 import com.arangodb.entity.ShortestPathEntity;
 import com.arangodb.impl.BaseDriverInterface;
 import com.arangodb.util.AqlQueryOptions;
@@ -107,4 +109,17 @@ <T> CursorResultSet<T> executeQueryWithResultSet(
 		Class<T> clazz,
 		Boolean calcCount,
 		Integer batchSize) throws ArangoException;
+
+	QueryTrackingPropertiesEntity getQueryTrackingProperties(String database) throws ArangoException;
+
+	QueryTrackingPropertiesEntity setQueryTrackingProperties(String database, QueryTrackingPropertiesEntity properties)
+			throws ArangoException;
+
+	QueriesResultEntity getCurrentlyRunningQueries(String database) throws ArangoException;
+
+	QueriesResultEntity getSlowQueries(String database) throws ArangoException;
+
+	DefaultEntity deleteSlowQueries(String database) throws ArangoException;
+
+	DefaultEntity killQuery(String database, String id) throws ArangoException;
 }

src/main/java/com/arangodb/impl/InternalCursorDriverImpl.java

@@ -28,6 +28,8 @@
 import com.arangodb.entity.DefaultEntity;
 import com.arangodb.entity.DocumentEntity;
 import com.arangodb.entity.EntityFactory;
+import com.arangodb.entity.QueriesResultEntity;
+import com.arangodb.entity.QueryTrackingPropertiesEntity;
 import com.arangodb.entity.ShortestPathEntity;
 import com.arangodb.http.HttpManager;
 import com.arangodb.http.HttpResponseEntity;
@@ -150,8 +152,8 @@ public <V, E> ShortestPathEntity<V, E> getShortesPath(
 
 		String query = "for i in graph_shortest_path(@graphName, @startVertexExample, @endVertexExample, @options) return i";
 
-		Map<String, Object> options = shortestPathOptions == null ? new MapBuilder().get() : shortestPathOptions
-				.toMap();
+		Map<String, Object> options = shortestPathOptions == null ? new MapBuilder().get()
+				: shortestPathOptions.toMap();
 
 		Map<String, Object> bindVars = new MapBuilder().put("graphName", graphName)
 				.put("startVertexExample", startVertexExample).put("endVertexExample", endVertexExample)
@@ -214,4 +216,50 @@ public <T> CursorResultSet<T> executeQueryWithResultSet(
 
 	}
 
+	@Override
+	public QueryTrackingPropertiesEntity getQueryTrackingProperties(String database) throws ArangoException {
+
+		HttpResponseEntity res = httpManager.doGet(createEndpointUrl(database, "/_api/query/properties"), null, null);
+
+		return createEntity(res, QueryTrackingPropertiesEntity.class);
+	}
+
+	@Override
+	public QueryTrackingPropertiesEntity setQueryTrackingProperties(
+		String database,
+		QueryTrackingPropertiesEntity properties) throws ArangoException {
+		HttpResponseEntity res = httpManager.doPut(createEndpointUrl(database, "/_api/query/properties"), null,
+			EntityFactory.toJsonString(properties));
+
+		return createEntity(res, QueryTrackingPropertiesEntity.class);
+	}
+
+	@Override
+	public QueriesResultEntity getCurrentlyRunningQueries(String database) throws ArangoException {
+		HttpResponseEntity res = httpManager.doGet(createEndpointUrl(database, "/_api/query/current"), null, null);
+
+		return createEntity(res, QueriesResultEntity.class);
+	}
+
+	@Override
+	public QueriesResultEntity getSlowQueries(String database) throws ArangoException {
+		HttpResponseEntity res = httpManager.doGet(createEndpointUrl(database, "/_api/query/slow"), null, null);
+
+		return createEntity(res, QueriesResultEntity.class);
+	}
+
+	@Override
+	public DefaultEntity deleteSlowQueries(String database) throws ArangoException {
+		HttpResponseEntity res = httpManager.doDelete(createEndpointUrl(database, "/_api/query/slow"), null, null);
+
+		return createEntity(res, DefaultEntity.class);
+	}
+
+	@Override
+	public DefaultEntity killQuery(String database, String id) throws ArangoException {
+		HttpResponseEntity res = httpManager.doDelete(createEndpointUrl(database, "/_api/query", id), null, null);
+
+		return createEntity(res, DefaultEntity.class);
+	}
+
 }