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 7ed7a87606f4c0676f6a13c67f1292a8fe47a647
Author: Lei Rui <[email protected]>
AuthorDate: Wed Jun 14 15:44:21 2023 +0800

    modify iomonitor2 print
---
 .../iotdb/tsfile/read/common/IOMonitor2.java       | 180 +++++++++++++--------
 1 file changed, 114 insertions(+), 66 deletions(-)

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 9c17f371e34..496bf9ab678 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
@@ -305,139 +305,187 @@ public class IOMonitor2 {
 
   public static String print() {
     StringBuilder stringBuilder = new StringBuilder();
-    
stringBuilder.append("dataSetType").append(",").append(dataSetType).append("\n");
-
+    // [1] is client elapsed time, not measured by the server side
     stringBuilder
-        .append("Server_Query_Execute_ns")
+        .append("[2]Server_Query_Execute_ns_cnt")
         .append(",")
         .append(DCP_Server_Query_Execute_ns)
+        .append(",")
+        .append(DCP_Server_Query_Execute_count)
         .append("\n");
     stringBuilder
-        .append("Server_Query_Fetch_ns")
+        .append("[2]Server_Query_Fetch_ns_cnt")
         .append(",")
         .append(DCP_Server_Query_Fetch_ns)
+        .append(",")
+        .append(DCP_Server_Query_Fetch_count)
         .append("\n");
+    
stringBuilder.append("[3]dataSetType").append(",").append(dataSetType).append("\n");
     stringBuilder
-        .append("M4_LSM_init_loadAllChunkMetadatas_ns")
+        .append("[3]M4_LSM_init_loadAllChunkMetadatas_ns_cnt")
         .append(",")
         .append(M4_LSM_init_loadAllChunkMetadatas_ns)
+        .append(",")
+        .append(M4_LSM_init_loadAllChunkMetadatas_count)
         .append("\n");
     stringBuilder
-        .append("M4_LSM_merge_M4_time_span_ns")
+        .append("[3]M4_LSM_merge_M4_time_span_ns_cnt")
         .append(",")
         .append(M4_LSM_merge_M4_time_span_ns)
-        .append("\n");
-    
stringBuilder.append("M4_LSM_FP_ns").append(",").append(M4_LSM_FP_ns).append("\n");
-    
stringBuilder.append("M4_LSM_LP_ns").append(",").append(M4_LSM_LP_ns).append("\n");
-    
stringBuilder.append("M4_LSM_BP_ns").append(",").append(M4_LSM_BP_ns).append("\n");
-    
stringBuilder.append("M4_LSM_TP_ns").append(",").append(M4_LSM_TP_ns).append("\n");
-    stringBuilder
-        .append("DCP_A_GET_CHUNK_METADATAS_ns")
         .append(",")
-        .append(DCP_A_GET_CHUNK_METADATAS_ns)
+        .append(M4_LSM_merge_M4_time_span_count)
         .append("\n");
     stringBuilder
-        .append("DCP_B_READ_MEM_CHUNK_ns")
+        .append("[3]M4_LSM_FP_ns_cnt")
         .append(",")
-        .append(DCP_B_READ_MEM_CHUNK_ns)
-        .append("\n");
-    stringBuilder
-        .append("DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_ns")
+        .append(M4_LSM_FP_ns)
         .append(",")
-        .append(DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_ns)
+        .append(M4_LSM_FP_count)
         .append("\n");
     stringBuilder
-        .append("DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_ns")
+        .append("[3]M4_LSM_LP_ns_cnt")
         .append(",")
-        .append(DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_ns)
-        .append("\n");
-    stringBuilder
-        .append("SEARCH_ARRAY_a_verifBPTP_ns")
+        .append(M4_LSM_LP_ns)
         .append(",")
-        .append(SEARCH_ARRAY_a_verifBPTP_ns)
+        .append(M4_LSM_LP_count)
         .append("\n");
     stringBuilder
-        .append("SEARCH_ARRAY_b_genFP_ns")
+        .append("[3]M4_LSM_BP_ns_cnt")
         .append(",")
-        .append(SEARCH_ARRAY_b_genFP_ns)
-        .append("\n");
-    stringBuilder
-        .append("SEARCH_ARRAY_b_genLP_ns")
+        .append(M4_LSM_BP_ns)
         .append(",")
-        .append(SEARCH_ARRAY_b_genLP_ns)
+        .append(M4_LSM_BP_count)
         .append("\n");
     stringBuilder
-        .append("SEARCH_ARRAY_c_genBPTP_ns")
+        .append("[3]M4_LSM_TP_ns_cnt")
         .append(",")
-        .append(SEARCH_ARRAY_c_genBPTP_ns)
-        .append("\n");
-
-    stringBuilder
-        .append("Server_Query_Execute_cnt")
+        .append(M4_LSM_TP_ns)
         .append(",")
-        .append(DCP_Server_Query_Execute_count)
+        .append(M4_LSM_TP_count)
         .append("\n");
     stringBuilder
-        .append("Server_Query_Fetch_cnt")
+        .append("[4]DCP_A_GET_CHUNK_METADATAS_ns_cnt")
         .append(",")
-        .append(DCP_Server_Query_Fetch_count)
-        .append("\n");
-    stringBuilder
-        .append("M4_LSM_init_loadAllChunkMetadatas_cnt")
-        .append(",")
-        .append(M4_LSM_init_loadAllChunkMetadatas_count)
-        .append("\n");
-    stringBuilder
-        .append("M4_LSM_merge_M4_time_span_cnt")
-        .append(",")
-        .append(M4_LSM_merge_M4_time_span_count)
-        .append("\n");
-    
stringBuilder.append("M4_LSM_FP_cnt").append(",").append(M4_LSM_FP_count).append("\n");
-    
stringBuilder.append("M4_LSM_LP_cnt").append(",").append(M4_LSM_LP_count).append("\n");
-    
stringBuilder.append("M4_LSM_BP_cnt").append(",").append(M4_LSM_BP_count).append("\n");
-    
stringBuilder.append("M4_LSM_TP_cnt").append(",").append(M4_LSM_TP_count).append("\n");
-    stringBuilder
-        .append("DCP_A_GET_CHUNK_METADATAS_cnt")
+        .append(DCP_A_GET_CHUNK_METADATAS_ns)
         .append(",")
         .append(DCP_A_GET_CHUNK_METADATAS_count)
         .append("\n");
     stringBuilder
-        .append("DCP_B_READ_MEM_CHUNK_cnt")
+        .append("[4]DCP_B_READ_MEM_CHUNK_ns_cnt")
+        .append(",")
+        .append(DCP_B_READ_MEM_CHUNK_ns)
         .append(",")
         .append(DCP_B_READ_MEM_CHUNK_count)
         .append("\n");
     stringBuilder
-        .append("DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt")
+        .append("[4]DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_ns_cnt")
+        .append(",")
+        .append(DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_ns)
         .append(",")
         .append(DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_count)
         .append("\n");
     stringBuilder
-        .append("DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_cnt")
+        .append("[4]DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_ns_cnt")
+        .append(",")
+        .append(DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_ns)
         .append(",")
         .append(DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_count)
         .append("\n");
     stringBuilder
-        .append("SEARCH_ARRAY_a_verifBPTP_cnt")
+        .append("[4]SEARCH_ARRAY_a_verifBPTP_ns_cnt")
+        .append(",")
+        .append(SEARCH_ARRAY_a_verifBPTP_ns)
         .append(",")
         .append(SEARCH_ARRAY_a_verifBPTP_count)
         .append("\n");
     stringBuilder
-        .append("SEARCH_ARRAY_b_genFP_cnt")
+        .append("[4]SEARCH_ARRAY_b_genFP_ns_cnt")
+        .append(",")
+        .append(SEARCH_ARRAY_b_genFP_ns)
         .append(",")
         .append(SEARCH_ARRAY_b_genFP_count)
         .append("\n");
     stringBuilder
-        .append("SEARCH_ARRAY_b_genLP_cnt")
+        .append("[4]SEARCH_ARRAY_b_genLP_ns_cnt")
+        .append(",")
+        .append(SEARCH_ARRAY_b_genLP_ns)
         .append(",")
         .append(SEARCH_ARRAY_b_genLP_count)
         .append("\n");
     stringBuilder
-        .append("SEARCH_ARRAY_c_genBPTP_cnt")
+        .append("[4]SEARCH_ARRAY_c_genBPTP_ns_cnt")
+        .append(",")
+        .append(SEARCH_ARRAY_c_genBPTP_ns)
         .append(",")
         .append(SEARCH_ARRAY_c_genBPTP_count)
         .append("\n");
+
+    //    stringBuilder
+    //        .append("[2]Server_Query_Execute_cnt")
+    //        .append(",")
+    //        .append(DCP_Server_Query_Execute_count)
+    //        .append("\n");
+    //    stringBuilder
+    //        .append("Server_Query_Fetch_cnt")
+    //        .append(",")
+    //        .append(DCP_Server_Query_Fetch_count)
+    //        .append("\n");
+    //    stringBuilder
+    //        .append("M4_LSM_init_loadAllChunkMetadatas_cnt")
+    //        .append(",")
+    //        .append(M4_LSM_init_loadAllChunkMetadatas_count)
+    //        .append("\n");
+    //    stringBuilder
+    //        .append("M4_LSM_merge_M4_time_span_cnt")
+    //        .append(",")
+    //        .append(M4_LSM_merge_M4_time_span_count)
+    //        .append("\n");
+    //    
stringBuilder.append("M4_LSM_FP_cnt").append(",").append(M4_LSM_FP_count).append("\n");
+    //    
stringBuilder.append("M4_LSM_LP_cnt").append(",").append(M4_LSM_LP_count).append("\n");
+    //    
stringBuilder.append("M4_LSM_BP_cnt").append(",").append(M4_LSM_BP_count).append("\n");
+    //    
stringBuilder.append("M4_LSM_TP_cnt").append(",").append(M4_LSM_TP_count).append("\n");
+    //    stringBuilder
+    //        .append("DCP_A_GET_CHUNK_METADATAS_cnt")
+    //        .append(",")
+    //        .append(DCP_A_GET_CHUNK_METADATAS_count)
+    //        .append("\n");
+    //    stringBuilder
+    //        .append("DCP_B_READ_MEM_CHUNK_cnt")
+    //        .append(",")
+    //        .append(DCP_B_READ_MEM_CHUNK_count)
+    //        .append("\n");
+    //    stringBuilder
+    //        .append("DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_cnt")
+    //        .append(",")
+    //        .append(DCP_C_DESERIALIZE_PAGEHEADER_DECOMPRESS_PAGEDATA_count)
+    //        .append("\n");
+    //    stringBuilder
+    //        .append("DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_cnt")
+    //        .append(",")
+    //        .append(DCP_D_DECODE_PAGEDATA_TRAVERSE_POINTS_count)
+    //        .append("\n");
+    //    stringBuilder
+    //        .append("SEARCH_ARRAY_a_verifBPTP_cnt")
+    //        .append(",")
+    //        .append(SEARCH_ARRAY_a_verifBPTP_count)
+    //        .append("\n");
+    //    stringBuilder
+    //        .append("SEARCH_ARRAY_b_genFP_cnt")
+    //        .append(",")
+    //        .append(SEARCH_ARRAY_b_genFP_count)
+    //        .append("\n");
+    //    stringBuilder
+    //        .append("SEARCH_ARRAY_b_genLP_cnt")
+    //        .append(",")
+    //        .append(SEARCH_ARRAY_b_genLP_count)
+    //        .append("\n");
+    //    stringBuilder
+    //        .append("SEARCH_ARRAY_c_genBPTP_cnt")
+    //        .append(",")
+    //        .append(SEARCH_ARRAY_c_genBPTP_count)
+    //        .append("\n");
     stringBuilder
-        .append("DCP_D_traversedPointNum")
+        .append("[4]DCP_D_traversedPointNum")
         .append(",")
         .append(DCP_D_traversedPointNum)
         .append("\n");

Reply via email to