Update test

Signed-off-by: JaySon-Huang <[email protected]>

Author: JaySon-Huang

dbms/src/Common/CurrentMetrics.cpp

@@ -95,10 +95,7 @@
     M(ConnectionPoolSize)                       \
     M(MemoryTrackingQueryStorageTask)           \
     M(MemoryTrackingFetchPages)                 \
-    M(MemoryTrackingSharedColumnData)           \
-    M(NumSegments)                              \
-    M(NumDeltaCache)                            \
-    M(BytesDeltaCache)
+    M(MemoryTrackingSharedColumnData)
 
 namespace CurrentMetrics
 {

dbms/src/Storages/DeltaMerge/tests/gtest_segment.cpp

@@ -15,6 +15,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/FailPoint.h>
 #include <Common/Logger.h>
+#include <Common/MemoryAllocTrace.h>
 #include <Common/PODArray.h>
 #include <Common/SyncPoint/Ctl.h>
 #include <DataStreams/OneBlockInputStream.h>
@@ -607,59 +608,11 @@ try
 }
 CATCH
 
-
-namespace
-{
-struct ProcessMemoryUsage
-{
-    double resident_mb;
-    Int64 cur_proc_num_threads;
-    double cur_virt_mb;
-};
-
-bool process_mem_usage(double & resident_set, Int64 & cur_proc_num_threads, UInt64 & cur_virt_size)
+double get_process_resident_mb()
 {
-    resident_set = 0.0;
-
-    // 'file' stat seems to give the most reliable results
-    std::ifstream stat_stream("/proc/self/stat", std::ios_base::in);
-    // if "/proc/self/stat" is not supported
-    if (!stat_stream.is_open())
-        return false;
-
-    // dummy vars for leading entries in stat that we don't care about
-    std::string pid, comm, state, ppid, pgrp, session, tty_nr;
-    std::string tpgid, flags, minflt, cminflt, majflt, cmajflt;
-    std::string utime, stime, cutime, cstime, priority, nice;
-    std::string itrealvalue, starttime;
-
-    // the field we want
-    Int64 rss;
-
-    stat_stream >> pid >> comm >> state >> ppid >> pgrp >> session >> tty_nr >> tpgid >> flags >> minflt >> cminflt
-        >> majflt >> cmajflt >> utime >> stime >> cutime >> cstime >> priority >> nice >> cur_proc_num_threads
-        >> itrealvalue >> starttime >> cur_virt_size >> rss; // don't care about the rest
-
-    stat_stream.close();
-
-    Int64 page_size_kb = sysconf(_SC_PAGE_SIZE) / 1024; // in case x86-64 is configured to use 2MB pages
-    resident_set = rss * page_size_kb;
-    return true;
+    auto mu = DB::get_process_mem_usage();
+    return mu.resident_bytes / 1024.0 / 1024;
 }
-ProcessMemoryUsage get_process_mem_usage()
-{
-    double resident_set;
-    Int64 cur_proc_num_threads = 1;
-    UInt64 cur_virt_size = 0;
-    process_mem_usage(resident_set, cur_proc_num_threads, cur_virt_size);
-    resident_set *= 1024; // unit: byte
-    return ProcessMemoryUsage{
-        resident_set / 1024.0 / 1024,
-        cur_proc_num_threads,
-        cur_virt_size / 1024.0 / 1024,
-    };
-}
-} // namespace
 
 TEST_F(SegmentOperationTest, TestMassiveSegment)
 try
@@ -685,21 +638,17 @@ try
             next_split_seg_id = *n_seg_id;
             if (i % progress_interval == 0)
             {
-                auto mu = get_process_mem_usage();
                 LOG_INFO(
                     log,
                     "lvl={} round={} split_point={} next_seg_id={} mem_resident_set={:.3f}MB)",
                     lvl,
                     i,
                     split_point,
                     *n_seg_id,
-                    mu.resident_mb);
+                    get_process_resident_mb());
             }
         }
-        {
-            auto mu = get_process_mem_usage();
-            LOG_INFO(log, "lvl={} round={} mem_resident_set={:.3f}MB", lvl, num_expected_segs, mu.resident_mb);
-        }
+        LOG_INFO(log, "lvl={} round={} mem_resident_set={:.3f}MB", lvl, num_expected_segs, get_process_resident_mb());
 
         size_t round = 0;
         for (auto && [seg_id, seg] : segments)
@@ -715,14 +664,13 @@ try
             size_t write_rows_sub = 2;
             if (round % progress_interval == 0)
             {
-                auto mu = get_process_mem_usage();
                 LOG_INFO(
                     log,
                     "lvl={} round={} written_rows={} mem_resident_set={:.3f}MB",
                     lvl,
                     round,
                     write_rows * round,
-                    mu.resident_mb);
+                    get_process_resident_mb());
             }
             for (size_t k = 0; k < 2; ++k)
             {
@@ -746,13 +694,12 @@ try
             round++;
         }
         {
-            auto mu = get_process_mem_usage();
             LOG_INFO(
                 log,
                 "TestMassiveSegment done, segments.size()={} lvl={} mem_resident_set={:.3f}MB",
                 segments.size(),
                 lvl,
-                mu.resident_mb);
+                get_process_resident_mb());
         }
     }
 }