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 b9d14edd76b54fafb2b16b8458d5ca78f8e0b538 Author: Lei Rui <[email protected]> AuthorDate: Wed Jun 14 22:52:45 2023 +0800 deprecate old IOMonitor --- .../apache/iotdb/db/engine/cache/ChunkCache.java | 3 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 14 +- .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 16 +- .../iotdb/tsfile/read/common/ChunkSuit4CPV.java | 26 +- .../apache/iotdb/tsfile/read/common/IOMonitor.java | 445 +++++++++++---------- .../iotdb/tsfile/read/reader/page/PageReader.java | 13 +- 6 files changed, 256 insertions(+), 261 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java index 204a99e76ef..9204c10b9ec 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java @@ -26,7 +26,6 @@ import org.apache.iotdb.db.utils.TestOnly; import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; import org.apache.iotdb.tsfile.read.TsFileSequenceReader; import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.IOMonitor; import org.apache.iotdb.tsfile.read.common.IOMonitor2; import org.apache.iotdb.tsfile.read.common.IOMonitor2.Operation; import org.apache.iotdb.tsfile.utils.RamUsageEstimator; @@ -84,7 +83,7 @@ public class ChunkCache { Chunk ret = reader.readMemChunk(chunkMetadata); IOMonitor2.addMeasure( Operation.DCP_B_READ_MEM_CHUNK, System.nanoTime() - start); - IOMonitor.incReadMemChunkTime(System.nanoTime() - start); + // IOMonitor.incReadMemChunkTime(System.nanoTime() - start); return ret; } catch (IOException e) { logger.error("Something wrong happened in reading {}", chunkMetadata, e); diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java index 4c396572e80..b8338773126 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java @@ -127,7 +127,6 @@ import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.IOMonitor; import org.apache.iotdb.tsfile.read.common.IOMonitor2; import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; @@ -670,8 +669,9 @@ public class TSServiceImpl implements TSIService.Iface { public TSExecuteFinishResp executeFinish() throws TException { TSExecuteFinishResp ret = new TSExecuteFinishResp(); ret.setStatus(RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS)); - ret.setExecutionInfo(IOMonitor.print() + "\n" + IOMonitor2.print()); - IOMonitor.finish(); + // ret.setExecutionInfo(IOMonitor.print() + "\n" + IOMonitor2.print()); + // IOMonitor.finish(); + ret.setExecutionInfo(IOMonitor2.print()); // reset is called at the end of IOMonitor2.print() return ret; } @@ -724,8 +724,8 @@ public class TSServiceImpl implements TSIService.Iface { TException, AuthException { // start record execution time - IOMonitor.setSQL(statement); - long start = System.nanoTime(); + // IOMonitor.setSQL(statement); + // long start = System.nanoTime(); queryCount.incrementAndGet(); AUDIT_LOGGER.debug( "Session {} execute Query: {}", sessionManager.getCurrSessionId(), statement); @@ -836,8 +836,8 @@ public class TSServiceImpl implements TSIService.Iface { queryTimeManager.unRegisterQuery(queryId); } - IOMonitor.incTotalTime(System.nanoTime() - start); - IOMonitor.reset(); + // IOMonitor.incTotalTime(System.nanoTime() - start); + // IOMonitor.reset(); return resp; } catch (Exception e) { releaseQueryResourceNoExceptions(queryId); diff --git a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java index 59c2201251b..8993f6797f3 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java @@ -33,7 +33,6 @@ import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; import org.apache.iotdb.tsfile.read.TsFileSequenceReader; import org.apache.iotdb.tsfile.read.common.Chunk; -import org.apache.iotdb.tsfile.read.common.IOMonitor; import org.apache.iotdb.tsfile.read.common.IOMonitor2; import org.apache.iotdb.tsfile.read.common.IOMonitor2.Operation; import org.apache.iotdb.tsfile.read.common.Path; @@ -144,8 +143,7 @@ public class FileLoaderUtils { return null; } } - long duration = System.nanoTime() - start; - IOMonitor.incMeta(duration); + // IOMonitor.incMeta(duration); IOMonitor2.addMeasure(Operation.DCP_A_GET_CHUNK_METADATAS, System.nanoTime() - start); return timeSeriesMetadata; } @@ -168,7 +166,7 @@ public class FileLoaderUtils { */ public static List<IPageReader> loadPageReaderList(ChunkMetadata chunkMetaData, Filter timeFilter) throws IOException { - long start = System.nanoTime(); + // long start = System.nanoTime(); if (chunkMetaData == null) { throw new IOException("Can't init null chunkMeta"); } @@ -185,8 +183,8 @@ public class FileLoaderUtils { new ChunkReader(chunk, timeFilter); // decompress page data, split time&value buffers chunkReader.hasNextSatisfiedPage(); } - long duration = System.nanoTime() - start; - IOMonitor.incDataIOTime(duration); + // long duration = System.nanoTime() - start; + // IOMonitor.incDataIOTime(duration); return chunkReader.loadPageReaderList(); } catch (IOException e) { logger.error( @@ -203,7 +201,7 @@ public class FileLoaderUtils { */ public static PageReader loadPageReaderList4CPV(ChunkMetadata chunkMetaData, Filter timeFilter) throws IOException { - long start = System.nanoTime(); + // long start = System.nanoTime(); if (chunkMetaData == null) { throw new IOException("Can't init null chunkMeta"); } @@ -220,8 +218,8 @@ public class FileLoaderUtils { new ChunkReader(chunk, timeFilter); // decompress page data, split time&value buffers chunkReader.hasNextSatisfiedPage(); } - long duration = System.nanoTime() - start; - IOMonitor.incDataIOTime(duration); + // long duration = System.nanoTime() - start; + // IOMonitor.incDataIOTime(duration); List<IPageReader> pageReaderList = chunkReader.loadPageReaderList(); if (pageReaderList.size() > 1) { // TODO ATTENTION: YOU HAVE TO ENSURE THAT THERE IS ONLY ONE PAGE IN A CHUNK, diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/ChunkSuit4CPV.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/ChunkSuit4CPV.java index d1396da497b..453fe2c6e2b 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/ChunkSuit4CPV.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/ChunkSuit4CPV.java @@ -258,18 +258,18 @@ public class ChunkSuit4CPV { if (pageReader.timeBuffer.getLong(estimatedPos * 8) < targetTimestamp) { while (pageReader.timeBuffer.getLong(estimatedPos * 8) < targetTimestamp) { estimatedPos++; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; } } else if (pageReader.timeBuffer.getLong(estimatedPos * 8) > targetTimestamp) { while (pageReader.timeBuffer.getLong(estimatedPos * 8) > targetTimestamp) { estimatedPos--; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; } if (pageReader.timeBuffer.getLong(estimatedPos * 8) < targetTimestamp) { estimatedPos++; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; } // else equal } // else equal @@ -312,7 +312,7 @@ public class ChunkSuit4CPV { pageReader.valueBuffer.position(pageReader.timeBufferLength); while (pageReader.timeBuffer.remaining() > 0) { estimatedPos++; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; long t = pageReader.timeBuffer.getLong(); if (t >= targetTimestamp) { @@ -376,18 +376,18 @@ public class ChunkSuit4CPV { if (pageReader.timeBuffer.getLong(estimatedPos * 8) > targetTimestamp) { while (pageReader.timeBuffer.getLong(estimatedPos * 8) > targetTimestamp) { estimatedPos--; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; } } else if (pageReader.timeBuffer.getLong(estimatedPos * 8) < targetTimestamp) { while (pageReader.timeBuffer.getLong(estimatedPos * 8) < targetTimestamp) { estimatedPos++; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; } if (pageReader.timeBuffer.getLong(estimatedPos * 8) > targetTimestamp) { estimatedPos--; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; } // else equal } // else equal @@ -430,7 +430,7 @@ public class ChunkSuit4CPV { pageReader.valueBuffer.position(pageReader.timeBufferLength); while (pageReader.timeBuffer.remaining() > 0) { estimatedPos++; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; long t = pageReader.timeBuffer.getLong(); if (t >= targetTimestamp) { @@ -438,7 +438,7 @@ public class ChunkSuit4CPV { } } if (pageReader.timeBuffer.getLong(estimatedPos * 8) > targetTimestamp) { - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; estimatedPos--; } // else equals no need to minus 1 @@ -499,18 +499,18 @@ public class ChunkSuit4CPV { if (pageReader.timeBuffer.getLong(estimatedPos * 8) > targetTimestamp) { while (pageReader.timeBuffer.getLong(estimatedPos * 8) > targetTimestamp) { estimatedPos--; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; } } else if (pageReader.timeBuffer.getLong(estimatedPos * 8) < targetTimestamp) { while (pageReader.timeBuffer.getLong(estimatedPos * 8) < targetTimestamp) { estimatedPos++; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; } if (pageReader.timeBuffer.getLong(estimatedPos * 8) > targetTimestamp) { estimatedPos--; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; } // else equal } // else equal @@ -529,7 +529,7 @@ public class ChunkSuit4CPV { while (pageReader.timeBuffer.remaining() > 0) { if (!flag) { estimatedPos++; - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; } long t = pageReader.timeBuffer.getLong(); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IOMonitor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IOMonitor.java index 3bfed740893..2e025641b07 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IOMonitor.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/IOMonitor.java @@ -1,222 +1,223 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.iotdb.tsfile.read.common; - -import java.util.ArrayList; -import java.util.List; - -/** @author Yuyuan Kang */ -public class IOMonitor { - - public static long metaIOTime; - public static int metaIONum; - public static long dataIOTime; - public static int dataIONum; - public static long readMemChunkTime; - public static int readMemChunkNum; - - public static long totalTime; - public static String sql; - - public static long pointsTraversed; - - public static List<Long> metaIOTimes = new ArrayList<>(); - public static List<Long> dataIOTimes = new ArrayList<>(); - public static List<Long> readMemChunkTimes = new ArrayList<>(); - public static List<Integer> metaIONums = new ArrayList<>(); - public static List<Integer> dataIONums = new ArrayList<>(); - public static List<Integer> readMemChunkNums = new ArrayList<>(); - - public static List<String> sqls = new ArrayList<>(); - public static List<Long> totalTimes = new ArrayList<>(); - - public static List<Long> pointsTraversedList = new ArrayList<>(); - - public static boolean isSet = false; - - public static void incReadMemChunkTime(long v) { - readMemChunkTime += v; - readMemChunkNum++; - } - - public static void resetReadMemChunkTime() { - readMemChunkNums.add(readMemChunkNum); - readMemChunkTimes.add(readMemChunkTime); - readMemChunkTime = 0; - readMemChunkNum = 0; - } - - public static void resetPointsTraversed() { - pointsTraversedList.add(pointsTraversed); - pointsTraversed = 0; - } - - public static void incMeta(long v) { - metaIOTime += v; - metaIONum++; - } - - public static void incPointsTravered() { - pointsTraversed++; - } - - private static void resetMeta() { - metaIOTimes.add(metaIOTime); - metaIONums.add(metaIONum); - metaIOTime = 0; - metaIONum = 0; - } - - public static void incDataIOTime(long v) { - dataIOTime += v; - dataIONum++; - } - - public static void incTotalTime(long val) { - totalTime += val; - } - - private static void resetDataIOTime() { - dataIOTimes.add(dataIOTime); - dataIONums.add(dataIONum); - dataIOTime = 0; - dataIONum = 0; - } - - public static void resetTotalTime() { - totalTimes.add(totalTime); - totalTime = 0; - } - - public static void setSQL(String v) { - if (!isSet) { - clear(); - isSet = true; - sql = v; - } else { - reset(); - sql = v; - } - } - - public static void reset() { - resetMeta(); - resetDataIOTime(); - resetTotalTime(); - resetReadMemChunkTime(); - sqls.add(sql); - sql = null; - resetPointsTraversed(); - } - - // private static double getAvg(List<Long> vals) { - // return (double) getSum(vals) / vals.size(); - // } - - private static long getSumLong(List<Long> vals) { - long sum = 0; - for (Object v : vals) { - sum += (long) v; - } - return sum; - } - - private static long getSumInteger(List<Integer> vals) { - Integer sum = 0; - for (Integer v : vals) { - sum += v; - } - return sum.longValue(); - } - - public static void clear() { - isSet = false; - metaIOTime = 0L; - dataIOTime = 0L; - totalTime = 0L; - readMemChunkTime = 0L; - dataIONum = 0; - metaIONum = 0; - readMemChunkNum = 0; - sql = null; - - metaIOTimes.clear(); - metaIONums.clear(); - dataIONums.clear(); - dataIOTimes.clear(); - sqls.clear(); - totalTimes.clear(); - - pointsTraversedList.clear(); - pointsTraversed = 0; - } - - public static void finish() { - clear(); - isSet = false; - } - - public static String print() { - if (sql != null) { - reset(); - } - String ret = ""; - for (int i = 0; i < sqls.size(); i++) { - ret += - sqls.get(i) - + "\t meta IO: \t" - + metaIOTimes.get(i) - + "\t meta num: \t" - + metaIONums.get(i) - + "\t data IO: \t" - + dataIOTimes.get(i) - + "\t data num: \t" - + dataIONums.get(i) - + "\t readMemChunk IO: \t" - + readMemChunkTimes.get(i) - + "\t readMemChunk num: \t" - + readMemChunkNums.get(i) - + "\t total: \t" - + totalTimes.get(i) - + "\t pointsTraversed: \t" - + pointsTraversedList.get(i) - + "\n"; - } - ret += - "sum meta IO: \t" - + getSumLong(metaIOTimes) - + "\t sum meta nums: \t" - + getSumInteger(metaIONums) - + "\t sum data IO: \t" - + getSumLong(dataIOTimes) - + "\t sum data num: \t" - + getSumInteger(dataIONums) - + "\t sum readMemChunkTime: \t" - + getSumLong(readMemChunkTimes) - + "\t sum readMemChunkNum: \t" - + getSumInteger(readMemChunkNums) - + "\t avg total time: \t" - + getSumLong(totalTimes) - + "\t points traversed: \t" - + getSumLong(pointsTraversedList) - + "\t isSet: \t" - + isSet; - return ret; - } -} +/// * +// * Licensed to the Apache Software Foundation (ASF) under one +// * or more contributor license agreements. See the NOTICE file +// * distributed with this work for additional information +// * regarding copyright ownership. The ASF licenses this file +// * to you under the Apache License, Version 2.0 (the +// * "License"); you may not use this file except in compliance +// * with the License. You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, +// * software distributed under the License is distributed on an +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// * KIND, either express or implied. See the License for the +// * specific language governing permissions and limitations +// * under the License. +// */ +// package org.apache.iotdb.tsfile.read.common; +// +// import java.util.ArrayList; +// import java.util.List; +// +// @Deprecated +/// ** @author Yuyuan Kang */ +// public class IOMonitor { +// +// public static long metaIOTime; +// public static int metaIONum; +// public static long dataIOTime; +// public static int dataIONum; +// public static long readMemChunkTime; +// public static int readMemChunkNum; +// +// public static long totalTime; +// public static String sql; +// +// public static long pointsTraversed; +// +// public static List<Long> metaIOTimes = new ArrayList<>(); +// public static List<Long> dataIOTimes = new ArrayList<>(); +// public static List<Long> readMemChunkTimes = new ArrayList<>(); +// public static List<Integer> metaIONums = new ArrayList<>(); +// public static List<Integer> dataIONums = new ArrayList<>(); +// public static List<Integer> readMemChunkNums = new ArrayList<>(); +// +// public static List<String> sqls = new ArrayList<>(); +// public static List<Long> totalTimes = new ArrayList<>(); +// +// public static List<Long> pointsTraversedList = new ArrayList<>(); +// +// public static boolean isSet = false; +// +// public static void incReadMemChunkTime(long v) { +// readMemChunkTime += v; +// readMemChunkNum++; +// } +// +// public static void resetReadMemChunkTime() { +// readMemChunkNums.add(readMemChunkNum); +// readMemChunkTimes.add(readMemChunkTime); +// readMemChunkTime = 0; +// readMemChunkNum = 0; +// } +// +// public static void resetPointsTraversed() { +// pointsTraversedList.add(pointsTraversed); +// pointsTraversed = 0; +// } +// +// public static void incMeta(long v) { +// metaIOTime += v; +// metaIONum++; +// } +// +// public static void incPointsTravered() { +// pointsTraversed++; +// } +// +// private static void resetMeta() { +// metaIOTimes.add(metaIOTime); +// metaIONums.add(metaIONum); +// metaIOTime = 0; +// metaIONum = 0; +// } +// +// public static void incDataIOTime(long v) { +// dataIOTime += v; +// dataIONum++; +// } +// +// public static void incTotalTime(long val) { +// totalTime += val; +// } +// +// private static void resetDataIOTime() { +// dataIOTimes.add(dataIOTime); +// dataIONums.add(dataIONum); +// dataIOTime = 0; +// dataIONum = 0; +// } +// +// public static void resetTotalTime() { +// totalTimes.add(totalTime); +// totalTime = 0; +// } +// +// public static void setSQL(String v) { +// if (!isSet) { +// clear(); +// isSet = true; +// sql = v; +// } else { +// reset(); +// sql = v; +// } +// } +// +// public static void reset() { +// resetMeta(); +// resetDataIOTime(); +// resetTotalTime(); +// resetReadMemChunkTime(); +// sqls.add(sql); +// sql = null; +// resetPointsTraversed(); +// } +// +// // private static double getAvg(List<Long> vals) { +// // return (double) getSum(vals) / vals.size(); +// // } +// +// private static long getSumLong(List<Long> vals) { +// long sum = 0; +// for (Object v : vals) { +// sum += (long) v; +// } +// return sum; +// } +// +// private static long getSumInteger(List<Integer> vals) { +// Integer sum = 0; +// for (Integer v : vals) { +// sum += v; +// } +// return sum.longValue(); +// } +// +// public static void clear() { +// isSet = false; +// metaIOTime = 0L; +// dataIOTime = 0L; +// totalTime = 0L; +// readMemChunkTime = 0L; +// dataIONum = 0; +// metaIONum = 0; +// readMemChunkNum = 0; +// sql = null; +// +// metaIOTimes.clear(); +// metaIONums.clear(); +// dataIONums.clear(); +// dataIOTimes.clear(); +// sqls.clear(); +// totalTimes.clear(); +// +// pointsTraversedList.clear(); +// pointsTraversed = 0; +// } +// +// public static void finish() { +// clear(); +// isSet = false; +// } +// +// public static String print() { +// if (sql != null) { +// reset(); +// } +// String ret = ""; +// for (int i = 0; i < sqls.size(); i++) { +// ret += +// sqls.get(i) +// + "\t meta IO: \t" +// + metaIOTimes.get(i) +// + "\t meta num: \t" +// + metaIONums.get(i) +// + "\t data IO: \t" +// + dataIOTimes.get(i) +// + "\t data num: \t" +// + dataIONums.get(i) +// + "\t readMemChunk IO: \t" +// + readMemChunkTimes.get(i) +// + "\t readMemChunk num: \t" +// + readMemChunkNums.get(i) +// + "\t total: \t" +// + totalTimes.get(i) +// + "\t pointsTraversed: \t" +// + pointsTraversedList.get(i) +// + "\n"; +// } +// ret += +// "sum meta IO: \t" +// + getSumLong(metaIOTimes) +// + "\t sum meta nums: \t" +// + getSumInteger(metaIONums) +// + "\t sum data IO: \t" +// + getSumLong(dataIOTimes) +// + "\t sum data num: \t" +// + getSumInteger(dataIONums) +// + "\t sum readMemChunkTime: \t" +// + getSumLong(readMemChunkTimes) +// + "\t sum readMemChunkNum: \t" +// + getSumInteger(readMemChunkNums) +// + "\t avg total time: \t" +// + getSumLong(totalTimes) +// + "\t points traversed: \t" +// + getSumLong(pointsTraversedList) +// + "\t isSet: \t" +// + isSet; +// return ret; +// } +// } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java index cc667ab3844..a75b368c00d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/PageReader.java @@ -30,7 +30,6 @@ import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; import org.apache.iotdb.tsfile.read.common.BatchData; import org.apache.iotdb.tsfile.read.common.BatchDataFactory; import org.apache.iotdb.tsfile.read.common.ChunkSuit4CPV; -import org.apache.iotdb.tsfile.read.common.IOMonitor; import org.apache.iotdb.tsfile.read.common.IOMonitor2; import org.apache.iotdb.tsfile.read.common.IOMonitor2.Operation; import org.apache.iotdb.tsfile.read.common.TimeRange; @@ -122,13 +121,11 @@ public class PageReader implements IPageReader { Map<Integer, List<ChunkSuit4CPV>> splitChunkList, ChunkMetadata chunkMetadata) throws IOException { // note: [startTime,endTime), [curStartTime,curEndTime) - // int curIdx = (int) Math.floor((curStartTime - startTime) * 1.0 / interval); // global - // index + // endTime is excluded so -1 int numberOfSpans = (int) Math.floor( - (Math.min(chunkMetadata.getEndTime(), endTime - 1) // endTime is excluded so -1 - - curStartTime) + (Math.min(chunkMetadata.getEndTime(), endTime - 1) - curStartTime) * 1.0 / interval) + 1; @@ -148,7 +145,7 @@ public class PageReader implements IPageReader { LP_pos = chunkSuit4CPV.updateLPwithTheClosetPointEqualOrBefore(rightEndExcluded - 1); } if (FP_pos != -1 && LP_pos != -1 && FP_pos > LP_pos) { - // means the chunk has no point in this span, do nothing + // means the chunk has no point in this span, do nothing. continue; } else { // add this chunkSuit4CPV into currentChunkList or splitChunkList if (n == 0) { @@ -187,7 +184,7 @@ public class PageReader implements IPageReader { // [startPos,endPos] definitely for curStartTime interval, thanks to split4CPV int count = 0; // update here, not in statistics for (int pos = chunkSuit4CPV.startPos; pos <= chunkSuit4CPV.endPos; pos++) { - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; long timestamp = timeBuffer.getLong(pos * 8); switch (dataType) { @@ -242,7 +239,7 @@ public class PageReader implements IPageReader { BatchData pageData = BatchDataFactory.createBatchData(dataType, ascending, false); while (timeDecoder.hasNext(timeBuffer)) { - IOMonitor.incPointsTravered(); + // IOMonitor.incPointsTravered(); IOMonitor2.DCP_D_traversedPointNum++; long timestamp = timeDecoder.readLong(timeBuffer); switch (dataType) {
