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 8fd0e7e20815fda383675005ce97d1af339024ae Author: Lei Rui <[email protected]> AuthorDate: Sun Jun 18 17:08:52 2023 +0800 update dataSetType --- .../groupby/GroupByWithoutValueFilterDataSet.java | 22 ++++++++++++++++------ .../iotdb/tsfile/read/common/IOMonitor2.java | 10 ++++++---- 2 files changed, 22 insertions(+), 10 deletions(-) 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 05ae0fc6de2..0b8d58f145e 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 @@ -31,6 +31,7 @@ import org.apache.iotdb.db.query.aggregation.AggregateResult; 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.common.conf.TSFileDescriptor; 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; @@ -200,14 +201,23 @@ public class GroupByWithoutValueFilterDataSet extends GroupByEngineDataSet { boolean ascending) throws StorageEngineException, QueryProcessException { if (CONFIG.isEnableCPV()) { - // System.out.println("====DEBUG====: use LocalGroupByExecutor4CPV for CPV"); - IOMonitor2.dataSetType = - DataSetType.GroupByWithoutValueFilterDataSet_LocalGroupByExecutor4CPV; + if (TSFileDescriptor.getInstance().getConfig().isUseChunkIndex()) { + IOMonitor2.dataSetType = + DataSetType.GroupByWithoutValueFilterDataSet_LocalGroupByExecutor4CPV_UseIndex; + } else { + IOMonitor2.dataSetType = + DataSetType.GroupByWithoutValueFilterDataSet_LocalGroupByExecutor4CPV_NotUseIndex; + } return new LocalGroupByExecutor4CPV( path, allSensors, dataType, context, timeFilter, fileFilter, ascending); - } else { - // System.out.println("====DEBUG====: use LocalGroupByExecutor for MOC"); - IOMonitor2.dataSetType = DataSetType.GroupByWithoutValueFilterDataSet_LocalGroupByExecutor; + } else { // enableCPV=false + if (TSFileDescriptor.getInstance().getConfig().isUseStatistics()) { + IOMonitor2.dataSetType = + DataSetType.GroupByWithoutValueFilterDataSet_LocalGroupByExecutor_UseStatistics; + } else { + IOMonitor2.dataSetType = + DataSetType.GroupByWithoutValueFilterDataSet_LocalGroupByExecutor_NotUseStatistics; + } 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 d9b436b8c5e..62e79e40fac 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 @@ -24,11 +24,13 @@ public class IOMonitor2 { public enum DataSetType { // dataSet, executor, reader, file NONE, RawQueryDataSetWithoutValueFilter, - UDTFAlignByTimeDataSet_M4_POINT, - UDTFAlignByTimeDataSet_M4_TIMEWINDOW, - GroupByWithoutValueFilterDataSet_LocalGroupByExecutor4CPV, + UDTFAlignByTimeDataSet_M4_POINT, // mac + UDTFAlignByTimeDataSet_M4_TIMEWINDOW, // mac_tw + GroupByWithoutValueFilterDataSet_LocalGroupByExecutor4CPV_UseIndex, // cpv + GroupByWithoutValueFilterDataSet_LocalGroupByExecutor4CPV_NotUseIndex, // cpv_noIndex - GroupByWithoutValueFilterDataSet_LocalGroupByExecutor + GroupByWithoutValueFilterDataSet_LocalGroupByExecutor_UseStatistics, // moc + GroupByWithoutValueFilterDataSet_LocalGroupByExecutor_NotUseStatistics // mac_groupBy } public enum Operation {
