[incubator-iotdb] branch cluster_read updated: add read resource usage

[lta]

This is an automated email from the ASF dual-hosted git repository.

lta pushed a commit to branch cluster_read
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/cluster_read by this push:
     new 401eb2d  add read resource usage
401eb2d is described below

commit 401eb2da21e9067c9adfa67a384641221f7c5551
Author: lta <litiana...@163.com>
AuthorDate: Wed Apr 24 19:24:06 2019 +0800

    add read resource usage
---
 .../coordinatornode/ClusterRpcSingleQueryManager.java        |  4 ++++
 .../cluster/query/timegenerator/ClusterNodeConstructor.java  | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/coordinatornode/ClusterRpcSingleQueryManager.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/coordinatornode/ClusterRpcSingleQueryManager.java
index fd7cfa6..200edaf 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/coordinatornode/ClusterRpcSingleQueryManager.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/manager/coordinatornode/ClusterRpcSingleQueryManager.java
@@ -346,6 +346,10 @@ public class ClusterRpcSingleQueryManager implements 
IClusterRpcSingleQueryManag
     return dataGroupUsage;
   }
 
+  public void addDataGroupUsage(String groupId) {
+    this.dataGroupUsage.add(groupId);
+  }
+
   public String getTaskId() {
     return taskId;
   }
diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/timegenerator/ClusterNodeConstructor.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/timegenerator/ClusterNodeConstructor.java
index 969f513..639dce8 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/timegenerator/ClusterNodeConstructor.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/timegenerator/ClusterNodeConstructor.java
@@ -40,6 +40,11 @@ import 
org.apache.iotdb.tsfile.read.query.timegenerator.node.Node;
 public class ClusterNodeConstructor extends AbstractNodeConstructor {
 
   /**
+   * Single query manager
+   */
+  private ClusterRpcSingleQueryManager queryManager;
+
+  /**
    * Filter series reader group by  group id
    */
   private Map<String, List<ClusterFilterSeriesReader>> 
filterSeriesReadersByGroupId;
@@ -50,6 +55,7 @@ public class ClusterNodeConstructor extends 
AbstractNodeConstructor {
   private Map<String, Integer> filterSeriesReaderIndex;
 
   public ClusterNodeConstructor(ClusterRpcSingleQueryManager queryManager) {
+    this.queryManager = queryManager;
     this.filterSeriesReadersByGroupId = new HashMap<>();
     this.filterSeriesReaderIndex = new HashMap<>();
     this.init(queryManager);
@@ -85,9 +91,11 @@ public class ClusterNodeConstructor extends 
AbstractNodeConstructor {
           int readerIndex = filterSeriesReaderIndex.get(groupId);
           filterSeriesReaderIndex.put(groupId, readerIndex + 1);
           return new ClusterLeafNode(seriesReaders.get(readerIndex));
+        } else {
+          queryManager.addDataGroupUsage(groupId);
+          return new 
ClusterLeafNode(generateSeriesReader((SingleSeriesExpression) expression,
+              context));
         }
-        return new 
ClusterLeafNode(generateSeriesReader((SingleSeriesExpression) expression,
-            context));
       } catch (IOException | PathErrorException e) {
         throw new FileNodeManagerException(e);
       }