This is an automated email from the ASF dual-hosted git repository. leirui pushed a commit to branch research/M4-visualization in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f3aefc3a74e157094916e264a4db13063c7b60ce Author: Lei Rui <[email protected]> AuthorDate: Fri Jun 16 16:45:49 2023 +0800 detail dataSetType info --- .../src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java | 1 - .../db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java | 5 +++++ .../main/java/org/apache/iotdb/tsfile/read/common/IOMonitor2.java | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java index a37e1ddf3a2..ffff5ac268d 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java @@ -533,7 +533,6 @@ public class PlanExecutor implements IPlanExecutor { GroupByTimeFillPlan groupByFillPlan = (GroupByTimeFillPlan) queryPlan; queryDataSet = queryRouter.groupByFill(groupByFillPlan, context); } else if (queryPlan instanceof GroupByTimePlan) { - IOMonitor2.dataSetType = DataSetType.GroupByWithoutValueFilterDataSet; GroupByTimePlan groupByTimePlan = (GroupByTimePlan) queryPlan; queryDataSet = queryRouter.groupBy(groupByTimePlan, context); } else if (queryPlan instanceof QueryIndexPlan) { diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java index 3d270cfa96d..05ae0fc6de2 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java @@ -32,6 +32,8 @@ import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.query.factory.AggregateResultFactory; import org.apache.iotdb.db.query.filter.TsFileFilter; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.iotdb.tsfile.read.common.IOMonitor2; +import org.apache.iotdb.tsfile.read.common.IOMonitor2.DataSetType; import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.read.common.RowRecord; import org.apache.iotdb.tsfile.read.expression.IExpression; @@ -199,10 +201,13 @@ public class GroupByWithoutValueFilterDataSet extends GroupByEngineDataSet { throws StorageEngineException, QueryProcessException { if (CONFIG.isEnableCPV()) { // System.out.println("====DEBUG====: use LocalGroupByExecutor4CPV for CPV"); + IOMonitor2.dataSetType = + DataSetType.GroupByWithoutValueFilterDataSet_LocalGroupByExecutor4CPV; return new LocalGroupByExecutor4CPV( path, allSensors, dataType, context, timeFilter, fileFilter, ascending); } else { // System.out.println("====DEBUG====: use LocalGroupByExecutor for MOC"); + IOMonitor2.dataSetType = DataSetType.GroupByWithoutValueFilterDataSet_LocalGroupByExecutor; return new LocalGroupByExecutor( path, allSensors, dataType, context, timeFilter, fileFilter, ascending); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IOMonitor2.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IOMonitor2.java index 903aa402654..7541741b1f4 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IOMonitor2.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IOMonitor2.java @@ -25,7 +25,9 @@ public class IOMonitor2 { NONE, RawQueryDataSetWithoutValueFilter, UDTFAlignByTimeDataSet, - GroupByWithoutValueFilterDataSet + GroupByWithoutValueFilterDataSet_LocalGroupByExecutor4CPV, + + GroupByWithoutValueFilterDataSet_LocalGroupByExecutor } public enum Operation {
