backend entry iter

Author: Pengzna

hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KoutAPI.java

@@ -103,26 +103,30 @@ public String get(@Context GraphManager manager,
                                                       (TaskMemoryPool) currentTaskPool);
         MemoryPool currentOperationPool = currentTaskPool.addChildPool("kout-main-operation");
 
-        ApiMeasurer measure = new ApiMeasurer();
+        try {
+            ApiMeasurer measure = new ApiMeasurer();
 
-        Id sourceId = VertexAPI.checkAndParseVertexId(source);
-        Directions dir = Directions.convert(EdgeAPI.parseDirection(direction));
+            Id sourceId = VertexAPI.checkAndParseVertexId(source);
+            Directions dir = Directions.convert(EdgeAPI.parseDirection(direction));
 
-        HugeGraph g = graph(manager, graph);
+            HugeGraph g = graph(manager, graph);
 
-        Set<Id> ids;
-        try (KoutTraverser traverser = new KoutTraverser(g)) {
-            ids = traverser.kout(sourceId, dir, edgeLabel, depth,
-                                 nearest, maxDegree, capacity, limit);
-            measure.addIterCount(traverser.vertexIterCounter.get(),
-                                 traverser.edgeIterCounter.get());
-        }
+            Set<Id> ids;
+            try (KoutTraverser traverser = new KoutTraverser(g)) {
+                ids = traverser.kout(sourceId, dir, edgeLabel, depth,
+                                     nearest, maxDegree, capacity, limit);
+                measure.addIterCount(traverser.vertexIterCounter.get(),
+                                     traverser.edgeIterCounter.get());
+            }
 
-        if (count_only) {
-            return manager.serializer(g, measure.measures())
-                          .writeMap(ImmutableMap.of("vertices_size", ids.size()));
+            if (count_only) {
+                return manager.serializer(g, measure.measures())
+                              .writeMap(ImmutableMap.of("vertices_size", ids.size()));
+            }
+            return manager.serializer(g, measure.measures()).writeList("vertices", ids);
+        } finally {
+            queryPool.releaseSelf("Complete kout query", false);
         }
-        return manager.serializer(g, measure.measures()).writeList("vertices", ids);
     }
 
     @POST

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/store/BackendTable.java

@@ -27,6 +27,8 @@
 import org.apache.hugegraph.backend.query.ConditionQuery;
 import org.apache.hugegraph.backend.query.Query;
 import org.apache.hugegraph.backend.serializer.BytesBuffer;
+import org.apache.hugegraph.memory.MemoryManager;
+import org.apache.hugegraph.memory.pool.MemoryPool;
 import org.apache.hugegraph.type.HugeType;
 import org.apache.hugegraph.type.define.Directions;
 import org.apache.hugegraph.type.define.HugeKeys;
@@ -135,7 +137,14 @@ public static final String joinTableName(String prefix, String table) {
 
     public abstract void clear(Session session);
 
-    public abstract Iterator<BackendEntry> query(Session session, Query query);
+    public Iterator<BackendEntry> query(Session session, Query query) {
+        MemoryPool currentTaskPool = MemoryManager.getInstance()
+                                                  .getCorrespondingTaskMemoryPool(
+                                                          Thread.currentThread().getName());
+        MemoryPool currentOperationPool =
+                currentTaskPool.addChildPool("BackendTable-Iterator");
+        return null;
+    }
 
     public Iterator<BackendEntry> queryOlap(Session session, Query query) {
         throw new NotImplementedException();

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/util/Consumers.java

@@ -118,13 +118,13 @@ public void start(String name) {
     }
 
     private Void runAndDone(MemoryPool queryPool) {
+        MemoryPool currentTaskPool = queryPool.addChildPool("kout-consume-task");
+        MemoryManager.getInstance()
+                     .bindCorrespondingTaskMemoryPool(Thread.currentThread().getName(),
+                                                      (TaskMemoryPool) currentTaskPool);
+        MemoryPool currentOperationPool =
+                currentTaskPool.addChildPool("kout-consume-operation");
         try {
-            MemoryPool currentTaskPool = queryPool.addChildPool("kout-consume-task");
-            MemoryManager.getInstance()
-                         .bindCorrespondingTaskMemoryPool(Thread.currentThread().getName(),
-                                                          (TaskMemoryPool) currentTaskPool);
-            MemoryPool currentOperationPool =
-                    currentTaskPool.addChildPool("kout-consume-operation");
             this.run();
         } catch (Throwable e) {
             if (e instanceof StopExecution) {
@@ -139,6 +139,7 @@ private Void runAndDone(MemoryPool queryPool) {
         } finally {
             this.done();
             this.latch.countDown();
+            currentTaskPool.releaseSelf("Complete kout consume task", false);
         }
         return null;
     }

hugegraph-server/hugegraph-hstore/src/main/java/org/apache/hugegraph/backend/store/hstore/HstoreTable.java

@@ -312,6 +312,7 @@ public Number queryNumber(Session session, Query query) {
 
     @Override
     public Iterator<BackendEntry> query(Session session, Query query) {
+        super.query(session, query);
         if (query.limit() == 0L && !query.noLimit()) {
             // LOG.debug("Return empty result(limit=0) for query {}", query);
             return Collections.emptyIterator();

hugegraph-server/hugegraph-rocksdb/src/main/java/org/apache/hugegraph/backend/store/rocksdb/RocksDBTable.java

@@ -143,6 +143,7 @@ public Number queryNumber(RocksDBSessions.Session session, Query query) {
 
     @Override
     public Iterator<BackendEntry> query(RocksDBSessions.Session session, Query query) {
+        super.query(session, query);
         if (query.limit() == 0L && !query.noLimit()) {
             LOG.debug("Return empty result(limit=0) for query {}", query);
             return Collections.emptyIterator();