QueryEntity updates (#507)

Author: rashtao

core/src/main/java/com/arangodb/entity/QueryEntity.java

@@ -28,18 +28,16 @@
  */
 public final class QueryEntity {
 
-    public static final String PROPERTY_STARTED = "started";
-
     private String id;
+    private String database;
+    private String user;
     private String query;
+    private Map<String, Object> bindVars;
     private Date started;
     private Double runTime;
-    private Map<String, Object> bindVars;
+    private Long peakMemoryUsage;
     private QueryExecutionState state;
-
-    public QueryEntity() {
-        super();
-    }
+    private Boolean stream;
 
     /**
      * @return the query's id
@@ -48,13 +46,34 @@ public String getId() {
         return id;
     }
 
+    /**
+     * @return the name of the database the query runs in
+     */
+    public String getDatabase() {
+        return database;
+    }
+
+    /**
+     * @return the name of the user that started the query
+     */
+    public String getUser() {
+        return user;
+    }
+
     /**
      * @return the query string (potentially truncated)
      */
     public String getQuery() {
         return query;
     }
 
+    /**
+     * @return the bind parameter values used by the query
+     */
+    public Map<String, Object> getBindVars() {
+        return bindVars;
+    }
+
     /**
      * @return the date and time when the query was started
      */
@@ -70,10 +89,10 @@ public Double getRunTime() {
     }
 
     /**
-     * @return the bind parameter values used by the query
+     * @return the query’s peak memory usage in bytes (in increments of 32KB)
      */
-    public Map<String, Object> getBindVars() {
-        return bindVars;
+    public Long getPeakMemoryUsage() {
+        return peakMemoryUsage;
     }
 
     /**
@@ -83,4 +102,10 @@ public QueryExecutionState getState() {
         return state;
     }
 
+    /**
+     * @return whether or not the query uses a streaming cursor
+     */
+    public Boolean getStream() {
+        return stream;
+    }
 }

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

@@ -1146,8 +1146,18 @@ void getCurrentlyRunningQueries(ArangoDatabase db) throws InterruptedException {
         final Collection<QueryEntity> currentlyRunningQueries = db.getCurrentlyRunningQueries();
         assertThat(currentlyRunningQueries).hasSize(1);
         final QueryEntity queryEntity = currentlyRunningQueries.iterator().next();
+        assertThat(queryEntity.getId()).isNotNull();
+        assertThat(queryEntity.getDatabase()).isEqualTo(db.name());
+        assertThat(queryEntity.getUser()).isEqualTo("root");
         assertThat(queryEntity.getQuery()).isEqualTo(query);
+        assertThat(queryEntity.getBindVars()).isEmpty();
+        assertThat(queryEntity.getStarted()).isInThePast();
+        assertThat(queryEntity.getRunTime()).isPositive();
+        if(isAtLeastVersion(3,11)){
+            assertThat(queryEntity.getPeakMemoryUsage()).isNotNull();
+        }
         assertThat(queryEntity.getState()).isEqualTo(QueryExecutionState.EXECUTING);
+        assertThat(queryEntity.getStream()).isFalse();
         t.join();
     }
 
@@ -1191,11 +1201,23 @@ void getAndClearSlowQueries(ArangoDatabase db) {
         properties.setSlowQueryThreshold(1L);
         db.setQueryTrackingProperties(properties);
 
-        db.query("return sleep(1.1)", Void.class);
+        String query = "return sleep(1.1)";
+        db.query(query, Void.class);
         final Collection<QueryEntity> slowQueries = db.getSlowQueries();
         assertThat(slowQueries).hasSize(1);
         final QueryEntity queryEntity = slowQueries.iterator().next();
-        assertThat(queryEntity.getQuery()).isEqualTo("return sleep(1.1)");
+        assertThat(queryEntity.getId()).isNotNull();
+        assertThat(queryEntity.getDatabase()).isEqualTo(db.name());
+        assertThat(queryEntity.getUser()).isEqualTo("root");
+        assertThat(queryEntity.getQuery()).isEqualTo(query);
+        assertThat(queryEntity.getBindVars()).isEmpty();
+        assertThat(queryEntity.getStarted()).isInThePast();
+        assertThat(queryEntity.getRunTime()).isPositive();
+        if(isAtLeastVersion(3,11)){
+            assertThat(queryEntity.getPeakMemoryUsage()).isNotNull();
+        }
+        assertThat(queryEntity.getState()).isEqualTo(QueryExecutionState.FINISHED);
+        assertThat(queryEntity.getStream()).isFalse();
 
         db.clearSlowQueries();
         assertThat(db.getSlowQueries()).isEmpty();