fix CHANGELOG CONFLICTcqqq

Former-commit-id: da059eb1ab2c0d4dac31e698e47a345b9baf916c

cpp/src/metrics/SystemInfo.cpp

@@ -0,0 +1,7 @@
+/*******************************************************************************
+ * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved
+ * Unauthorized copying of this file, via any medium is strictly prohibited.
+ * Proprietary and confidential.
+ ******************************************************************************/
+
+#include "SystemInfo.h"

cpp/src/metrics/SystemInfo.h

@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved
+ * Unauthorized copying of this file, via any medium is strictly prohibited.
+ * Proprietary and confidential.
+ ******************************************************************************/
+
+#pragma once
+
+#include "sys/types.h"
+#include "sys/sysinfo.h"
+
+
+namespace zilliz {
+namespace vecwise {
+namespace server {
+
+class SystemInfo {
+ private:
+
+ public:
+    static SystemInfo &
+    GetInstance(){
+        static SystemInfo instance;
+        return instance;
+    }
+
+    long long GetPhysicalMemory();
+
+
+
+};
+
+}
+}
+}