From 63bd4cca5c333350fb1af38dbce7bcb85fafcdc2 Mon Sep 17 00:00:00 2001 From: starlord Date: Tue, 17 Sep 2019 10:57:41 +0800 Subject: [PATCH 1/2] merge Log.h Former-commit-id: 1204cfbfddee0b863abf10874ef97f0581c36a9a --- cpp/src/db/DBFactory.cpp | 2 +- cpp/src/db/DBImpl.cpp | 23 ++++++----- cpp/src/db/DBImpl.h | 4 +- cpp/src/db/Log.h | 26 ------------- cpp/src/db/Options.cpp | 9 ++--- cpp/src/db/Utils.cpp | 2 +- cpp/src/db/engine/EngineFactory.cpp | 2 +- cpp/src/db/engine/ExecutionEngineImpl.cpp | 17 ++++----- cpp/src/db/insert/MemManagerImpl.cpp | 2 +- cpp/src/db/insert/MemMenagerFactory.cpp | 5 +-- cpp/src/db/insert/MemTable.cpp | 2 +- cpp/src/db/insert/MemTableFile.cpp | 2 +- cpp/src/db/insert/VectorSource.cpp | 2 +- cpp/src/db/meta/MetaFactory.cpp | 5 +-- cpp/src/db/meta/MySQLConnectionPool.h | 2 +- cpp/src/db/meta/MySQLMetaImpl.cpp | 2 +- cpp/src/db/meta/SqliteMetaImpl.cpp | 2 +- cpp/src/db/scheduler/TaskDispatchStrategy.cpp | 2 +- cpp/src/db/scheduler/task/IndexLoadTask.cpp | 2 +- cpp/src/db/scheduler/task/SearchTask.cpp | 2 +- cpp/src/scheduler/ResourceMgr.cpp | 2 +- cpp/src/scheduler/task/SearchTask.cpp | 13 +++---- cpp/src/{db => utils}/Exception.h | 2 - cpp/src/utils/Log.h | 38 +++++++++++-------- cpp/src/utils/ThreadPool.h | 2 - cpp/src/utils/TimeRecorder.cpp | 2 - cpp/src/utils/TimeRecorder.h | 2 - cpp/src/wrapper/knowhere/vec_impl.cpp | 3 +- cpp/src/wrapper/knowhere/vec_index.cpp | 2 +- cpp/src/wrapper/knowhere/wrapper_log.h | 28 -------------- cpp/unittest/db/misc_test.cpp | 15 ++++---- cpp/unittest/db/search_test.cpp | 4 +- cpp/unittest/server/util_test.cpp | 2 +- 33 files changed, 83 insertions(+), 147 deletions(-) delete mode 100644 cpp/src/db/Log.h rename cpp/src/{db => utils}/Exception.h (97%) delete mode 100644 cpp/src/wrapper/knowhere/wrapper_log.h diff --git a/cpp/src/db/DBFactory.cpp b/cpp/src/db/DBFactory.cpp index b04067c38a..c62310a0b9 100644 --- a/cpp/src/db/DBFactory.cpp +++ b/cpp/src/db/DBFactory.cpp @@ -6,7 +6,7 @@ #include "DBFactory.h" #include "DBImpl.h" -#include "Exception.h" +#include "utils/Exception.h" #include "meta/MetaFactory.h" #include "meta/SqliteMetaImpl.h" #include "meta/MySQLMetaImpl.h" diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp index 80b1994778..c82c8b7a95 100644 --- a/cpp/src/db/DBImpl.cpp +++ b/cpp/src/db/DBImpl.cpp @@ -4,28 +4,27 @@ * Proprietary and confidential. ******************************************************************************/ #include "DBImpl.h" -#include "src/db/meta/SqliteMetaImpl.h" -#include "Log.h" -#include "Utils.h" +#include "cache/CpuCacheMgr.h" +#include "cache/GpuCacheMgr.h" #include "engine/EngineFactory.h" #include "insert/MemMenagerFactory.h" +#include "meta/SqliteMetaImpl.h" #include "meta/MetaFactory.h" +#include "meta/MetaConsts.h" #include "metrics/Metrics.h" #include "scheduler/TaskScheduler.h" - #include "scheduler/context/DeleteContext.h" +#include "scheduler/SchedInst.h" #include "utils/TimeRecorder.h" -#include "meta/MetaConsts.h" +#include "utils/Log.h" +#include "Utils.h" #include #include #include #include #include -#include #include -#include "scheduler/SchedInst.h" -#include namespace zilliz { namespace milvus { @@ -409,7 +408,7 @@ Status DBImpl::QueryAsync(const std::string& table_id, const meta::TableFilesSch const meta::DatesT& dates, QueryResults& results) { server::CollectQueryMetrics metrics(nq); - server::TimeRecorder rc(""); + TimeRecorder rc(""); //step 1: get files to search ENGINE_LOG_DEBUG << "Engine query begin, index file count: " << files.size() << " date range count: " << dates.size(); @@ -432,9 +431,9 @@ Status DBImpl::QueryAsync(const std::string& table_id, const meta::TableFilesSch double load_cost = context->LoadCost(); double search_cost = context->SearchCost(); double reduce_cost = context->ReduceCost(); - std::string load_info = server::TimeRecorder::GetTimeSpanStr(load_cost); - std::string search_info = server::TimeRecorder::GetTimeSpanStr(search_cost); - std::string reduce_info = server::TimeRecorder::GetTimeSpanStr(reduce_cost); + std::string load_info = TimeRecorder::GetTimeSpanStr(load_cost); + std::string search_info = TimeRecorder::GetTimeSpanStr(search_cost); + std::string reduce_info = TimeRecorder::GetTimeSpanStr(reduce_cost); if(search_cost > 0.0 || reduce_cost > 0.0) { double total_cost = load_cost + search_cost + reduce_cost; double load_percent = load_cost/total_cost; diff --git a/cpp/src/db/DBImpl.h b/cpp/src/db/DBImpl.h index e4bfbd5d34..5591d062fe 100644 --- a/cpp/src/db/DBImpl.h +++ b/cpp/src/db/DBImpl.h @@ -128,11 +128,11 @@ class DBImpl : public DB { MemManagerPtr mem_mgr_; std::mutex mem_serialize_mutex_; - server::ThreadPool compact_thread_pool_; + ThreadPool compact_thread_pool_; std::list> compact_thread_results_; std::set compact_table_ids_; - server::ThreadPool index_thread_pool_; + ThreadPool index_thread_pool_; std::list> index_thread_results_; std::mutex build_index_mutex_; diff --git a/cpp/src/db/Log.h b/cpp/src/db/Log.h deleted file mode 100644 index f36d861c3e..0000000000 --- a/cpp/src/db/Log.h +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved - * Unauthorized copying of this file, via any medium is strictly prohibited. - * Proprietary and confidential. - ******************************************************************************/ -#pragma once - -#include "utils/easylogging++.h" - -namespace zilliz { -namespace milvus { -namespace engine { - -#define ENGINE_DOMAIN_NAME "[ENGINE] " -#define ENGINE_ERROR_TEXT "ENGINE Error:" - -#define ENGINE_LOG_TRACE LOG(TRACE) << ENGINE_DOMAIN_NAME -#define ENGINE_LOG_DEBUG LOG(DEBUG) << ENGINE_DOMAIN_NAME -#define ENGINE_LOG_INFO LOG(INFO) << ENGINE_DOMAIN_NAME -#define ENGINE_LOG_WARNING LOG(WARNING) << ENGINE_DOMAIN_NAME -#define ENGINE_LOG_ERROR LOG(ERROR) << ENGINE_DOMAIN_NAME -#define ENGINE_LOG_FATAL LOG(FATAL) << ENGINE_DOMAIN_NAME - -} // namespace sql -} // namespace zilliz -} // namespace server diff --git a/cpp/src/db/Options.cpp b/cpp/src/db/Options.cpp index ecebd30bdb..06505aa2fd 100644 --- a/cpp/src/db/Options.cpp +++ b/cpp/src/db/Options.cpp @@ -3,15 +3,14 @@ * Unauthorized copying of this file, via any medium is strictly prohibited. * Proprietary and confidential. ******************************************************************************/ +#include "Options.h" +#include "utils/Exception.h" +#include "utils/easylogging++.h" + #include #include -#include "utils/easylogging++.h" #include -#include "Options.h" -#include "db/meta/SqliteMetaImpl.h" -#include "Exception.h" - namespace zilliz { namespace milvus { namespace engine { diff --git a/cpp/src/db/Utils.cpp b/cpp/src/db/Utils.cpp index 2c9173f6a7..e7cd7ae86d 100644 --- a/cpp/src/db/Utils.cpp +++ b/cpp/src/db/Utils.cpp @@ -5,7 +5,7 @@ ******************************************************************************/ #include "Utils.h" #include "utils/CommonUtil.h" -#include "Log.h" +#include "utils/Log.h" #include #include diff --git a/cpp/src/db/engine/EngineFactory.cpp b/cpp/src/db/engine/EngineFactory.cpp index a326d6a2c6..77a85d2aa4 100644 --- a/cpp/src/db/engine/EngineFactory.cpp +++ b/cpp/src/db/engine/EngineFactory.cpp @@ -5,7 +5,7 @@ ******************************************************************************/ #include "EngineFactory.h" #include "ExecutionEngineImpl.h" -#include "db/Log.h" +#include "utils/Log.h" namespace zilliz { namespace milvus { diff --git a/cpp/src/db/engine/ExecutionEngineImpl.cpp b/cpp/src/db/engine/ExecutionEngineImpl.cpp index 8a738347d2..a8fa3aab8e 100644 --- a/cpp/src/db/engine/ExecutionEngineImpl.cpp +++ b/cpp/src/db/engine/ExecutionEngineImpl.cpp @@ -3,20 +3,19 @@ * Unauthorized copying of this file, via any medium is strictly prohibited. * Proprietary and confidential. ******************************************************************************/ -#include -#include "src/cache/GpuCacheMgr.h" - -#include "src/metrics/Metrics.h" -#include "db/Log.h" -#include "utils/CommonUtil.h" - -#include "src/cache/CpuCacheMgr.h" #include "ExecutionEngineImpl.h" +#include "cache/GpuCacheMgr.h" +#include "cache/CpuCacheMgr.h" +#include "metrics/Metrics.h" +#include "utils/Log.h" +#include "utils/CommonUtil.h" +#include "utils/Exception.h" + #include "wrapper/knowhere/vec_index.h" #include "wrapper/knowhere/vec_impl.h" #include "knowhere/common/exception.h" -#include "db/Exception.h" +#include namespace zilliz { namespace milvus { diff --git a/cpp/src/db/insert/MemManagerImpl.cpp b/cpp/src/db/insert/MemManagerImpl.cpp index 240b2f2bb0..4988a8dc96 100644 --- a/cpp/src/db/insert/MemManagerImpl.cpp +++ b/cpp/src/db/insert/MemManagerImpl.cpp @@ -1,6 +1,6 @@ #include "MemManagerImpl.h" #include "VectorSource.h" -#include "db/Log.h" +#include "utils/Log.h" #include "db/Constants.h" #include diff --git a/cpp/src/db/insert/MemMenagerFactory.cpp b/cpp/src/db/insert/MemMenagerFactory.cpp index 965ba596bd..be3b7542e5 100644 --- a/cpp/src/db/insert/MemMenagerFactory.cpp +++ b/cpp/src/db/insert/MemMenagerFactory.cpp @@ -3,11 +3,10 @@ // Unauthorized copying of this file, via any medium is strictly prohibited. // Proprietary and confidential. //////////////////////////////////////////////////////////////////////////////// - #include "MemMenagerFactory.h" #include "MemManagerImpl.h" -#include "db/Log.h" -#include "db/Exception.h" +#include "utils/Log.h" +#include "utils/Exception.h" #include #include diff --git a/cpp/src/db/insert/MemTable.cpp b/cpp/src/db/insert/MemTable.cpp index fe6cdf0967..8f97c1a64f 100644 --- a/cpp/src/db/insert/MemTable.cpp +++ b/cpp/src/db/insert/MemTable.cpp @@ -1,5 +1,5 @@ #include "MemTable.h" -#include "db/Log.h" +#include "utils/Log.h" namespace zilliz { diff --git a/cpp/src/db/insert/MemTableFile.cpp b/cpp/src/db/insert/MemTableFile.cpp index 946b658b4b..b7aea99d65 100644 --- a/cpp/src/db/insert/MemTableFile.cpp +++ b/cpp/src/db/insert/MemTableFile.cpp @@ -1,8 +1,8 @@ #include "MemTableFile.h" #include "db/Constants.h" -#include "db/Log.h" #include "db/engine/EngineFactory.h" #include "metrics/Metrics.h" +#include "utils/Log.h" #include diff --git a/cpp/src/db/insert/VectorSource.cpp b/cpp/src/db/insert/VectorSource.cpp index f7d6a48297..cebe956ec2 100644 --- a/cpp/src/db/insert/VectorSource.cpp +++ b/cpp/src/db/insert/VectorSource.cpp @@ -1,7 +1,7 @@ #include "VectorSource.h" #include "db/engine/ExecutionEngine.h" #include "db/engine/EngineFactory.h" -#include "db/Log.h" +#include "utils/Log.h" #include "metrics/Metrics.h" diff --git a/cpp/src/db/meta/MetaFactory.cpp b/cpp/src/db/meta/MetaFactory.cpp index 9e025658af..0c43cc19fd 100644 --- a/cpp/src/db/meta/MetaFactory.cpp +++ b/cpp/src/db/meta/MetaFactory.cpp @@ -3,12 +3,11 @@ // Unauthorized copying of this file, via any medium is strictly prohibited. // Proprietary and confidential. //////////////////////////////////////////////////////////////////////////////// - #include "MetaFactory.h" #include "SqliteMetaImpl.h" #include "MySQLMetaImpl.h" -#include "db/Log.h" -#include "db/Exception.h" +#include "utils/Log.h" +#include "utils/Exception.h" #include #include diff --git a/cpp/src/db/meta/MySQLConnectionPool.h b/cpp/src/db/meta/MySQLConnectionPool.h index 9cde818b45..24f1238324 100644 --- a/cpp/src/db/meta/MySQLConnectionPool.h +++ b/cpp/src/db/meta/MySQLConnectionPool.h @@ -4,7 +4,7 @@ #include #include -#include "db/Log.h" +#include "utils/Log.h" namespace zilliz { namespace milvus { diff --git a/cpp/src/db/meta/MySQLMetaImpl.cpp b/cpp/src/db/meta/MySQLMetaImpl.cpp index 6c89471741..86ad635a95 100644 --- a/cpp/src/db/meta/MySQLMetaImpl.cpp +++ b/cpp/src/db/meta/MySQLMetaImpl.cpp @@ -6,7 +6,7 @@ #include "MySQLMetaImpl.h" #include "db/IDGenerator.h" #include "db/Utils.h" -#include "db/Log.h" +#include "utils/Log.h" #include "MetaConsts.h" #include "metrics/Metrics.h" diff --git a/cpp/src/db/meta/SqliteMetaImpl.cpp b/cpp/src/db/meta/SqliteMetaImpl.cpp index 38941abf38..59289612e4 100644 --- a/cpp/src/db/meta/SqliteMetaImpl.cpp +++ b/cpp/src/db/meta/SqliteMetaImpl.cpp @@ -6,7 +6,7 @@ #include "SqliteMetaImpl.h" #include "db/IDGenerator.h" #include "db/Utils.h" -#include "db/Log.h" +#include "utils/Log.h" #include "MetaConsts.h" #include "metrics/Metrics.h" diff --git a/cpp/src/db/scheduler/TaskDispatchStrategy.cpp b/cpp/src/db/scheduler/TaskDispatchStrategy.cpp index 38c9463117..9f730c0263 100644 --- a/cpp/src/db/scheduler/TaskDispatchStrategy.cpp +++ b/cpp/src/db/scheduler/TaskDispatchStrategy.cpp @@ -10,7 +10,7 @@ #include "task/DeleteTask.h" #include "cache/CpuCacheMgr.h" #include "utils/Error.h" -#include "db/Log.h" +#include "utils/Log.h" namespace zilliz { namespace milvus { diff --git a/cpp/src/db/scheduler/task/IndexLoadTask.cpp b/cpp/src/db/scheduler/task/IndexLoadTask.cpp index 4efb041d61..c2e34727a8 100644 --- a/cpp/src/db/scheduler/task/IndexLoadTask.cpp +++ b/cpp/src/db/scheduler/task/IndexLoadTask.cpp @@ -6,8 +6,8 @@ #include "IndexLoadTask.h" #include "SearchTask.h" -#include "db/Log.h" #include "db/engine/EngineFactory.h" +#include "utils/Log.h" #include "utils/TimeRecorder.h" #include "metrics/Metrics.h" diff --git a/cpp/src/db/scheduler/task/SearchTask.cpp b/cpp/src/db/scheduler/task/SearchTask.cpp index 5117dc948c..93cd4525e2 100644 --- a/cpp/src/db/scheduler/task/SearchTask.cpp +++ b/cpp/src/db/scheduler/task/SearchTask.cpp @@ -5,7 +5,7 @@ ******************************************************************************/ #include "SearchTask.h" #include "metrics/Metrics.h" -#include "db/Log.h" +#include "utils/Log.h" #include "utils/TimeRecorder.h" #include diff --git a/cpp/src/scheduler/ResourceMgr.cpp b/cpp/src/scheduler/ResourceMgr.cpp index cbbf449763..a592cd6f54 100644 --- a/cpp/src/scheduler/ResourceMgr.cpp +++ b/cpp/src/scheduler/ResourceMgr.cpp @@ -5,7 +5,7 @@ * Proprietary and confidential. ******************************************************************************/ #include "ResourceMgr.h" -#include "db/Log.h" +#include "utils/Log.h" namespace zilliz { diff --git a/cpp/src/scheduler/task/SearchTask.cpp b/cpp/src/scheduler/task/SearchTask.cpp index 46d429ab56..6bbe072ba7 100644 --- a/cpp/src/scheduler/task/SearchTask.cpp +++ b/cpp/src/scheduler/task/SearchTask.cpp @@ -3,12 +3,11 @@ * Unauthorized copying of this file, via any medium is strictly prohibited. * Proprietary and confidential. ******************************************************************************/ - -#include "src/metrics/Metrics.h" -#include "src/utils/TimeRecorder.h" -#include "src/db/engine/EngineFactory.h" -#include "src/db/Log.h" #include "SearchTask.h" +#include "metrics/Metrics.h" +#include "db/engine/EngineFactory.h" +#include "utils/TimeRecorder.h" +#include "utils/Log.h" #include @@ -97,7 +96,7 @@ XSearchTask::XSearchTask(TableFileSchemaPtr file) void XSearchTask::Load(LoadType type, uint8_t device_id) { - server::TimeRecorder rc(""); + TimeRecorder rc(""); Status stat = Status::OK(); std::string error_msg; std::string type_str; @@ -166,7 +165,7 @@ XSearchTask::Execute() { ENGINE_LOG_DEBUG << "Searching in file id:" << index_id_ << " with " << search_contexts_.size() << " tasks"; - server::TimeRecorder rc("DoSearch file id:" + std::to_string(index_id_)); + TimeRecorder rc("DoSearch file id:" + std::to_string(index_id_)); server::CollectDurationMetrics metrics(index_type_); diff --git a/cpp/src/db/Exception.h b/cpp/src/utils/Exception.h similarity index 97% rename from cpp/src/db/Exception.h rename to cpp/src/utils/Exception.h index 2474b70283..b810fb2011 100644 --- a/cpp/src/db/Exception.h +++ b/cpp/src/utils/Exception.h @@ -10,7 +10,6 @@ namespace zilliz { namespace milvus { -namespace engine { class Exception : public std::exception { public: @@ -49,6 +48,5 @@ public: OutOfRangeException(const std::string& message) : Exception(message) {}; }; -} // namespace engine } // namespace milvus } // namespace zilliz diff --git a/cpp/src/utils/Log.h b/cpp/src/utils/Log.h index 204d5812b6..3189a7e205 100644 --- a/cpp/src/utils/Log.h +++ b/cpp/src/utils/Log.h @@ -5,13 +5,12 @@ ******************************************************************************/ #pragma once -#include "Error.h" #include "easylogging++.h" namespace zilliz { namespace milvus { -namespace server { +///////////////////////////////////////////////////////////////////////////////////////////////// #define SERVER_DOMAIN_NAME "[SERVER] " #define SERVER_ERROR_TEXT "SERVER Error:" @@ -22,20 +21,27 @@ namespace server { #define SERVER_LOG_ERROR LOG(ERROR) << SERVER_DOMAIN_NAME #define SERVER_LOG_FATAL LOG(FATAL) << SERVER_DOMAIN_NAME -#define SERVER_ERROR(error) \ - ({ \ - SERVER_LOG_ERROR << SERVER_ERROR_TEXT << error; \ - (error); \ - }) +///////////////////////////////////////////////////////////////////////////////////////////////// +#define ENGINE_DOMAIN_NAME "[ENGINE] " +#define ENGINE_ERROR_TEXT "ENGINE Error:" -#define SERVER_CHECK(func) \ - { \ - zilliz::milvus::server::ServerError error = func; \ - if (error != zilliz::milvus::server::SERVER_SUCCESS) { \ - return SERVER_ERROR(error); \ - } \ - } \ +#define ENGINE_LOG_TRACE LOG(TRACE) << ENGINE_DOMAIN_NAME +#define ENGINE_LOG_DEBUG LOG(DEBUG) << ENGINE_DOMAIN_NAME +#define ENGINE_LOG_INFO LOG(INFO) << ENGINE_DOMAIN_NAME +#define ENGINE_LOG_WARNING LOG(WARNING) << ENGINE_DOMAIN_NAME +#define ENGINE_LOG_ERROR LOG(ERROR) << ENGINE_DOMAIN_NAME +#define ENGINE_LOG_FATAL LOG(FATAL) << ENGINE_DOMAIN_NAME -} // namespace sql +///////////////////////////////////////////////////////////////////////////////////////////////// +#define WRAPPER_DOMAIN_NAME "[WRAPPER] " +#define WRAPPER_ERROR_TEXT "WRAPPER Error:" + +#define WRAPPER_LOG_TRACE LOG(TRACE) << WRAPPER_DOMAIN_NAME +#define WRAPPER_LOG_DEBUG LOG(DEBUG) << WRAPPER_DOMAIN_NAME +#define WRAPPER_LOG_INFO LOG(INFO) << WRAPPER_DOMAIN_NAME +#define WRAPPER_LOG_WARNING LOG(WARNING) << WRAPPER_DOMAIN_NAME +#define WRAPPER_LOG_ERROR LOG(ERROR) << WRAPPER_DOMAIN_NAME +#define WRAPPER_LOG_FATAL LOG(FATAL) << WRAPPER_DOMAIN_NAME + +} // namespace milvus } // namespace zilliz -} // namespace server diff --git a/cpp/src/utils/ThreadPool.h b/cpp/src/utils/ThreadPool.h index cf7cc56c65..8453e53f83 100644 --- a/cpp/src/utils/ThreadPool.h +++ b/cpp/src/utils/ThreadPool.h @@ -20,7 +20,6 @@ namespace zilliz { namespace milvus { -namespace server { class ThreadPool { public: @@ -114,5 +113,4 @@ inline ThreadPool::~ThreadPool() { } } -} diff --git a/cpp/src/utils/TimeRecorder.cpp b/cpp/src/utils/TimeRecorder.cpp index ee33680f54..8647203fdd 100644 --- a/cpp/src/utils/TimeRecorder.cpp +++ b/cpp/src/utils/TimeRecorder.cpp @@ -9,7 +9,6 @@ namespace zilliz { namespace milvus { -namespace server { TimeRecorder::TimeRecorder(const std::string &header, int64_t log_level) : @@ -91,4 +90,3 @@ TimeRecorder::ElapseFromBegin(const std::string &msg) { } } -} diff --git a/cpp/src/utils/TimeRecorder.h b/cpp/src/utils/TimeRecorder.h index 1656e0d77f..7f2baaf751 100644 --- a/cpp/src/utils/TimeRecorder.h +++ b/cpp/src/utils/TimeRecorder.h @@ -11,7 +11,6 @@ namespace zilliz { namespace milvus { -namespace server { class TimeRecorder { using stdclock = std::chrono::high_resolution_clock; @@ -40,4 +39,3 @@ private: } } -} diff --git a/cpp/src/wrapper/knowhere/vec_impl.cpp b/cpp/src/wrapper/knowhere/vec_impl.cpp index c012ea60fb..214ef19ead 100644 --- a/cpp/src/wrapper/knowhere/vec_impl.cpp +++ b/cpp/src/wrapper/knowhere/vec_impl.cpp @@ -4,7 +4,7 @@ // Proprietary and confidential. //////////////////////////////////////////////////////////////////////////////// -#include +#include "utils/Log.h" #include "knowhere/index/vector_index/idmap.h" #include "knowhere/index/vector_index/gpu_ivf.h" #include "knowhere/common/exception.h" @@ -12,7 +12,6 @@ #include "vec_impl.h" #include "data_transfer.h" -#include "wrapper_log.h" namespace zilliz { diff --git a/cpp/src/wrapper/knowhere/vec_index.cpp b/cpp/src/wrapper/knowhere/vec_index.cpp index 2c368541cc..ee2a21e6f9 100644 --- a/cpp/src/wrapper/knowhere/vec_index.cpp +++ b/cpp/src/wrapper/knowhere/vec_index.cpp @@ -12,7 +12,7 @@ #include "vec_index.h" #include "vec_impl.h" -#include "wrapper_log.h" +#include "utils/Log.h" #include diff --git a/cpp/src/wrapper/knowhere/wrapper_log.h b/cpp/src/wrapper/knowhere/wrapper_log.h deleted file mode 100644 index 7cde925292..0000000000 --- a/cpp/src/wrapper/knowhere/wrapper_log.h +++ /dev/null @@ -1,28 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved -// Unauthorized copying of this file, via any medium is strictly prohibited. -// Proprietary and confidential. -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "utils/easylogging++.h" - -namespace zilliz { -namespace milvus { -namespace engine { - -#define WRAPPER_DOMAIN_NAME "[WRAPPER] " -#define WRAPPER_ERROR_TEXT "WRAPPER Error:" - -#define WRAPPER_LOG_TRACE LOG(TRACE) << WRAPPER_DOMAIN_NAME -#define WRAPPER_LOG_DEBUG LOG(DEBUG) << WRAPPER_DOMAIN_NAME -#define WRAPPER_LOG_INFO LOG(INFO) << WRAPPER_DOMAIN_NAME -#define WRAPPER_LOG_WARNING LOG(WARNING) << WRAPPER_DOMAIN_NAME -#define WRAPPER_LOG_ERROR LOG(ERROR) << WRAPPER_DOMAIN_NAME -#define WRAPPER_LOG_FATAL LOG(FATAL) << WRAPPER_DOMAIN_NAME - -} -} -} - diff --git a/cpp/unittest/db/misc_test.cpp b/cpp/unittest/db/misc_test.cpp index d9c2cbf03e..b7f116a511 100644 --- a/cpp/unittest/db/misc_test.cpp +++ b/cpp/unittest/db/misc_test.cpp @@ -3,18 +3,17 @@ // Unauthorized copying of this file, via any medium is strictly prohibited. // Proprietary and confidential. //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include "utils/easylogging++.h" -#include - -#include "db/Exception.h" #include "db/Status.h" #include "db/Options.h" #include "db/meta/SqliteMetaImpl.h" #include "db/engine/EngineFactory.h" #include "db/Utils.h" +#include "utils/Exception.h" +#include "utils/easylogging++.h" +#include +#include +#include #include using namespace zilliz::milvus; @@ -27,11 +26,11 @@ namespace { } TEST(DBMiscTest, EXCEPTION_TEST) { - engine::Exception ex1(""); + Exception ex1(""); std::string what = ex1.what(); ASSERT_FALSE(what.empty()); - engine::OutOfRangeException ex2; + OutOfRangeException ex2; what = ex2.what(); ASSERT_FALSE(what.empty()); } diff --git a/cpp/unittest/db/search_test.cpp b/cpp/unittest/db/search_test.cpp index 2eb3300bc1..621a81cfe4 100644 --- a/cpp/unittest/db/search_test.cpp +++ b/cpp/unittest/db/search_test.cpp @@ -226,7 +226,7 @@ TEST(DBSearchTest, PARALLEL_CLUSTER_TEST) { engine::SearchContext::ResultSet src_result; auto DoCluster = [&](int64_t nq, int64_t topk) { - server::TimeRecorder rc("DoCluster"); + TimeRecorder rc("DoCluster"); src_result.clear(); BuildResult(nq, topk, ascending, target_ids, target_distence); rc.RecordSection("build id/dietance map"); @@ -268,7 +268,7 @@ TEST(DBSearchTest, PARALLEL_TOPK_TEST) { src_result.clear(); insufficient_result.clear(); - server::TimeRecorder rc("DoCluster"); + TimeRecorder rc("DoCluster"); BuildResult(nq, topk, ascending, target_ids, target_distence); auto status = engine::XSearchTask::ClusterResult(target_ids, target_distence, nq, topk, src_result); diff --git a/cpp/unittest/server/util_test.cpp b/cpp/unittest/server/util_test.cpp index a600ace499..e7048ebbbe 100644 --- a/cpp/unittest/server/util_test.cpp +++ b/cpp/unittest/server/util_test.cpp @@ -166,7 +166,7 @@ TEST(UtilTest, TIMERECORDER_TEST) { if(log_level == 5) { continue; //skip fatal } - server::TimeRecorder rc("time", log_level); + TimeRecorder rc("time", log_level); rc.RecordSection("end"); } } From 9d53224b6a710cf995f3939d12304ff7efb0b586 Mon Sep 17 00:00:00 2001 From: starlord Date: Tue, 17 Sep 2019 11:06:26 +0800 Subject: [PATCH 2/2] MS-557 merge Log.h Former-commit-id: 0fb5985bc71132307d66eea85c098d3518935c8c --- cpp/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index a14997bb75..a3696e25f8 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -9,6 +9,7 @@ Please mark all change in change log and use the ticket from JIRA. ## Improvement - MS-552 - Add and change the easylogging library - MS-553 - Refine cache code +- MS-557 - Merge Log.h ## New Feature