diff --git a/internal/core/src/index/knowhere/knowhere/archive/KnowhereConfig.cpp b/internal/core/src/index/knowhere/knowhere/archive/KnowhereConfig.cpp index 157817f136..8d310e3382 100644 --- a/internal/core/src/index/knowhere/knowhere/archive/KnowhereConfig.cpp +++ b/internal/core/src/index/knowhere/knowhere/archive/KnowhereConfig.cpp @@ -59,7 +59,7 @@ KnowhereConfig::SetSimdType(const SimdType simd_type) { std::string cpu_flag; if (faiss::hook_init(cpu_flag)) { std::cout << "FAISS hook " << cpu_flag << std::endl; - LOG_ENGINE_DEBUG_ << "FAISS hook " << cpu_flag; + LOG_KNOWHERE_DEBUG_ << "FAISS hook " << cpu_flag; return Status::OK(); } diff --git a/internal/core/src/log/DeprecatedLog.h b/internal/core/src/log/DeprecatedLog.h deleted file mode 100644 index e6080caac3..0000000000 --- a/internal/core/src/log/DeprecatedLog.h +++ /dev/null @@ -1,119 +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 - -/* - * Please use LOG_MODULE_LEVEL_C macro in member function of class - * and LOG_MODULE_LEVEL_ macro in other functions. - */ - -///////////////////////////////////////////////////////////////////////////////////////////////// -#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 LOG_SERVER_TRACE_C LOG(TRACE) << SERVER_MODULE_CLASS_FUNCTION -#define LOG_SERVER_DEBUG_C LOG(DEBUG) << SERVER_MODULE_CLASS_FUNCTION -#define LOG_SERVER_INFO_C LOG(INFO) << SERVER_MODULE_CLASS_FUNCTION -#define LOG_SERVER_WARNING_C LOG(WARNING) << SERVER_MODULE_CLASS_FUNCTION -#define LOG_SERVER_ERROR_C LOG(ERROR) << SERVER_MODULE_CLASS_FUNCTION -#define LOG_SERVER_FATAL_C LOG(FATAL) << SERVER_MODULE_CLASS_FUNCTION - -#define LOG_SERVER_TRACE_ LOG(TRACE) << SERVER_MODULE_FUNCTION -#define LOG_SERVER_DEBUG_ LOG(DEBUG) << SERVER_MODULE_FUNCTION -#define LOG_SERVER_INFO_ LOG(INFO) << SERVER_MODULE_FUNCTION -#define LOG_SERVER_WARNING_ LOG(WARNING) << SERVER_MODULE_FUNCTION -#define LOG_SERVER_ERROR_ LOG(ERROR) << SERVER_MODULE_FUNCTION -#define LOG_SERVER_FATAL_ LOG(FATAL) << SERVER_MODULE_FUNCTION - -///////////////////////////////////////////////////////////////////////////////////////////////// -#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 LOG_ENGINE_TRACE_C LOG(TRACE) << ENGINE_MODULE_CLASS_FUNCTION -#define LOG_ENGINE_DEBUG_C LOG(DEBUG) << ENGINE_MODULE_CLASS_FUNCTION -#define LOG_ENGINE_INFO_C LOG(INFO) << ENGINE_MODULE_CLASS_FUNCTION -#define LOG_ENGINE_WARNING_C LOG(WARNING) << ENGINE_MODULE_CLASS_FUNCTION -#define LOG_ENGINE_ERROR_C LOG(ERROR) << ENGINE_MODULE_CLASS_FUNCTION -#define LOG_ENGINE_FATAL_C LOG(FATAL) << ENGINE_MODULE_CLASS_FUNCTION - -#define LOG_ENGINE_TRACE_ LOG(TRACE) << ENGINE_MODULE_FUNCTION -#define LOG_ENGINE_DEBUG_ LOG(DEBUG) << ENGINE_MODULE_FUNCTION -#define LOG_ENGINE_INFO_ LOG(INFO) << ENGINE_MODULE_FUNCTION -#define LOG_ENGINE_WARNING_ LOG(WARNING) << ENGINE_MODULE_FUNCTION -#define LOG_ENGINE_ERROR_ LOG(ERROR) << ENGINE_MODULE_FUNCTION -#define LOG_ENGINE_FATAL_ LOG(FATAL) << ENGINE_MODULE_FUNCTION - -///////////////////////////////////////////////////////////////////////////////////////////////// -#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 LOG_WRAPPER_TRACE_C LOG(TRACE) << WRAPPER_MODULE_CLASS_FUNCTION -#define LOG_WRAPPER_DEBUG_C LOG(DEBUG) << WRAPPER_MODULE_CLASS_FUNCTION -#define LOG_WRAPPER_INFO_C LOG(INFO) << WRAPPER_MODULE_CLASS_FUNCTION -#define LOG_WRAPPER_WARNING_C LOG(WARNING) << WRAPPER_MODULE_CLASS_FUNCTION -#define LOG_WRAPPER_ERROR_C LOG(ERROR) << WRAPPER_MODULE_CLASS_FUNCTION -#define LOG_WRAPPER_FATAL_C LOG(FATAL) << WRAPPER_MODULE_CLASS_FUNCTION - -#define LOG_WRAPPER_TRACE_ LOG(TRACE) << WRAPPER_MODULE_FUNCTION -#define LOG_WRAPPER_DEBUG_ LOG(DEBUG) << WRAPPER_MODULE_FUNCTION -#define LOG_WRAPPER_INFO_ LOG(INFO) << WRAPPER_MODULE_FUNCTION -#define LOG_WRAPPER_WARNING_ LOG(WARNING) << WRAPPER_MODULE_FUNCTION -#define LOG_WRAPPER_ERROR_ LOG(ERROR) << WRAPPER_MODULE_FUNCTION -#define LOG_WRAPPER_FATAL_ LOG(FATAL) << WRAPPER_MODULE_FUNCTION - -///////////////////////////////////////////////////////////////////////////////////////////////// -#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 LOG_STORAGE_TRACE_C LOG(TRACE) << STORAGE_MODULE_CLASS_FUNCTION -#define LOG_STORAGE_DEBUG_C LOG(DEBUG) << STORAGE_MODULE_CLASS_FUNCTION -#define LOG_STORAGE_INFO_C LOG(INFO) << STORAGE_MODULE_CLASS_FUNCTION -#define LOG_STORAGE_WARNING_C LOG(WARNING) << STORAGE_MODULE_CLASS_FUNCTION -#define LOG_STORAGE_ERROR_C LOG(ERROR) << STORAGE_MODULE_CLASS_FUNCTION -#define LOG_STORAGE_FATAL_C LOG(FATAL) << STORAGE_MODULE_CLASS_FUNCTION - -#define LOG_STORAGE_TRACE_ LOG(TRACE) << STORAGE_MODULE_FUNCTION -#define LOG_STORAGE_DEBUG_ LOG(DEBUG) << STORAGE_MODULE_FUNCTION -#define LOG_STORAGE_INFO_ LOG(INFO) << STORAGE_MODULE_FUNCTION -#define LOG_STORAGE_WARNING_ LOG(WARNING) << STORAGE_MODULE_FUNCTION -#define LOG_STORAGE_ERROR_ LOG(ERROR) << STORAGE_MODULE_FUNCTION -#define LOG_STORAGE_FATAL_ LOG(FATAL) << STORAGE_MODULE_FUNCTION - -///////////////////////////////////////////////////////////////////////////////////////////////// -#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 LOG_WAL_TRACE_C LOG(TRACE) << WAL_MODULE_CLASS_FUNCTION -#define LOG_WAL_DEBUG_C LOG(DEBUG) << WAL_MODULE_CLASS_FUNCTION -#define LOG_WAL_INFO_C LOG(INFO) << WAL_MODULE_CLASS_FUNCTION -#define LOG_WAL_WARNING_C LOG(WARNING) << WAL_MODULE_CLASS_FUNCTION -#define LOG_WAL_ERROR_C LOG(ERROR) << WAL_MODULE_CLASS_FUNCTION -#define LOG_WAL_FATAL_C LOG(FATAL) << WAL_MODULE_CLASS_FUNCTION - -#define LOG_WAL_TRACE_ LOG(TRACE) << WAL_MODULE_FUNCTION -#define LOG_WAL_DEBUG_ LOG(DEBUG) << WAL_MODULE_FUNCTION -#define LOG_WAL_INFO_ LOG(INFO) << WAL_MODULE_FUNCTION -#define LOG_WAL_WARNING_ LOG(WARNING) << WAL_MODULE_FUNCTION -#define LOG_WAL_ERROR_ LOG(ERROR) << WAL_MODULE_FUNCTION -#define LOG_WAL_FATAL_ LOG(FATAL) << WAL_MODULE_FUNCTION - -///////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/internal/core/src/log/Log.h b/internal/core/src/log/Log.h index dcc5feb697..e8e1f5d63b 100644 --- a/internal/core/src/log/Log.h +++ b/internal/core/src/log/Log.h @@ -12,13 +12,10 @@ #pragma once #include - #include #include #include "easyloggingpp/easylogging++.h" -#include "log/DeprecatedLog.h" - namespace milvus { #if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30 @@ -62,6 +59,68 @@ namespace milvus { << "" \ << " | " << #module << " | " << error_code << " | " +///////////////////////////////////////////////////////////////////////////////////////////////// +#define SEGCORE_MODULE_NAME "SEGCORE" +#define SEGCORE_MODULE_CLASS_FUNCTION \ + LogOut("[%s][%s::%s][%s] ", SEGCORE_MODULE_NAME, (typeid(*this).name()), __FUNCTION__, GetThreadName().c_str()) +#define SEGCORE_MODULE_FUNCTION LogOut("[%s][%s][%s] ", SEGCORE_MODULE_NAME, __FUNCTION__, GetThreadName().c_str()) + +#define LOG_SEGCORE_TRACE_C LOG(TRACE) << SEGCORE_MODULE_CLASS_FUNCTION +#define LOG_SEGCORE_DEBUG_C LOG(DEBUG) << SEGCORE_MODULE_CLASS_FUNCTION +#define LOG_SEGCORE_INFO_C LOG(INFO) << SEGCORE_MODULE_CLASS_FUNCTION +#define LOG_SEGCORE_WARNING_C LOG(WARNING) << SEGCORE_MODULE_CLASS_FUNCTION +#define LOG_SEGCORE_ERROR_C LOG(ERROR) << SEGCORE_MODULE_CLASS_FUNCTION +#define LOG_SEGCORE_FATAL_C LOG(FATAL) << SEGCORE_MODULE_CLASS_FUNCTION + +#define LOG_SEGCORE_TRACE_ LOG(TRACE) << SEGCORE_MODULE_FUNCTION +#define LOG_SEGCORE_DEBUG_ LOG(DEBUG) << SEGCORE_MODULE_FUNCTION +#define LOG_SEGCORE_INFO_ LOG(INFO) << SEGCORE_MODULE_FUNCTION +#define LOG_SEGCORE_WARNING_ LOG(WARNING) << SEGCORE_MODULE_FUNCTION +#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 \ + 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 LOG_SERVER_TRACE_C LOG(TRACE) << SERVER_MODULE_CLASS_FUNCTION +#define LOG_SERVER_DEBUG_C LOG(DEBUG) << SERVER_MODULE_CLASS_FUNCTION +#define LOG_SERVER_INFO_C LOG(INFO) << SERVER_MODULE_CLASS_FUNCTION +#define LOG_SERVER_WARNING_C LOG(WARNING) << SERVER_MODULE_CLASS_FUNCTION +#define LOG_SERVER_ERROR_C LOG(ERROR) << SERVER_MODULE_CLASS_FUNCTION +#define LOG_SERVER_FATAL_C LOG(FATAL) << SERVER_MODULE_CLASS_FUNCTION + +#define LOG_SERVER_TRACE_ LOG(TRACE) << SERVER_MODULE_FUNCTION +#define LOG_SERVER_DEBUG_ LOG(DEBUG) << SERVER_MODULE_FUNCTION +#define LOG_SERVER_INFO_ LOG(INFO) << SERVER_MODULE_FUNCTION +#define LOG_SERVER_WARNING_ LOG(WARNING) << SERVER_MODULE_FUNCTION +#define LOG_SERVER_ERROR_ LOG(ERROR) << SERVER_MODULE_FUNCTION +#define LOG_SERVER_FATAL_ LOG(FATAL) << SERVER_MODULE_FUNCTION + +///////////////////////////////////////////////////////////////////////////////////////////////// + std::string LogOut(const char* pattern, ...); diff --git a/internal/core/src/segcore/segcore_init_c.cpp b/internal/core/src/segcore/segcore_init_c.cpp index 79d2d9b620..7ab7e68624 100644 --- a/internal/core/src/segcore/segcore_init_c.cpp +++ b/internal/core/src/segcore/segcore_init_c.cpp @@ -29,7 +29,6 @@ SegcoreInitImpl() { el::Configurations el_conf; el_conf.setGlobally(el::ConfigurationType::Enabled, std::to_string(false)); } -} // namespace milvus::segcore extern "C" void SegcoreInit() { @@ -40,7 +39,7 @@ extern "C" void SegcoreSetChunkRows(const int64_t value) { milvus::segcore::SegcoreConfig& config = milvus::segcore::SegcoreConfig::default_config(); config.set_chunk_rows(value); - std::cout << "set config chunk_size: " << config.get_chunk_rows() << std::endl; + LOG_SEGCORE_DEBUG_ << "set config chunk_size: " << config.get_chunk_rows(); } extern "C" void @@ -58,5 +57,7 @@ SegcoreSetSimdType(const char* value) { PanicInfo("invalid SIMD type: " + std::string(value)); } milvus::engine::KnowhereConfig::SetSimdType(simd_type); - std::cout << "set config simd_type: " << int(simd_type) << std::endl; + LOG_SEGCORE_DEBUG_ << "set config simd_type: " << int(simd_type); } + +} // namespace milvus::segcore