From a91486e966ab76f284546ccebf6b2979ef7d08f0 Mon Sep 17 00:00:00 2001 From: groot Date: Thu, 21 Oct 2021 19:10:37 +0800 Subject: [PATCH] Fix a compile error (#10358) Signed-off-by: yhmo --- .../knowhere/archive/KnowhereConfig.cpp | 1 - .../src/index/knowhere/knowhere/common/Log.h | 9 +++-- .../src/index/knowhere/log/DeprecatedLog.h | 40 ++++++++++++------- internal/core/src/index/knowhere/utils/Log.h | 14 ------- internal/core/src/log/Log.h | 20 ---------- 5 files changed, 31 insertions(+), 53 deletions(-) delete mode 100644 internal/core/src/index/knowhere/utils/Log.h diff --git a/internal/core/src/index/knowhere/knowhere/archive/KnowhereConfig.cpp b/internal/core/src/index/knowhere/knowhere/archive/KnowhereConfig.cpp index 843f4ec2db..c71b627ceb 100644 --- a/internal/core/src/index/knowhere/knowhere/archive/KnowhereConfig.cpp +++ b/internal/core/src/index/knowhere/knowhere/archive/KnowhereConfig.cpp @@ -26,7 +26,6 @@ #include "knowhere/index/vector_index/helpers/FaissIO.h" #include "utils/ConfigUtils.h" #include "utils/Error.h" -#include "utils/Log.h" #include "knowhere/common/Exception.h" #include diff --git a/internal/core/src/index/knowhere/knowhere/common/Log.h b/internal/core/src/index/knowhere/knowhere/common/Log.h index db1677e320..5a3a2530be 100644 --- a/internal/core/src/index/knowhere/knowhere/common/Log.h +++ b/internal/core/src/index/knowhere/knowhere/common/Log.h @@ -52,9 +52,12 @@ log_fatal_(const std::string&); ///////////////////////////////////////////////////////////////////////////////////////////////// #define KNOWHERE_MODULE_NAME "KNOWHERE" -#define KNOWHERE_MODULE_CLASS_FUNCTION \ - LogOut("[%s][%s::%s][%s] ", KNOWHERE_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, GetThreadName().c_str()) -#define KNOWHERE_MODULE_FUNCTION LogOut("[%s][%s][%s] ", KNOWHERE_MODULE_NAME, __FUNCTION__, GetThreadName().c_str()) +#define KNOWHERE_MODULE_CLASS_FUNCTION \ + milvus::knowhere::LogOut("[%s][%s::%s][%s] ", KNOWHERE_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, \ + milvus::knowhere::GetThreadName().c_str()) +#define KNOWHERE_MODULE_FUNCTION \ + milvus::knowhere::LogOut("[%s][%s][%s] ", KNOWHERE_MODULE_NAME, __FUNCTION__, \ + milvus::knowhere::GetThreadName().c_str()) #define LOG_KNOWHERE_TRACE_C LOG(TRACE) << KNOWHERE_MODULE_CLASS_FUNCTION #define LOG_KNOWHERE_DEBUG_C LOG(DEBUG) << KNOWHERE_MODULE_CLASS_FUNCTION diff --git a/internal/core/src/index/knowhere/log/DeprecatedLog.h b/internal/core/src/index/knowhere/log/DeprecatedLog.h index e6080caac3..3bf0c1ee87 100644 --- a/internal/core/src/index/knowhere/log/DeprecatedLog.h +++ b/internal/core/src/index/knowhere/log/DeprecatedLog.h @@ -18,9 +18,11 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #define SERVER_MODULE_NAME "SERVER" -#define SERVER_MODULE_CLASS_FUNCTION \ - LogOut("[%s][%s::%s][%s] ", SERVER_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, GetThreadName().c_str()) -#define SERVER_MODULE_FUNCTION LogOut("[%s][%s][%s] ", SERVER_MODULE_NAME, __FUNCTION__, GetThreadName().c_str()) +#define SERVER_MODULE_CLASS_FUNCTION \ + LogOut("[%s][%s::%s][%s] ", SERVER_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, \ + milvus::knowhere::GetThreadName().c_str()) +#define SERVER_MODULE_FUNCTION \ + LogOut("[%s][%s][%s] ", SERVER_MODULE_NAME, __FUNCTION__, milvus::knowhere::GetThreadName().c_str()) #define LOG_SERVER_TRACE_C LOG(TRACE) << SERVER_MODULE_CLASS_FUNCTION #define LOG_SERVER_DEBUG_C LOG(DEBUG) << SERVER_MODULE_CLASS_FUNCTION @@ -38,9 +40,11 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #define ENGINE_MODULE_NAME "ENGINE" -#define ENGINE_MODULE_CLASS_FUNCTION \ - LogOut("[%s][%s::%s][%s] ", ENGINE_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, GetThreadName().c_str()) -#define ENGINE_MODULE_FUNCTION LogOut("[%s][%s][%s] ", ENGINE_MODULE_NAME, __FUNCTION__, GetThreadName().c_str()) +#define ENGINE_MODULE_CLASS_FUNCTION \ + LogOut("[%s][%s::%s][%s] ", ENGINE_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, \ + milvus::knowhere::GetThreadName().c_str()) +#define ENGINE_MODULE_FUNCTION \ + LogOut("[%s][%s][%s] ", ENGINE_MODULE_NAME, __FUNCTION__, milvus::knowhere::GetThreadName().c_str()) #define LOG_ENGINE_TRACE_C LOG(TRACE) << ENGINE_MODULE_CLASS_FUNCTION #define LOG_ENGINE_DEBUG_C LOG(DEBUG) << ENGINE_MODULE_CLASS_FUNCTION @@ -58,9 +62,11 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #define WRAPPER_MODULE_NAME "WRAPPER" -#define WRAPPER_MODULE_CLASS_FUNCTION \ - LogOut("[%s][%s::%s][%s] ", WRAPPER_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, GetThreadName().c_str()) -#define WRAPPER_MODULE_FUNCTION LogOut("[%s][%s][%s] ", WRAPPER_MODULE_NAME, __FUNCTION__, GetThreadName().c_str()) +#define WRAPPER_MODULE_CLASS_FUNCTION \ + LogOut("[%s][%s::%s][%s] ", WRAPPER_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, \ + milvus::knowhere::GetThreadName().c_str()) +#define WRAPPER_MODULE_FUNCTION \ + LogOut("[%s][%s][%s] ", WRAPPER_MODULE_NAME, __FUNCTION__, milvus::knowhere::GetThreadName().c_str()) #define LOG_WRAPPER_TRACE_C LOG(TRACE) << WRAPPER_MODULE_CLASS_FUNCTION #define LOG_WRAPPER_DEBUG_C LOG(DEBUG) << WRAPPER_MODULE_CLASS_FUNCTION @@ -78,9 +84,11 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #define STORAGE_MODULE_NAME "STORAGE" -#define STORAGE_MODULE_CLASS_FUNCTION \ - LogOut("[%s][%s::%s][%s] ", STORAGE_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, GetThreadName().c_str()) -#define STORAGE_MODULE_FUNCTION LogOut("[%s][%s][%s] ", STORAGE_MODULE_NAME, __FUNCTION__, GetThreadName().c_str()) +#define STORAGE_MODULE_CLASS_FUNCTION \ + LogOut("[%s][%s::%s][%s] ", STORAGE_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, \ + milvus::knowhere::GetThreadName().c_str()) +#define STORAGE_MODULE_FUNCTION \ + LogOut("[%s][%s][%s] ", STORAGE_MODULE_NAME, __FUNCTION__, milvus::knowhere::GetThreadName().c_str()) #define LOG_STORAGE_TRACE_C LOG(TRACE) << STORAGE_MODULE_CLASS_FUNCTION #define LOG_STORAGE_DEBUG_C LOG(DEBUG) << STORAGE_MODULE_CLASS_FUNCTION @@ -98,9 +106,11 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #define WAL_MODULE_NAME "WAL" -#define WAL_MODULE_CLASS_FUNCTION \ - LogOut("[%s][%s::%s][%s] ", WAL_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, GetThreadName().c_str()) -#define WAL_MODULE_FUNCTION LogOut("[%s][%s][%s] ", WAL_MODULE_NAME, __FUNCTION__, GetThreadName().c_str()) +#define WAL_MODULE_CLASS_FUNCTION \ + LogOut("[%s][%s::%s][%s] ", WAL_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, \ + milvus::knowhere::GetThreadName().c_str()) +#define WAL_MODULE_FUNCTION \ + LogOut("[%s][%s][%s] ", WAL_MODULE_NAME, __FUNCTION__, milvus::knowhere::GetThreadName().c_str()) #define LOG_WAL_TRACE_C LOG(TRACE) << WAL_MODULE_CLASS_FUNCTION #define LOG_WAL_DEBUG_C LOG(DEBUG) << WAL_MODULE_CLASS_FUNCTION diff --git a/internal/core/src/index/knowhere/utils/Log.h b/internal/core/src/index/knowhere/utils/Log.h deleted file mode 100644 index f2a25d7de1..0000000000 --- a/internal/core/src/index/knowhere/utils/Log.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (C) 2019-2020 Zilliz. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software distributed under the License -// is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -// or implied. See the License for the specific language governing permissions and limitations under the License. - -#pragma once - -#include "log/Log.h" diff --git a/internal/core/src/log/Log.h b/internal/core/src/log/Log.h index 3eba82631e..93b2f27bfa 100644 --- a/internal/core/src/log/Log.h +++ b/internal/core/src/log/Log.h @@ -79,26 +79,6 @@ #define LOG_SEGCORE_ERROR_ LOG(ERROR) << SEGCORE_MODULE_FUNCTION #define LOG_SEGCORE_FATAL_ LOG(FATAL) << SEGCORE_MODULE_FUNCTION -///////////////////////////////////////////////////////////////////////////////////////////////// -#define KNOWHERE_MODULE_NAME "KNOWHERE" -#define KNOWHERE_MODULE_CLASS_FUNCTION \ - LogOut("[%s][%s::%s][%s] ", KNOWHERE_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, GetThreadName().c_str()) -#define KNOWHERE_MODULE_FUNCTION LogOut("[%s][%s][%s] ", KNOWHERE_MODULE_NAME, __FUNCTION__, GetThreadName().c_str()) - -#define LOG_KNOWHERE_TRACE_C LOG(TRACE) << KNOWHERE_MODULE_CLASS_FUNCTION -#define LOG_KNOWHERE_DEBUG_C LOG(DEBUG) << KNOWHERE_MODULE_CLASS_FUNCTION -#define LOG_KNOWHERE_INFO_C LOG(INFO) << KNOWHERE_MODULE_CLASS_FUNCTION -#define LOG_KNOWHERE_WARNING_C LOG(WARNING) << KNOWHERE_MODULE_CLASS_FUNCTION -#define LOG_KNOWHERE_ERROR_C LOG(ERROR) << KNOWHERE_MODULE_CLASS_FUNCTION -#define LOG_KNOWHERE_FATAL_C LOG(FATAL) << KNOWHERE_MODULE_CLASS_FUNCTION - -#define LOG_KNOWHERE_TRACE_ LOG(TRACE) << KNOWHERE_MODULE_FUNCTION -#define LOG_KNOWHERE_DEBUG_ LOG(DEBUG) << KNOWHERE_MODULE_FUNCTION -#define LOG_KNOWHERE_INFO_ LOG(INFO) << KNOWHERE_MODULE_FUNCTION -#define LOG_KNOWHERE_WARNING_ LOG(WARNING) << KNOWHERE_MODULE_FUNCTION -#define LOG_KNOWHERE_ERROR_ LOG(ERROR) << KNOWHERE_MODULE_FUNCTION -#define LOG_KNOWHERE_FATAL_ LOG(FATAL) << KNOWHERE_MODULE_FUNCTION - ///////////////////////////////////////////////////////////////////////////////////////////////// #define SERVER_MODULE_NAME "SERVER" #define SERVER_MODULE_CLASS_FUNCTION \