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 c4a6be4cea42760339ec5cecaf9981b1458a4e79 Author: Lei Rui <[email protected]> AuthorDate: Thu Jul 13 21:01:31 2023 +0800 simplify metrics --- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 30 +- .../dataset/groupby/LocalGroupByExecutor4CPV.java | 37 +- .../apache/iotdb/db/integration/m4/MyTest1.java | 6 +- .../iotdb/tsfile/common/conf/TSFileConfig.java | 148 +--- .../iotdb/tsfile/common/conf/TSFileDescriptor.java | 18 +- .../file/metadata/statistics/ValueIndex.java | 6 +- .../iotdb/tsfile/read/common/ChunkSuit4CPV.java | 13 +- .../iotdb/tsfile/read/common/IOMonitor2.java | 833 +++++++++++---------- .../iotdb/tsfile/read/reader/page/PageReader.java | 16 +- 9 files changed, 536 insertions(+), 571 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index 2bc2f557910..b7a80faebae 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -18,16 +18,6 @@ */ package org.apache.iotdb.db.conf; -import com.google.common.net.InetAddresses; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.UnknownHostException; -import java.util.Properties; import org.apache.iotdb.db.conf.directories.DirectoryManager; import org.apache.iotdb.db.engine.StorageEngine; import org.apache.iotdb.db.engine.compaction.CompactionStrategy; @@ -37,9 +27,21 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; import org.apache.iotdb.tsfile.fileSystem.FSType; import org.apache.iotdb.tsfile.utils.FilePathUtils; + +import com.google.common.net.InetAddresses; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.UnknownHostException; +import java.util.Properties; + public class IoTDBDescriptor { private static final Logger logger = LoggerFactory.getLogger(IoTDBDescriptor.class); @@ -105,9 +107,7 @@ public class IoTDBDescriptor { } } - /** - * load an property file and set TsfileDBConfig variables. - */ + /** load an property file and set TsfileDBConfig variables. */ @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning private void loadProps() { URL url = getPropsUrl(); @@ -1322,9 +1322,7 @@ public class IoTDBDescriptor { } } - /** - * Get default encode algorithm by data type - */ + /** Get default encode algorithm by data type */ public TSEncoding getDefaultEncodingByType(TSDataType dataType) { switch (dataType) { case BOOLEAN: diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutor4CPV.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutor4CPV.java index f30f936663f..0c541766eb4 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutor4CPV.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutor4CPV.java @@ -38,8 +38,6 @@ import org.apache.iotdb.tsfile.file.metadata.statistics.IntegerStatistics; import org.apache.iotdb.tsfile.file.metadata.statistics.LongStatistics; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; import org.apache.iotdb.tsfile.read.common.ChunkSuit4CPV; -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; import org.apache.iotdb.tsfile.read.filter.GroupByFilter; import org.apache.iotdb.tsfile.read.filter.basic.Filter; @@ -95,7 +93,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor { TsFileFilter fileFilter, boolean ascending) throws StorageEngineException, QueryProcessException { - long start = System.nanoTime(); + // long start = System.nanoTime(); this.tsDataType = dataType; // this.mergeReader = new PriorityMergeReader(); @@ -233,7 +231,8 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor { throw new QueryProcessException(e.getMessage()); } - IOMonitor2.addMeasure(Operation.M4_LSM_INIT_LOAD_ALL_CHUNKMETADATAS, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.M4_LSM_INIT_LOAD_ALL_CHUNKMETADATAS, System.nanoTime() - + // start); } @Override @@ -244,7 +243,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor { private void getCurrentChunkListFromFutureChunkList( long curStartTime, long curEndTime, long startTime, long endTime, long interval) throws IOException { - IOMonitor2.M4_LSM_status = Operation.M4_LSM_MERGE_M4_TIME_SPAN; + // IOMonitor2.M4_LSM_status = Operation.M4_LSM_MERGE_M4_TIME_SPAN; // empty currentChunkList currentChunkList = new ArrayList<>(); @@ -320,29 +319,29 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor { result.reset(); } - long start = System.nanoTime(); + // long start = System.nanoTime(); getCurrentChunkListFromFutureChunkList(curStartTime, curEndTime, startTime, endTime, interval); - IOMonitor2.addMeasure(Operation.M4_LSM_MERGE_M4_TIME_SPAN, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.M4_LSM_MERGE_M4_TIME_SPAN, System.nanoTime() - start); if (currentChunkList.size() == 0) { return results; } - start = System.nanoTime(); + // start = System.nanoTime(); calculateFirstPoint(currentChunkList, startTime, endTime, interval, curStartTime); - IOMonitor2.addMeasure(Operation.M4_LSM_FP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.M4_LSM_FP, System.nanoTime() - start); - start = System.nanoTime(); + // start = System.nanoTime(); calculateLastPoint(currentChunkList, startTime, endTime, interval, curStartTime); - IOMonitor2.addMeasure(Operation.M4_LSM_LP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.M4_LSM_LP, System.nanoTime() - start); - start = System.nanoTime(); + // start = System.nanoTime(); calculateBottomPoint(currentChunkList, startTime, endTime, interval, curStartTime); - IOMonitor2.addMeasure(Operation.M4_LSM_BP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.M4_LSM_BP, System.nanoTime() - start); - start = System.nanoTime(); + // start = System.nanoTime(); calculateTopPoint(currentChunkList, startTime, endTime, interval, curStartTime); - IOMonitor2.addMeasure(Operation.M4_LSM_TP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.M4_LSM_TP, System.nanoTime() - start); return results; } @@ -354,7 +353,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor { long interval, long curStartTime) throws IOException { - IOMonitor2.M4_LSM_status = Operation.M4_LSM_BP; + // IOMonitor2.M4_LSM_status = Operation.M4_LSM_BP; // check size>0 because after updateBPTP because empty ChunkSuit4CPV will be removed from // currentChunkList while (currentChunkList.size() > 0) { // loop 1 @@ -545,7 +544,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor { long interval, long curStartTime) throws IOException { - IOMonitor2.M4_LSM_status = Operation.M4_LSM_TP; + // IOMonitor2.M4_LSM_status = Operation.M4_LSM_TP; // check size>0 because after updateBPTP empty ChunkSuit4CPV will be removed from // currentChunkList while (currentChunkList.size() > 0) { // loop 1 @@ -747,7 +746,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor { long interval, long curStartTime) throws IOException { - IOMonitor2.M4_LSM_status = Operation.M4_LSM_FP; + // IOMonitor2.M4_LSM_status = Operation.M4_LSM_FP; while (currentChunkList.size() > 0) { // loop 1 // sorted by startTime and version, find FP candidate currentChunkList.sort( @@ -858,7 +857,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor { long interval, long curStartTime) throws IOException { - IOMonitor2.M4_LSM_status = Operation.M4_LSM_LP; + // IOMonitor2.M4_LSM_status = Operation.M4_LSM_LP; while (currentChunkList.size() > 0) { // loop 1 // sorted by endTime and version, find LP candidate currentChunkList.sort( diff --git a/server/src/test/java/org/apache/iotdb/db/integration/m4/MyTest1.java b/server/src/test/java/org/apache/iotdb/db/integration/m4/MyTest1.java index 6953a73198c..cfbe5c63e81 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/m4/MyTest1.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/m4/MyTest1.java @@ -72,8 +72,8 @@ public class MyTest1 { originalEnableCPV = config.isEnableCPV(); config.setEnableCPV(true); // CPV -// originalUseChunkIndex = TSFileDescriptor.getInstance().getConfig().isUseTimeIndex(); -// TSFileDescriptor.getInstance().getConfig().setUseTimeIndex(false); + // originalUseChunkIndex = TSFileDescriptor.getInstance().getConfig().isUseTimeIndex(); + // TSFileDescriptor.getInstance().getConfig().setUseTimeIndex(false); originalUseMad = TSFileDescriptor.getInstance().getConfig().isUseMad(); TSFileDescriptor.getInstance().getConfig().setUseMad(true); @@ -90,7 +90,7 @@ public class MyTest1 { EnvironmentUtils.cleanEnv(); config.setCompactionStrategy(originalCompactionStrategy); config.setEnableCPV(originalEnableCPV); -// TSFileDescriptor.getInstance().getConfig().setUseTimeIndex(originalUseChunkIndex); + // TSFileDescriptor.getInstance().getConfig().setUseTimeIndex(originalUseChunkIndex); TSFileDescriptor.getInstance().getConfig().setUseMad(originalUseMad); } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java index 4c212eb4bc4..337f990d42f 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java @@ -18,14 +18,13 @@ */ package org.apache.iotdb.tsfile.common.conf; -import java.io.Serializable; -import java.nio.charset.Charset; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.fileSystem.FSType; -/** - * TSFileConfig is a configure class. Every variables is public and has default value. - */ +import java.io.Serializable; +import java.nio.charset.Charset; + +/** TSFileConfig is a configure class. Every variables is public and has default value. */ public class TSFileConfig implements Serializable { private boolean useStatistics = true; @@ -38,9 +37,7 @@ public class TSFileConfig implements Serializable { private int errorParam = 1; - /** - * encoding configuration - */ + /** encoding configuration */ public static final int RLE_MIN_REPEATED_NUM = 8; public static final int RLE_MAX_REPEATED_NUM = 0x7FFF; @@ -62,9 +59,7 @@ public class TSFileConfig implements Serializable { public static final float GORILLA_ENCODING_ENDING_FLOAT = Float.NaN; public static final double GORILLA_ENCODING_ENDING_DOUBLE = Double.NaN; - /** - * String encoder with UTF-8 encodes a character to at most 4 bytes. - */ + /** String encoder with UTF-8 encodes a character to at most 4 bytes. */ public static final int BYTE_SIZE_PER_CHAR = 4; public static final String STRING_ENCODING = "UTF-8"; @@ -73,49 +68,29 @@ public class TSFileConfig implements Serializable { public static final String MAGIC_STRING = "TsFile"; public static final String VERSION_NUMBER_V2 = "000002"; public static final String VERSION_NUMBER_V1 = "000001"; - /** - * version number is changed to use 1 byte to represent since version 3 - */ + /** version number is changed to use 1 byte to represent since version 3 */ public static final byte VERSION_NUMBER = 0x03; - /** - * Bloom filter constrain - */ + /** Bloom filter constrain */ public static final double MIN_BLOOM_FILTER_ERROR_RATE = 0.01; public static final double MAX_BLOOM_FILTER_ERROR_RATE = 0.1; - /** - * The primitive array capacity threshold. - */ + /** The primitive array capacity threshold. */ public static final int ARRAY_CAPACITY_THRESHOLD = 1000; - /** - * Memory size threshold for flushing to disk, default value is 128MB. - */ + /** Memory size threshold for flushing to disk, default value is 128MB. */ private int groupSizeInByte = 128 * 1024 * 1024; - /** - * The memory size for each series writer to pack page, default value is 64KB. - */ + /** The memory size for each series writer to pack page, default value is 64KB. */ private int pageSizeInByte = 64 * 1024; - /** - * The maximum number of data points in a page, default value is 1024 * 1024. - */ + /** The maximum number of data points in a page, default value is 1024 * 1024. */ private int maxNumberOfPointsInPage = 1024 * 1024; - /** - * The maximum degree of a metadataIndex node, default value is 256 - */ + /** The maximum degree of a metadataIndex node, default value is 256 */ private int maxDegreeOfIndexNode = 256; - /** - * Data type for input timestamp, TsFile supports INT32 or INT64. - */ + /** Data type for input timestamp, TsFile supports INT32 or INT64. */ private String timeSeriesDataType = "INT64"; - /** - * Max length limitation of input string. - */ + /** Max length limitation of input string. */ private int maxStringLength = 128; - /** - * Floating-point precision. - */ + /** Floating-point precision. */ private int floatPrecision = 2; /** * Encoder of time column, TsFile supports TS_2DIFF, PLAIN and RLE(run-length encoding) Default @@ -129,73 +104,39 @@ public class TSFileConfig implements Serializable { * supports PLAIN. */ private String valueEncoder = "PLAIN"; - /** - * Default bit width of RLE encoding is 8. - */ + /** Default bit width of RLE encoding is 8. */ private int rleBitWidth = 8; - /** - * Default block size of two-diff. delta encoding is 128 - */ + /** Default block size of two-diff. delta encoding is 128 */ private int deltaBlockSize = 128; - /** - * Default frequency type is SINGLE_FREQ. - */ + /** Default frequency type is SINGLE_FREQ. */ private String freqType = "SINGLE_FREQ"; - /** - * Default PLA max error is 100. - */ + /** Default PLA max error is 100. */ private double plaMaxError = 100; - /** - * Default SDT max error is 100. - */ + /** Default SDT max error is 100. */ private double sdtMaxError = 100; - /** - * Default DFT satisfy rate is 0.1 - */ + /** Default DFT satisfy rate is 0.1 */ private double dftSatisfyRate = 0.1; - /** - * Data compression method, TsFile supports UNCOMPRESSED, SNAPPY or LZ4. - */ + /** Data compression method, TsFile supports UNCOMPRESSED, SNAPPY or LZ4. */ private CompressionType compressor = CompressionType.UNCOMPRESSED; - /** - * Line count threshold for checking page memory occupied size. - */ + /** Line count threshold for checking page memory occupied size. */ private int pageCheckSizeThreshold = 100; - /** - * Default endian value is BIG_ENDIAN. - */ + /** Default endian value is BIG_ENDIAN. */ private String endian = "BIG_ENDIAN"; - /** - * Default storage is in local file system - */ + /** Default storage is in local file system */ private FSType TSFileStorageFs = FSType.LOCAL; - /** - * Default core-site.xml file path is /etc/hadoop/conf/core-site.xml - */ + /** Default core-site.xml file path is /etc/hadoop/conf/core-site.xml */ private String coreSitePath = "/etc/hadoop/conf/core-site.xml"; - /** - * Default hdfs-site.xml file path is /etc/hadoop/conf/hdfs-site.xml - */ + /** Default hdfs-site.xml file path is /etc/hadoop/conf/hdfs-site.xml */ private String hdfsSitePath = "/etc/hadoop/conf/hdfs-site.xml"; - /** - * Default hdfs ip is localhost - */ + /** Default hdfs ip is localhost */ private String hdfsIp = "localhost"; - /** - * Default hdfs port is 9000 - */ + /** Default hdfs port is 9000 */ private String hdfsPort = "9000"; - /** - * Default DFS NameServices is hdfsnamespace - */ + /** Default DFS NameServices is hdfsnamespace */ private String dfsNameServices = "hdfsnamespace"; - /** - * Default DFS HA name nodes are nn1 and nn2 - */ + /** Default DFS HA name nodes are nn1 and nn2 */ private String dfsHaNamenodes = "nn1,nn2"; - /** - * Default DFS HA automatic failover is enabled - */ + /** Default DFS HA automatic failover is enabled */ private boolean dfsHaAutomaticFailoverEnabled = true; /** * Default DFS client failover proxy provider is @@ -203,29 +144,18 @@ public class TSFileConfig implements Serializable { */ private String dfsClientFailoverProxyProvider = "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider"; - /** - * whether use kerberos to authenticate hdfs - */ + /** whether use kerberos to authenticate hdfs */ private boolean useKerberos = false; - /** - * full path of kerberos keytab file - */ + /** full path of kerberos keytab file */ private String kerberosKeytabFilePath = "/path"; - /** - * kerberos pricipal - */ + /** kerberos pricipal */ private String kerberosPrincipal = "principal"; - /** - * The acceptable error rate of bloom filter - */ + /** The acceptable error rate of bloom filter */ private double bloomFilterErrorRate = 0.05; - /** - * The amount of data iterate each time - */ + /** The amount of data iterate each time */ private int batchSize = 1000; - public TSFileConfig() { - } + public TSFileConfig() {} public boolean isUseStatistics() { return useStatistics; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java index 0e0f6222a50..e4d874e4e76 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java @@ -19,6 +19,12 @@ package org.apache.iotdb.tsfile.common.conf; +import org.apache.iotdb.tsfile.common.constant.TsFileConstant; +import org.apache.iotdb.tsfile.utils.Loader; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -27,14 +33,8 @@ import java.io.InputStream; import java.net.URL; import java.util.Properties; import java.util.Set; -import org.apache.iotdb.tsfile.common.constant.TsFileConstant; -import org.apache.iotdb.tsfile.utils.Loader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -/** - * TSFileDescriptor is used to load TSFileConfig and provide configure information. - */ +/** TSFileDescriptor is used to load TSFileConfig and provide configure information. */ public class TSFileDescriptor { private static final Logger logger = LoggerFactory.getLogger(TSFileDescriptor.class); @@ -70,9 +70,7 @@ public class TSFileDescriptor { return Loader.getResource(filename, classLoader); } - /** - * load an .properties file and set TSFileConfig variables - */ + /** load an .properties file and set TSFileConfig variables */ private void loadProps() { InputStream inputStream; String url = System.getProperty(TsFileConstant.TSFILE_CONF, null); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/ValueIndex.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/ValueIndex.java index 8a0dd9066a1..cfe34498d97 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/ValueIndex.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/ValueIndex.java @@ -1,16 +1,18 @@ package org.apache.iotdb.tsfile.file.metadata.statistics; -import java.util.ArrayList; -import java.util.List; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder; import org.apache.iotdb.tsfile.encoding.encoder.SDTEncoder; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.ValuePoint; import org.apache.iotdb.tsfile.utils.PublicBAOS; + import org.eclipse.collections.impl.list.mutable.primitive.DoubleArrayList; import org.eclipse.collections.impl.list.mutable.primitive.IntArrayList; +import java.util.ArrayList; +import java.util.List; + public class ValueIndex { int errorParam = TSFileDescriptor.getInstance().getConfig().getErrorParam(); 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 b640632e113..ccab972652f 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 @@ -29,7 +29,6 @@ import org.apache.iotdb.tsfile.file.metadata.statistics.LongStatistics; import org.apache.iotdb.tsfile.file.metadata.statistics.MinMaxInfo; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; import org.apache.iotdb.tsfile.file.metadata.statistics.StepRegress; -import org.apache.iotdb.tsfile.read.common.IOMonitor2.Operation; import org.apache.iotdb.tsfile.read.reader.page.PageReader; import java.io.IOException; @@ -251,7 +250,7 @@ public class ChunkSuit4CPV { * @return the position of the point, starting from 0 */ public int updateFPwithTheClosetPointEqualOrAfter(long targetTimestamp) throws IOException { - long start = System.nanoTime(); + // long start = System.nanoTime(); int estimatedPos; if (TSFileDescriptor.getInstance().getConfig().isUseTimeIndex()) { StepRegress stepRegress = chunkMetadata.getStatistics().getStepRegress(); @@ -358,7 +357,7 @@ public class ChunkSuit4CPV { throw new IOException("Unsupported data type!"); } } - IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_b_genFP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_b_genFP, System.nanoTime() - start); return estimatedPos; } @@ -370,7 +369,7 @@ public class ChunkSuit4CPV { * @return the position of the point, starting from 0 */ public int updateLPwithTheClosetPointEqualOrBefore(long targetTimestamp) throws IOException { - long start = System.nanoTime(); + // long start = System.nanoTime(); int estimatedPos; if (TSFileDescriptor.getInstance().getConfig().isUseTimeIndex()) { StepRegress stepRegress = chunkMetadata.getStatistics().getStepRegress(); @@ -484,7 +483,7 @@ public class ChunkSuit4CPV { throw new IOException("Unsupported data type!"); } } - IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_b_genLP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_b_genLP, System.nanoTime() - start); return estimatedPos; } @@ -495,7 +494,7 @@ public class ChunkSuit4CPV { * @return true if exists; false not exist */ public boolean checkIfExist(long targetTimestamp) throws IOException { - long start = System.nanoTime(); + // long start = System.nanoTime(); boolean exist; if (TSFileDescriptor.getInstance().getConfig().isUseTimeIndex()) { StepRegress stepRegress = chunkMetadata.getStatistics().getStepRegress(); @@ -554,7 +553,7 @@ public class ChunkSuit4CPV { // estimatedPos will not be out of range. exist = pageReader.timeBuffer.getLong(estimatedPos * 8) == targetTimestamp; } - IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_a_verifBPTP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_a_verifBPTP, System.nanoTime() - start); return exist; } 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 e2bececf2c6..fd160b3fd6f 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 @@ -41,17 +41,17 @@ public class IOMonitor2 { DCP_B_READ_MEM_CHUNK("DCP_B_READ_MEM_CHUNK"), DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA( "DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA"), - DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS("DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS"), - SEARCH_ARRAY_a_verifBPTP("SEARCH_ARRAY_a_verifBPTP"), - SEARCH_ARRAY_b_genFP("SEARCH_ARRAY_b_genFP"), - SEARCH_ARRAY_b_genLP("SEARCH_ARRAY_b_genLP"), - SEARCH_ARRAY_c_genBPTP("SEARCH_ARRAY_c_genBPTP"), - M4_LSM_INIT_LOAD_ALL_CHUNKMETADATAS("M4_LSM_INIT_LOAD_ALL_CHUNKMETADATAS"), - M4_LSM_MERGE_M4_TIME_SPAN("M4_LSM_MERGE_M4_TIME_SPAN"), - M4_LSM_FP("M4_LSM_FP"), - M4_LSM_LP("M4_LSM_LP"), - M4_LSM_BP("M4_LSM_BP"), - M4_LSM_TP("M4_LSM_TP"); + DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS("DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS"); + // SEARCH_ARRAY_a_verifBPTP("SEARCH_ARRAY_a_verifBPTP"), + // SEARCH_ARRAY_b_genFP("SEARCH_ARRAY_b_genFP"), + // SEARCH_ARRAY_b_genLP("SEARCH_ARRAY_b_genLP"), + // SEARCH_ARRAY_c_genBPTP("SEARCH_ARRAY_c_genBPTP"), + // M4_LSM_INIT_LOAD_ALL_CHUNKMETADATAS("M4_LSM_INIT_LOAD_ALL_CHUNKMETADATAS"), + // M4_LSM_MERGE_M4_TIME_SPAN("M4_LSM_MERGE_M4_TIME_SPAN"), + // M4_LSM_FP("M4_LSM_FP"), + // M4_LSM_LP("M4_LSM_LP"), + // M4_LSM_BP("M4_LSM_BP"), + // M4_LSM_TP("M4_LSM_TP"); public String getName() { return name; @@ -72,23 +72,23 @@ public class IOMonitor2 { public static DataSetType dataSetType = DataSetType.NONE; // level 3 - public static int M4_LSM_init_loadAllChunkMetadatas_count = 0; // level 3 - public static long M4_LSM_init_loadAllChunkMetadatas_ns = 0; // level 3 + // public static int M4_LSM_init_loadAllChunkMetadatas_count = 0; // level 3 + // public static long M4_LSM_init_loadAllChunkMetadatas_ns = 0; // level 3 - public static int M4_LSM_merge_M4_time_span_count = 0; // level 3 - public static long M4_LSM_merge_M4_time_span_ns = 0; // level 3 + // public static int M4_LSM_merge_M4_time_span_count = 0; // level 3 + // public static long M4_LSM_merge_M4_time_span_ns = 0; // level 3 - public static int M4_LSM_FP_count = 0; // level 3 - public static long M4_LSM_FP_ns = 0; // level 3 + // public static int M4_LSM_FP_count = 0; // level 3 + // public static long M4_LSM_FP_ns = 0; // level 3 - public static int M4_LSM_LP_count = 0; // level 3 - public static long M4_LSM_LP_ns = 0; // level 3 + // public static int M4_LSM_LP_count = 0; // level 3 + // public static long M4_LSM_LP_ns = 0; // level 3 - public static int M4_LSM_BP_count = 0; // level 3 - public static long M4_LSM_BP_ns = 0; // level 3 + // public static int M4_LSM_BP_count = 0; // level 3 + // public static long M4_LSM_BP_ns = 0; // level 3 - public static int M4_LSM_TP_count = 0; // level 3 - public static long M4_LSM_TP_ns = 0; // level 3 + // public static int M4_LSM_TP_count = 0; // level 3 + // public static long M4_LSM_TP_ns = 0; // level 3 public static int DCP_A_GET_CHUNK_METADATAS_count = 0; // level 4 public static long DCP_A_GET_CHUNK_METADATAS_ns = 0; // level 4 @@ -100,61 +100,63 @@ public class IOMonitor2 { public static long DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_ns = 0; // level 4 public static int DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_count = 0; // level 4 public static long DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_ns = 0; // level 4 - public static int SEARCH_ARRAY_a_verifBPTP_count = 0; // level 4 - public static long SEARCH_ARRAY_a_verifBPTP_ns = 0; // level 4 + // public static int SEARCH_ARRAY_a_verifBPTP_count = 0; // level 4 + // public static long SEARCH_ARRAY_a_verifBPTP_ns = 0; // level 4 - public static int SEARCH_ARRAY_b_genFP_count = 0; // level 4 - public static long SEARCH_ARRAY_b_genFP_ns = 0; // level 4 + // public static int SEARCH_ARRAY_b_genFP_count = 0; // level 4 + // public static long SEARCH_ARRAY_b_genFP_ns = 0; // level 4 - public static int SEARCH_ARRAY_b_genLP_count = 0; // level 4 - public static long SEARCH_ARRAY_b_genLP_ns = 0; // level 4 + // public static int SEARCH_ARRAY_b_genLP_count = 0; // level 4 + // public static long SEARCH_ARRAY_b_genLP_ns = 0; // level 4 - public static int SEARCH_ARRAY_c_genBPTP_count = 0; // level 4 - public static long SEARCH_ARRAY_c_genBPTP_ns = 0; // level 4 + // public static int SEARCH_ARRAY_c_genBPTP_count = 0; // level 4 + // public static long SEARCH_ARRAY_c_genBPTP_ns = 0; // level 4 public static long DCP_D_getAllSatisfiedPageData_traversedPointNum = 0; // level 5 public static long DCP_D_timeIndex_traversedPointNum = 0; // level 5 public static long DCP_D_valueIndex_traversedPointNum = 0; // level 5 - public static Operation M4_LSM_status = - null; // for counting the number of calling BCD by each step of M4-LSM - public static int M4_LSM_merge_M4_time_span_B_READ_MEM_CHUNK_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_merge_M4_time_span_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = - 0; // map from level 3 to 4 - public static int M4_LSM_merge_M4_time_span_SEARCH_ARRAY_a_verifBPTP_cnt = - 0; // map from level 3 to 4 - public static int M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genFP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genLP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_merge_M4_time_span_SEARCH_ARRAY_c_genBPTP_cnt = - 0; // map from level 3 to 4 - public static int M4_LSM_FP_B_READ_MEM_CHUNK_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_FP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = - 0; // map from level 3 to 4 - public static int M4_LSM_FP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_FP_SEARCH_ARRAY_b_genFP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_FP_SEARCH_ARRAY_b_genLP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_FP_SEARCH_ARRAY_c_genBPTP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_LP_B_READ_MEM_CHUNK_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_LP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = - 0; // map from level 3 to 4 - public static int M4_LSM_LP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_LP_SEARCH_ARRAY_b_genFP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_LP_SEARCH_ARRAY_b_genLP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_LP_SEARCH_ARRAY_c_genBPTP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_BP_B_READ_MEM_CHUNK_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_BP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = - 0; // map from level 3 to 4 - public static int M4_LSM_BP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_BP_SEARCH_ARRAY_b_genFP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_BP_SEARCH_ARRAY_b_genLP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_BP_SEARCH_ARRAY_c_genBPTP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_TP_B_READ_MEM_CHUNK_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_TP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = - 0; // map from level 3 to 4 - public static int M4_LSM_TP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_TP_SEARCH_ARRAY_b_genFP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_TP_SEARCH_ARRAY_b_genLP_cnt = 0; // map from level 3 to 4 - public static int M4_LSM_TP_SEARCH_ARRAY_c_genBPTP_cnt = 0; // map from level 3 to 4 + // public static Operation M4_LSM_status = + // null; // for counting the number of calling BCD by each step of M4-LSM + // public static int M4_LSM_merge_M4_time_span_B_READ_MEM_CHUNK_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_merge_M4_time_span_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = + // 0; // map from level 3 to 4 + // public static int M4_LSM_merge_M4_time_span_SEARCH_ARRAY_a_verifBPTP_cnt = + // 0; // map from level 3 to 4 + // public static int M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genFP_cnt = 0; // map from level 3 + // to 4 + // public static int M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genLP_cnt = 0; // map from level 3 + // to 4 + // public static int M4_LSM_merge_M4_time_span_SEARCH_ARRAY_c_genBPTP_cnt = + // 0; // map from level 3 to 4 + // public static int M4_LSM_FP_B_READ_MEM_CHUNK_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_FP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = + // 0; // map from level 3 to 4 + // public static int M4_LSM_FP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_FP_SEARCH_ARRAY_b_genFP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_FP_SEARCH_ARRAY_b_genLP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_FP_SEARCH_ARRAY_c_genBPTP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_LP_B_READ_MEM_CHUNK_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_LP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = + // 0; // map from level 3 to 4 + // public static int M4_LSM_LP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_LP_SEARCH_ARRAY_b_genFP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_LP_SEARCH_ARRAY_b_genLP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_LP_SEARCH_ARRAY_c_genBPTP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_BP_B_READ_MEM_CHUNK_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_BP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = + // 0; // map from level 3 to 4 + // public static int M4_LSM_BP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_BP_SEARCH_ARRAY_b_genFP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_BP_SEARCH_ARRAY_b_genLP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_BP_SEARCH_ARRAY_c_genBPTP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_TP_B_READ_MEM_CHUNK_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_TP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = + // 0; // map from level 3 to 4 + // public static int M4_LSM_TP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_TP_SEARCH_ARRAY_b_genFP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_TP_SEARCH_ARRAY_b_genLP_cnt = 0; // map from level 3 to 4 + // public static int M4_LSM_TP_SEARCH_ARRAY_c_genBPTP_cnt = 0; // map from level 3 to 4 private static void reset() { // level 1 is client elapsed time, not measured by the server side @@ -168,23 +170,23 @@ public class IOMonitor2 { /** level 3 */ dataSetType = DataSetType.NONE; - M4_LSM_init_loadAllChunkMetadatas_count = 0; - M4_LSM_init_loadAllChunkMetadatas_ns = 0; - - M4_LSM_merge_M4_time_span_count = 0; - M4_LSM_merge_M4_time_span_ns = 0; - - M4_LSM_FP_count = 0; - M4_LSM_FP_ns = 0; - - M4_LSM_LP_count = 0; - M4_LSM_LP_ns = 0; - - M4_LSM_BP_count = 0; - M4_LSM_BP_ns = 0; - - M4_LSM_TP_count = 0; - M4_LSM_TP_ns = 0; + // M4_LSM_init_loadAllChunkMetadatas_count = 0; + // M4_LSM_init_loadAllChunkMetadatas_ns = 0; + // + // M4_LSM_merge_M4_time_span_count = 0; + // M4_LSM_merge_M4_time_span_ns = 0; + // + // M4_LSM_FP_count = 0; + // M4_LSM_FP_ns = 0; + // + // M4_LSM_LP_count = 0; + // M4_LSM_LP_ns = 0; + // + // M4_LSM_BP_count = 0; + // M4_LSM_BP_ns = 0; + // + // M4_LSM_TP_count = 0; + // M4_LSM_TP_ns = 0; /** level 4 */ DCP_A_GET_CHUNK_METADATAS_count = 0; @@ -199,57 +201,57 @@ public class IOMonitor2 { DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_count = 0; DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_ns = 0; - SEARCH_ARRAY_a_verifBPTP_count = 0; - SEARCH_ARRAY_a_verifBPTP_ns = 0; - SEARCH_ARRAY_b_genFP_count = 0; - SEARCH_ARRAY_b_genFP_ns = 0; - SEARCH_ARRAY_b_genLP_count = 0; - SEARCH_ARRAY_b_genLP_ns = 0; - SEARCH_ARRAY_c_genBPTP_count = 0; - SEARCH_ARRAY_c_genBPTP_ns = 0; + // SEARCH_ARRAY_a_verifBPTP_count = 0; + // SEARCH_ARRAY_a_verifBPTP_ns = 0; + // SEARCH_ARRAY_b_genFP_count = 0; + // SEARCH_ARRAY_b_genFP_ns = 0; + // SEARCH_ARRAY_b_genLP_count = 0; + // SEARCH_ARRAY_b_genLP_ns = 0; + // SEARCH_ARRAY_c_genBPTP_count = 0; + // SEARCH_ARRAY_c_genBPTP_ns = 0; /** level 5 */ DCP_D_getAllSatisfiedPageData_traversedPointNum = 0; DCP_D_timeIndex_traversedPointNum = 0; DCP_D_valueIndex_traversedPointNum = 0; - /** map from level 3 to level 4 */ - M4_LSM_status = null; - M4_LSM_merge_M4_time_span_B_READ_MEM_CHUNK_cnt = - 0; // for counting the number of calling BCD by each step of M4-LSM - M4_LSM_merge_M4_time_span_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = 0; - M4_LSM_merge_M4_time_span_SEARCH_ARRAY_a_verifBPTP_cnt = 0; - M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genFP_cnt = 0; - M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genLP_cnt = 0; - M4_LSM_merge_M4_time_span_SEARCH_ARRAY_c_genBPTP_cnt = 0; - M4_LSM_FP_B_READ_MEM_CHUNK_cnt = - 0; // for counting the number of calling BCD by each step of M4-LSM - M4_LSM_FP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = 0; - M4_LSM_FP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; - M4_LSM_FP_SEARCH_ARRAY_b_genFP_cnt = 0; - M4_LSM_FP_SEARCH_ARRAY_b_genLP_cnt = 0; - M4_LSM_FP_SEARCH_ARRAY_c_genBPTP_cnt = 0; - M4_LSM_LP_B_READ_MEM_CHUNK_cnt = - 0; // for counting the number of calling BCD by each step of M4-LSM - M4_LSM_LP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = 0; - M4_LSM_LP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; - M4_LSM_LP_SEARCH_ARRAY_b_genFP_cnt = 0; - M4_LSM_LP_SEARCH_ARRAY_b_genLP_cnt = 0; - M4_LSM_LP_SEARCH_ARRAY_c_genBPTP_cnt = 0; - M4_LSM_BP_B_READ_MEM_CHUNK_cnt = - 0; // for counting the number of calling BCD by each step of M4-LSM - M4_LSM_BP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = 0; - M4_LSM_BP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; - M4_LSM_BP_SEARCH_ARRAY_b_genFP_cnt = 0; - M4_LSM_BP_SEARCH_ARRAY_b_genLP_cnt = 0; - M4_LSM_BP_SEARCH_ARRAY_c_genBPTP_cnt = 0; - M4_LSM_TP_B_READ_MEM_CHUNK_cnt = - 0; // for counting the number of calling BCD by each step of M4-LSM - M4_LSM_TP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = 0; - M4_LSM_TP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; - M4_LSM_TP_SEARCH_ARRAY_b_genFP_cnt = 0; - M4_LSM_TP_SEARCH_ARRAY_b_genLP_cnt = 0; - M4_LSM_TP_SEARCH_ARRAY_c_genBPTP_cnt = 0; + // /** map from level 3 to level 4 */ + // M4_LSM_status = null; + // M4_LSM_merge_M4_time_span_B_READ_MEM_CHUNK_cnt = + // 0; // for counting the number of calling BCD by each step of M4-LSM + // M4_LSM_merge_M4_time_span_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = 0; + // M4_LSM_merge_M4_time_span_SEARCH_ARRAY_a_verifBPTP_cnt = 0; + // M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genFP_cnt = 0; + // M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genLP_cnt = 0; + // M4_LSM_merge_M4_time_span_SEARCH_ARRAY_c_genBPTP_cnt = 0; + // M4_LSM_FP_B_READ_MEM_CHUNK_cnt = + // 0; // for counting the number of calling BCD by each step of M4-LSM + // M4_LSM_FP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = 0; + // M4_LSM_FP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; + // M4_LSM_FP_SEARCH_ARRAY_b_genFP_cnt = 0; + // M4_LSM_FP_SEARCH_ARRAY_b_genLP_cnt = 0; + // M4_LSM_FP_SEARCH_ARRAY_c_genBPTP_cnt = 0; + // M4_LSM_LP_B_READ_MEM_CHUNK_cnt = + // 0; // for counting the number of calling BCD by each step of M4-LSM + // M4_LSM_LP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = 0; + // M4_LSM_LP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; + // M4_LSM_LP_SEARCH_ARRAY_b_genFP_cnt = 0; + // M4_LSM_LP_SEARCH_ARRAY_b_genLP_cnt = 0; + // M4_LSM_LP_SEARCH_ARRAY_c_genBPTP_cnt = 0; + // M4_LSM_BP_B_READ_MEM_CHUNK_cnt = + // 0; // for counting the number of calling BCD by each step of M4-LSM + // M4_LSM_BP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = 0; + // M4_LSM_BP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; + // M4_LSM_BP_SEARCH_ARRAY_b_genFP_cnt = 0; + // M4_LSM_BP_SEARCH_ARRAY_b_genLP_cnt = 0; + // M4_LSM_BP_SEARCH_ARRAY_c_genBPTP_cnt = 0; + // M4_LSM_TP_B_READ_MEM_CHUNK_cnt = + // 0; // for counting the number of calling BCD by each step of M4-LSM + // M4_LSM_TP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt = 0; + // M4_LSM_TP_SEARCH_ARRAY_a_verifBPTP_cnt = 0; + // M4_LSM_TP_SEARCH_ARRAY_b_genFP_cnt = 0; + // M4_LSM_TP_SEARCH_ARRAY_b_genLP_cnt = 0; + // M4_LSM_TP_SEARCH_ARRAY_c_genBPTP_cnt = 0; } public static void addMeasure(Operation operation, long elapsedTimeInNanosecond) { @@ -262,30 +264,30 @@ public class IOMonitor2 { DCP_Server_Query_Fetch_count++; DCP_Server_Query_Fetch_ns += elapsedTimeInNanosecond; break; - case M4_LSM_INIT_LOAD_ALL_CHUNKMETADATAS: - M4_LSM_init_loadAllChunkMetadatas_count++; - M4_LSM_init_loadAllChunkMetadatas_ns += elapsedTimeInNanosecond; - break; - case M4_LSM_MERGE_M4_TIME_SPAN: - M4_LSM_merge_M4_time_span_count++; - M4_LSM_merge_M4_time_span_ns += elapsedTimeInNanosecond; - break; - case M4_LSM_FP: - M4_LSM_FP_count++; - M4_LSM_FP_ns += elapsedTimeInNanosecond; - break; - case M4_LSM_LP: - M4_LSM_LP_count++; - M4_LSM_LP_ns += elapsedTimeInNanosecond; - break; - case M4_LSM_BP: - M4_LSM_BP_count++; - M4_LSM_BP_ns += elapsedTimeInNanosecond; - break; - case M4_LSM_TP: - M4_LSM_TP_count++; - M4_LSM_TP_ns += elapsedTimeInNanosecond; - break; + // case M4_LSM_INIT_LOAD_ALL_CHUNKMETADATAS: + // M4_LSM_init_loadAllChunkMetadatas_count++; + // M4_LSM_init_loadAllChunkMetadatas_ns += elapsedTimeInNanosecond; + // break; + // case M4_LSM_MERGE_M4_TIME_SPAN: + // M4_LSM_merge_M4_time_span_count++; + // M4_LSM_merge_M4_time_span_ns += elapsedTimeInNanosecond; + // break; + // case M4_LSM_FP: + // M4_LSM_FP_count++; + // M4_LSM_FP_ns += elapsedTimeInNanosecond; + // break; + // case M4_LSM_LP: + // M4_LSM_LP_count++; + // M4_LSM_LP_ns += elapsedTimeInNanosecond; + // break; + // case M4_LSM_BP: + // M4_LSM_BP_count++; + // M4_LSM_BP_ns += elapsedTimeInNanosecond; + // break; + // case M4_LSM_TP: + // M4_LSM_TP_count++; + // M4_LSM_TP_ns += elapsedTimeInNanosecond; + // break; case DCP_A_GET_CHUNK_METADATAS: DCP_A_GET_CHUNK_METADATAS_count++; DCP_A_GET_CHUNK_METADATAS_ns += elapsedTimeInNanosecond; @@ -293,166 +295,168 @@ public class IOMonitor2 { case DCP_B_READ_MEM_CHUNK: DCP_B_READ_MEM_CHUNK_count++; DCP_B_READ_MEM_CHUNK_ns += elapsedTimeInNanosecond; - if (M4_LSM_status != null) { - switch (M4_LSM_status) { - case M4_LSM_MERGE_M4_TIME_SPAN: - M4_LSM_merge_M4_time_span_B_READ_MEM_CHUNK_cnt++; - break; - case M4_LSM_FP: - M4_LSM_FP_B_READ_MEM_CHUNK_cnt++; - break; - case M4_LSM_LP: - M4_LSM_LP_B_READ_MEM_CHUNK_cnt++; - break; - case M4_LSM_BP: - M4_LSM_BP_B_READ_MEM_CHUNK_cnt++; - break; - case M4_LSM_TP: - M4_LSM_TP_B_READ_MEM_CHUNK_cnt++; - break; - default: - System.out.println("unsupported M4_LSM_status!"); - break; - } - } + // if (M4_LSM_status != null) { + // switch (M4_LSM_status) { + // case M4_LSM_MERGE_M4_TIME_SPAN: + // M4_LSM_merge_M4_time_span_B_READ_MEM_CHUNK_cnt++; + // break; + // case M4_LSM_FP: + // M4_LSM_FP_B_READ_MEM_CHUNK_cnt++; + // break; + // case M4_LSM_LP: + // M4_LSM_LP_B_READ_MEM_CHUNK_cnt++; + // break; + // case M4_LSM_BP: + // M4_LSM_BP_B_READ_MEM_CHUNK_cnt++; + // break; + // case M4_LSM_TP: + // M4_LSM_TP_B_READ_MEM_CHUNK_cnt++; + // break; + // default: + // System.out.println("unsupported M4_LSM_status!"); + // break; + // } + // } break; case DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA: DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_count++; DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_ns += elapsedTimeInNanosecond; - if (M4_LSM_status != null) { - // this actually can be omitted because the number is equal to B as chunk = page in this - // case - switch (M4_LSM_status) { - case M4_LSM_MERGE_M4_TIME_SPAN: - M4_LSM_merge_M4_time_span_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt++; - break; - case M4_LSM_FP: - M4_LSM_FP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt++; - break; - case M4_LSM_LP: - M4_LSM_LP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt++; - break; - case M4_LSM_BP: - M4_LSM_BP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt++; - break; - case M4_LSM_TP: - M4_LSM_TP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt++; - break; - default: - System.out.println("unsupported M4_LSM_status!"); - break; - } - } + // if (M4_LSM_status != null) { + // // this actually can be omitted because the number is equal to B as chunk = page + // in this + // // case + // switch (M4_LSM_status) { + // case M4_LSM_MERGE_M4_TIME_SPAN: + // + // M4_LSM_merge_M4_time_span_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt++; + // break; + // case M4_LSM_FP: + // M4_LSM_FP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt++; + // break; + // case M4_LSM_LP: + // M4_LSM_LP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt++; + // break; + // case M4_LSM_BP: + // M4_LSM_BP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt++; + // break; + // case M4_LSM_TP: + // M4_LSM_TP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt++; + // break; + // default: + // System.out.println("unsupported M4_LSM_status!"); + // break; + // } + // } break; case DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS: DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_count++; DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_ns += elapsedTimeInNanosecond; // M4-LSM will not use this op break; - case SEARCH_ARRAY_a_verifBPTP: - SEARCH_ARRAY_a_verifBPTP_count++; - SEARCH_ARRAY_a_verifBPTP_ns += elapsedTimeInNanosecond; - if (M4_LSM_status != null) { - switch (M4_LSM_status) { - case M4_LSM_MERGE_M4_TIME_SPAN: - M4_LSM_merge_M4_time_span_SEARCH_ARRAY_a_verifBPTP_cnt++; - break; - case M4_LSM_FP: - M4_LSM_FP_SEARCH_ARRAY_a_verifBPTP_cnt++; - break; - case M4_LSM_LP: - M4_LSM_LP_SEARCH_ARRAY_a_verifBPTP_cnt++; - break; - case M4_LSM_BP: - M4_LSM_BP_SEARCH_ARRAY_a_verifBPTP_cnt++; - break; - case M4_LSM_TP: - M4_LSM_TP_SEARCH_ARRAY_a_verifBPTP_cnt++; - break; - default: - System.out.println("unsupported M4_LSM_status!"); - break; - } - } - break; - case SEARCH_ARRAY_b_genFP: - SEARCH_ARRAY_b_genFP_count++; - SEARCH_ARRAY_b_genFP_ns += elapsedTimeInNanosecond; - if (M4_LSM_status != null) { - switch (M4_LSM_status) { - case M4_LSM_MERGE_M4_TIME_SPAN: - M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genFP_cnt++; - break; - case M4_LSM_FP: - M4_LSM_FP_SEARCH_ARRAY_b_genFP_cnt++; - break; - case M4_LSM_LP: - M4_LSM_LP_SEARCH_ARRAY_b_genFP_cnt++; - break; - case M4_LSM_BP: - M4_LSM_BP_SEARCH_ARRAY_b_genFP_cnt++; - break; - case M4_LSM_TP: - M4_LSM_TP_SEARCH_ARRAY_b_genFP_cnt++; - break; - default: - System.out.println("unsupported M4_LSM_status!"); - break; - } - } - break; - case SEARCH_ARRAY_b_genLP: - SEARCH_ARRAY_b_genLP_count++; - SEARCH_ARRAY_b_genLP_ns += elapsedTimeInNanosecond; - if (M4_LSM_status != null) { - switch (M4_LSM_status) { - case M4_LSM_MERGE_M4_TIME_SPAN: - M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genLP_cnt++; - break; - case M4_LSM_FP: - M4_LSM_FP_SEARCH_ARRAY_b_genLP_cnt++; - break; - case M4_LSM_LP: - M4_LSM_LP_SEARCH_ARRAY_b_genLP_cnt++; - break; - case M4_LSM_BP: - M4_LSM_BP_SEARCH_ARRAY_b_genLP_cnt++; - break; - case M4_LSM_TP: - M4_LSM_TP_SEARCH_ARRAY_b_genLP_cnt++; - break; - default: - System.out.println("unsupported M4_LSM_status!"); - break; - } - } - break; - case SEARCH_ARRAY_c_genBPTP: - SEARCH_ARRAY_c_genBPTP_count++; - SEARCH_ARRAY_c_genBPTP_ns += elapsedTimeInNanosecond; - if (M4_LSM_status != null) { - switch (M4_LSM_status) { - case M4_LSM_MERGE_M4_TIME_SPAN: - M4_LSM_merge_M4_time_span_SEARCH_ARRAY_c_genBPTP_cnt++; - break; - case M4_LSM_FP: - M4_LSM_FP_SEARCH_ARRAY_c_genBPTP_cnt++; - break; - case M4_LSM_LP: - M4_LSM_LP_SEARCH_ARRAY_c_genBPTP_cnt++; - break; - case M4_LSM_BP: - M4_LSM_BP_SEARCH_ARRAY_c_genBPTP_cnt++; - break; - case M4_LSM_TP: - M4_LSM_TP_SEARCH_ARRAY_c_genBPTP_cnt++; - break; - default: - System.out.println("unsupported M4_LSM_status!"); - break; - } - } - break; + // case SEARCH_ARRAY_a_verifBPTP: + // SEARCH_ARRAY_a_verifBPTP_count++; + // SEARCH_ARRAY_a_verifBPTP_ns += elapsedTimeInNanosecond; + // if (M4_LSM_status != null) { + // switch (M4_LSM_status) { + // case M4_LSM_MERGE_M4_TIME_SPAN: + // M4_LSM_merge_M4_time_span_SEARCH_ARRAY_a_verifBPTP_cnt++; + // break; + // case M4_LSM_FP: + // M4_LSM_FP_SEARCH_ARRAY_a_verifBPTP_cnt++; + // break; + // case M4_LSM_LP: + // M4_LSM_LP_SEARCH_ARRAY_a_verifBPTP_cnt++; + // break; + // case M4_LSM_BP: + // M4_LSM_BP_SEARCH_ARRAY_a_verifBPTP_cnt++; + // break; + // case M4_LSM_TP: + // M4_LSM_TP_SEARCH_ARRAY_a_verifBPTP_cnt++; + // break; + // default: + // System.out.println("unsupported M4_LSM_status!"); + // break; + // } + // } + // break; + // case SEARCH_ARRAY_b_genFP: + // SEARCH_ARRAY_b_genFP_count++; + // SEARCH_ARRAY_b_genFP_ns += elapsedTimeInNanosecond; + // if (M4_LSM_status != null) { + // switch (M4_LSM_status) { + // case M4_LSM_MERGE_M4_TIME_SPAN: + // M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genFP_cnt++; + // break; + // case M4_LSM_FP: + // M4_LSM_FP_SEARCH_ARRAY_b_genFP_cnt++; + // break; + // case M4_LSM_LP: + // M4_LSM_LP_SEARCH_ARRAY_b_genFP_cnt++; + // break; + // case M4_LSM_BP: + // M4_LSM_BP_SEARCH_ARRAY_b_genFP_cnt++; + // break; + // case M4_LSM_TP: + // M4_LSM_TP_SEARCH_ARRAY_b_genFP_cnt++; + // break; + // default: + // System.out.println("unsupported M4_LSM_status!"); + // break; + // } + // } + // break; + // case SEARCH_ARRAY_b_genLP: + // SEARCH_ARRAY_b_genLP_count++; + // SEARCH_ARRAY_b_genLP_ns += elapsedTimeInNanosecond; + // if (M4_LSM_status != null) { + // switch (M4_LSM_status) { + // case M4_LSM_MERGE_M4_TIME_SPAN: + // M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genLP_cnt++; + // break; + // case M4_LSM_FP: + // M4_LSM_FP_SEARCH_ARRAY_b_genLP_cnt++; + // break; + // case M4_LSM_LP: + // M4_LSM_LP_SEARCH_ARRAY_b_genLP_cnt++; + // break; + // case M4_LSM_BP: + // M4_LSM_BP_SEARCH_ARRAY_b_genLP_cnt++; + // break; + // case M4_LSM_TP: + // M4_LSM_TP_SEARCH_ARRAY_b_genLP_cnt++; + // break; + // default: + // System.out.println("unsupported M4_LSM_status!"); + // break; + // } + // } + // break; + // case SEARCH_ARRAY_c_genBPTP: + // SEARCH_ARRAY_c_genBPTP_count++; + // SEARCH_ARRAY_c_genBPTP_ns += elapsedTimeInNanosecond; + // if (M4_LSM_status != null) { + // switch (M4_LSM_status) { + // case M4_LSM_MERGE_M4_TIME_SPAN: + // M4_LSM_merge_M4_time_span_SEARCH_ARRAY_c_genBPTP_cnt++; + // break; + // case M4_LSM_FP: + // M4_LSM_FP_SEARCH_ARRAY_c_genBPTP_cnt++; + // break; + // case M4_LSM_LP: + // M4_LSM_LP_SEARCH_ARRAY_c_genBPTP_cnt++; + // break; + // case M4_LSM_BP: + // M4_LSM_BP_SEARCH_ARRAY_c_genBPTP_cnt++; + // break; + // case M4_LSM_TP: + // M4_LSM_TP_SEARCH_ARRAY_c_genBPTP_cnt++; + // break; + // default: + // System.out.println("unsupported M4_LSM_status!"); + // break; + // } + // } + // break; default: System.out.println("not supported operation type"); // this will not happen break; @@ -476,18 +480,34 @@ public class IOMonitor2 { stringBuilder.append("[3]dataSetType").append(",").append(dataSetType).append("\n"); stringBuilder .append("[3-ns]M4_LSM_init_loadAllChunkMetadatas") - .append(",") - .append(M4_LSM_init_loadAllChunkMetadatas_ns) + .append(",0") + // .append(M4_LSM_init_loadAllChunkMetadatas_ns) .append("\n"); stringBuilder .append("[3-ns]M4_LSM_merge_M4_time_span") - .append(",") - .append(M4_LSM_merge_M4_time_span_ns) + .append(",0") + // .append(M4_LSM_merge_M4_time_span_ns) + .append("\n"); + stringBuilder + .append("[3-ns]M4_LSM_FP") + .append(",0") + // .append(M4_LSM_FP_ns) + .append("\n"); + stringBuilder + .append("[3-ns]M4_LSM_LP") + .append(",0") + // .append(M4_LSM_LP_ns) + .append("\n"); + stringBuilder + .append("[3-ns]M4_LSM_BP") + .append(",0") + // .append(M4_LSM_BP_ns) + .append("\n"); + stringBuilder + .append("[3-ns]M4_LSM_TP") + .append(",0") + // .append(M4_LSM_TP_ns) .append("\n"); - stringBuilder.append("[3-ns]M4_LSM_FP").append(",").append(M4_LSM_FP_ns).append("\n"); - stringBuilder.append("[3-ns]M4_LSM_LP").append(",").append(M4_LSM_LP_ns).append("\n"); - stringBuilder.append("[3-ns]M4_LSM_BP").append(",").append(M4_LSM_BP_ns).append("\n"); - stringBuilder.append("[3-ns]M4_LSM_TP").append(",").append(M4_LSM_TP_ns).append("\n"); stringBuilder .append("[4-ns]DCP_A_GET_CHUNK_METADATAS") @@ -511,23 +531,23 @@ public class IOMonitor2 { .append("\n"); stringBuilder .append("[4-ns]SEARCH_ARRAY_a_verifBPTP") - .append(",") - .append(SEARCH_ARRAY_a_verifBPTP_ns) + .append(",0") + // .append(SEARCH_ARRAY_a_verifBPTP_ns) .append("\n"); stringBuilder .append("[4-ns]SEARCH_ARRAY_b_genFP") - .append(",") - .append(SEARCH_ARRAY_b_genFP_ns) + .append(",0") + // .append(SEARCH_ARRAY_b_genFP_ns) .append("\n"); stringBuilder .append("[4-ns]SEARCH_ARRAY_b_genLP") - .append(",") - .append(SEARCH_ARRAY_b_genLP_ns) + .append(",0") + // .append(SEARCH_ARRAY_b_genLP_ns) .append("\n"); stringBuilder .append("[4-ns]SEARCH_ARRAY_c_genBPTP") - .append(",") - .append(SEARCH_ARRAY_c_genBPTP_ns) + .append(",0") + // .append(SEARCH_ARRAY_c_genBPTP_ns) .append("\n"); stringBuilder @@ -543,18 +563,34 @@ public class IOMonitor2 { stringBuilder .append("[3-cnt]M4_LSM_init_loadAllChunkMetadatas") - .append(",") - .append(M4_LSM_init_loadAllChunkMetadatas_count) + .append(",0") + // .append(M4_LSM_init_loadAllChunkMetadatas_count) .append("\n"); stringBuilder .append("[3-cnt]M4_LSM_merge_M4_time_span") - .append(",") - .append(M4_LSM_merge_M4_time_span_count) + .append(",0") + // .append(M4_LSM_merge_M4_time_span_count) + .append("\n"); + stringBuilder + .append("[3-cnt]M4_LSM_FP") + .append(",0") + // .append(M4_LSM_FP_count) + .append("\n"); + stringBuilder + .append("[3-cnt]M4_LSM_LP") + .append(",0") + // .append(M4_LSM_LP_count) + .append("\n"); + stringBuilder + .append("[3-cnt]M4_LSM_BP") + .append(",0") + // .append(M4_LSM_BP_count) + .append("\n"); + stringBuilder + .append("[3-cnt]M4_LSM_TP") + .append(",0") + // .append(M4_LSM_TP_count) .append("\n"); - stringBuilder.append("[3-cnt]M4_LSM_FP").append(",").append(M4_LSM_FP_count).append("\n"); - stringBuilder.append("[3-cnt]M4_LSM_LP").append(",").append(M4_LSM_LP_count).append("\n"); - stringBuilder.append("[3-cnt]M4_LSM_BP").append(",").append(M4_LSM_BP_count).append("\n"); - stringBuilder.append("[3-cnt]M4_LSM_TP").append(",").append(M4_LSM_TP_count).append("\n"); stringBuilder .append("[4-cnt]DCP_A_GET_CHUNK_METADATAS") @@ -578,23 +614,23 @@ public class IOMonitor2 { .append("\n"); stringBuilder .append("[4-cnt]SEARCH_ARRAY_a_verifBPTP") - .append(",") - .append(SEARCH_ARRAY_a_verifBPTP_count) + .append(",0") + // .append(SEARCH_ARRAY_a_verifBPTP_count) .append("\n"); stringBuilder .append("[4-cnt]SEARCH_ARRAY_b_genFP") - .append(",") - .append(SEARCH_ARRAY_b_genFP_count) + .append(",0") + // .append(SEARCH_ARRAY_b_genFP_count) .append("\n"); stringBuilder .append("[4-cnt]SEARCH_ARRAY_b_genLP") - .append(",") - .append(SEARCH_ARRAY_b_genLP_count) + .append(",0") + // .append(SEARCH_ARRAY_b_genLP_count) .append("\n"); stringBuilder .append("[4-cnt]SEARCH_ARRAY_c_genBPTP") - .append(",") - .append(SEARCH_ARRAY_c_genBPTP_count) + .append(",0") + // .append(SEARCH_ARRAY_c_genBPTP_count) .append("\n"); stringBuilder .append("[5-cnt]DCP_D_getAllSatisfiedPageData_traversedPointNum") @@ -614,157 +650,158 @@ public class IOMonitor2 { stringBuilder .append("[3-4]M4_LSM_merge_M4_time_span_B_READ_MEM_CHUNK_cnt") - .append(",") - .append(M4_LSM_merge_M4_time_span_B_READ_MEM_CHUNK_cnt) + .append(",0") + // .append(M4_LSM_merge_M4_time_span_B_READ_MEM_CHUNK_cnt) .append("\n"); // 5*6 stringBuilder .append("[3-4]M4_LSM_merge_M4_time_span_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt") - .append(",") - .append(M4_LSM_merge_M4_time_span_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt) + .append(",0") + // + // .append(M4_LSM_merge_M4_time_span_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_merge_M4_time_span_SEARCH_ARRAY_a_verifBPTP_cnt") - .append(",") - .append(M4_LSM_merge_M4_time_span_SEARCH_ARRAY_a_verifBPTP_cnt) + .append(",0") + // .append(M4_LSM_merge_M4_time_span_SEARCH_ARRAY_a_verifBPTP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genFP_cnt") - .append(",") - .append(M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genFP_cnt) + .append(",0") + // .append(M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genFP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genLP_cnt") - .append(",") - .append(M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genLP_cnt) + .append(",0") + // .append(M4_LSM_merge_M4_time_span_SEARCH_ARRAY_b_genLP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_merge_M4_time_span_SEARCH_ARRAY_c_genBPTP_cnt") - .append(",") - .append(M4_LSM_merge_M4_time_span_SEARCH_ARRAY_c_genBPTP_cnt) + .append(",0") + // .append(M4_LSM_merge_M4_time_span_SEARCH_ARRAY_c_genBPTP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_FP_B_READ_MEM_CHUNK_cnt") - .append(",") - .append(M4_LSM_FP_B_READ_MEM_CHUNK_cnt) + .append(",0") + // .append(M4_LSM_FP_B_READ_MEM_CHUNK_cnt) .append("\n"); // 5*6 stringBuilder .append("[3-4]M4_LSM_FP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt") - .append(",") - .append(M4_LSM_FP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt) + .append(",0") + // .append(M4_LSM_FP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_FP_SEARCH_ARRAY_a_verifBPTP_cnt") - .append(",") - .append(M4_LSM_FP_SEARCH_ARRAY_a_verifBPTP_cnt) + .append(",0") + // .append(M4_LSM_FP_SEARCH_ARRAY_a_verifBPTP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_FP_SEARCH_ARRAY_b_genFP_cnt") - .append(",") - .append(M4_LSM_FP_SEARCH_ARRAY_b_genFP_cnt) + .append(",0") + // .append(M4_LSM_FP_SEARCH_ARRAY_b_genFP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_FP_SEARCH_ARRAY_b_genLP_cnt") - .append(",") - .append(M4_LSM_FP_SEARCH_ARRAY_b_genLP_cnt) + .append(",0") + // .append(M4_LSM_FP_SEARCH_ARRAY_b_genLP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_FP_SEARCH_ARRAY_c_genBPTP_cnt") - .append(",") - .append(M4_LSM_FP_SEARCH_ARRAY_c_genBPTP_cnt) + .append(",0") + // .append(M4_LSM_FP_SEARCH_ARRAY_c_genBPTP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_LP_B_READ_MEM_CHUNK_cnt") - .append(",") - .append(M4_LSM_LP_B_READ_MEM_CHUNK_cnt) + .append(",0") + // .append(M4_LSM_LP_B_READ_MEM_CHUNK_cnt) .append("\n"); // 5*6 stringBuilder .append("[3-4]M4_LSM_LP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt") - .append(",") - .append(M4_LSM_LP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt) + .append(",0") + // .append(M4_LSM_LP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_LP_SEARCH_ARRAY_a_verifBPTP_cnt") - .append(",") - .append(M4_LSM_LP_SEARCH_ARRAY_a_verifBPTP_cnt) + .append(",0") + // .append(M4_LSM_LP_SEARCH_ARRAY_a_verifBPTP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_LP_SEARCH_ARRAY_b_genFP_cnt") - .append(",") - .append(M4_LSM_LP_SEARCH_ARRAY_b_genFP_cnt) + .append(",0") + // .append(M4_LSM_LP_SEARCH_ARRAY_b_genFP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_LP_SEARCH_ARRAY_b_genLP_cnt") - .append(",") - .append(M4_LSM_LP_SEARCH_ARRAY_b_genLP_cnt) + .append(",0") + // .append(M4_LSM_LP_SEARCH_ARRAY_b_genLP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_LP_SEARCH_ARRAY_c_genBPTP_cnt") - .append(",") - .append(M4_LSM_LP_SEARCH_ARRAY_c_genBPTP_cnt) + .append(",0") + // .append(M4_LSM_LP_SEARCH_ARRAY_c_genBPTP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_BP_B_READ_MEM_CHUNK_cnt") - .append(",") - .append(M4_LSM_BP_B_READ_MEM_CHUNK_cnt) + .append(",0") + // .append(M4_LSM_BP_B_READ_MEM_CHUNK_cnt) .append("\n"); // 5*6 stringBuilder .append("[3-4]M4_LSM_BP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt") - .append(",") - .append(M4_LSM_BP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt) + .append(",0") + // .append(M4_LSM_BP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_BP_SEARCH_ARRAY_a_verifBPTP_cnt") - .append(",") - .append(M4_LSM_BP_SEARCH_ARRAY_a_verifBPTP_cnt) + .append(",0") + // .append(M4_LSM_BP_SEARCH_ARRAY_a_verifBPTP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_BP_SEARCH_ARRAY_b_genFP_cnt") - .append(",") - .append(M4_LSM_BP_SEARCH_ARRAY_b_genFP_cnt) + .append(",0") + // .append(M4_LSM_BP_SEARCH_ARRAY_b_genFP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_BP_SEARCH_ARRAY_b_genLP_cnt") - .append(",") - .append(M4_LSM_BP_SEARCH_ARRAY_b_genLP_cnt) + .append(",0") + // .append(M4_LSM_BP_SEARCH_ARRAY_b_genLP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_BP_SEARCH_ARRAY_c_genBPTP_cnt") - .append(",") - .append(M4_LSM_BP_SEARCH_ARRAY_c_genBPTP_cnt) + .append(",0") + // .append(M4_LSM_BP_SEARCH_ARRAY_c_genBPTP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_TP_B_READ_MEM_CHUNK_cnt") - .append(",") - .append(M4_LSM_TP_B_READ_MEM_CHUNK_cnt) + .append(",0") + // .append(M4_LSM_TP_B_READ_MEM_CHUNK_cnt) .append("\n"); // 5*6 stringBuilder .append("[3-4]M4_LSM_TP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt") - .append(",") - .append(M4_LSM_TP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt) + .append(",0") + // .append(M4_LSM_TP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_TP_SEARCH_ARRAY_a_verifBPTP_cnt") - .append(",") - .append(M4_LSM_TP_SEARCH_ARRAY_a_verifBPTP_cnt) + .append(",0") + // .append(M4_LSM_TP_SEARCH_ARRAY_a_verifBPTP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_TP_SEARCH_ARRAY_b_genFP_cnt") - .append(",") - .append(M4_LSM_TP_SEARCH_ARRAY_b_genFP_cnt) + .append(",0") + // .append(M4_LSM_TP_SEARCH_ARRAY_b_genFP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_TP_SEARCH_ARRAY_b_genLP_cnt") - .append(",") - .append(M4_LSM_TP_SEARCH_ARRAY_b_genLP_cnt) + .append(",0") + // .append(M4_LSM_TP_SEARCH_ARRAY_b_genLP_cnt) .append("\n"); stringBuilder .append("[3-4]M4_LSM_TP_SEARCH_ARRAY_c_genBPTP_cnt") - .append(",") - .append(M4_LSM_TP_SEARCH_ARRAY_c_genBPTP_cnt) + .append(",0") + // .append(M4_LSM_TP_SEARCH_ARRAY_c_genBPTP_cnt) .append("\n"); reset(); // whenever print() is called, reset the metrics, to clean warm up information. 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 2b56950bf8f..7a5a617dd05 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 @@ -169,7 +169,7 @@ public class PageReader implements IPageReader { public void updateTP_withValueIndex(ChunkSuit4CPV chunkSuit4CPV) { if (TSFileDescriptor.getInstance().getConfig().isUseValueIndex()) { - long start = System.nanoTime(); + // long start = System.nanoTime(); // NOTE: get valueIndex from chunkSuit4CPV.getChunkMetadata().getStatistics(), not // chunkSuit4CPV.getStatistics()! ValueIndex valueIndex = chunkSuit4CPV.getChunkMetadata().getStatistics().valueIndex; @@ -199,7 +199,8 @@ public class PageReader implements IPageReader { // which is handled by updateBPTP updateBPTP_withoutTimeMeasure(chunkSuit4CPV); // then fall back to baseline method // time measured here, avoid counting twice - IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_c_genBPTP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_c_genBPTP, System.nanoTime() - + // start); return; } double threshold_LB = foundValue - valueIndex.errorBound; // near max LB @@ -342,7 +343,7 @@ public class PageReader implements IPageReader { } else { throw new UnSupportedDataTypeException(String.valueOf(dataType)); } - IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_c_genBPTP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_c_genBPTP, System.nanoTime() - start); } else { // not use value index updateBPTP(chunkSuit4CPV); } @@ -380,7 +381,8 @@ public class PageReader implements IPageReader { // which is handled by updateBPTP updateBPTP_withoutTimeMeasure(chunkSuit4CPV); // then fall back to baseline method // time measured here, avoid counting twice - IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_c_genBPTP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_c_genBPTP, System.nanoTime() - + // start); return; // note here } double threshold_UB = foundValue + valueIndex.errorBound; // near min UB @@ -524,7 +526,7 @@ public class PageReader implements IPageReader { } else { throw new UnSupportedDataTypeException(String.valueOf(dataType)); } - IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_c_genBPTP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_c_genBPTP, System.nanoTime() - start); } else { // not use value index updateBPTP(chunkSuit4CPV); } @@ -598,9 +600,9 @@ public class PageReader implements IPageReader { } public void updateBPTP(ChunkSuit4CPV chunkSuit4CPV) { - long start = System.nanoTime(); + // long start = System.nanoTime(); updateBPTP_withoutTimeMeasure(chunkSuit4CPV); - IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_c_genBPTP, System.nanoTime() - start); + // IOMonitor2.addMeasure(Operation.SEARCH_ARRAY_c_genBPTP, System.nanoTime() - start); } /** @return the returned BatchData may be empty, but never be null */
