From 9ff5db33db3f14f455619fd9eb36f3384350ead2 Mon Sep 17 00:00:00 2001 From: ZeFeng Yin Date: Wed, 5 Aug 2026 10:51:18 +0800 Subject: [PATCH] refactor: remove redundant IndexLogger (#652) --- .../algorithm/diskann/diskann_file_reader.cc | 2 +- .../flat_sparse/flat_sparse_builder.cc | 4 +- .../flat_sparse/flat_sparse_provider.h | 2 +- .../flat_sparse_searcher_entity.cc | 4 +- .../flat_sparse_streamer_entity.cc | 2 +- src/core/algorithm/hnsw/hnsw_chunk.cc | 2 +- src/core/algorithm/hnsw/hnsw_chunk.h | 2 +- .../hnsw_rabitq/hnsw_rabitq_chunk.cc | 2 +- .../algorithm/hnsw_rabitq/hnsw_rabitq_chunk.h | 2 +- .../algorithm/hnsw_rabitq/rabitq_utils.cc | 2 +- .../hnsw_sparse/hnsw_sparse_builder.cc | 4 +- .../hnsw_sparse/hnsw_sparse_chunk.cc | 2 +- .../algorithm/hnsw_sparse/hnsw_sparse_chunk.h | 2 +- src/core/framework/index_factory.cc | 17 -- src/core/framework/index_logger.cc | 72 -------- src/core/framework/index_mapping.cc | 2 +- src/core/interface/indexes/holder_builder.h | 2 +- .../mixed_reducer/mixed_streamer_reducer.cc | 2 +- src/core/quantizer/rotator/rotator.cc | 2 +- src/core/utility/sparse_utility.h | 2 +- src/core/utility/visit_filter.h | 2 +- src/db/index/storage/parquet_buffer_pool.cc | 2 +- .../zvec/core/framework/index_factory.h | 19 +- .../zvec/core/framework/index_logger.h | 169 ------------------ .../zvec/core/framework/index_unpacker.h | 2 +- .../fp32_quantizer/fp32_quantizer.cc | 2 +- tests/ailego/logger/logger_test.cc | 4 +- .../flat_sparse/flat_sparse_searcher_test.cc | 5 +- .../flat_sparse/flat_sparse_streamer_test.cc | 5 +- tools/core/bench.cc | 11 +- tools/core/bench_original.cc | 11 +- tools/core/local_builder.cc | 12 +- tools/core/local_builder_original.cc | 13 +- tools/core/recall.cc | 11 +- tools/core/recall_original.cc | 11 +- 35 files changed, 67 insertions(+), 343 deletions(-) delete mode 100644 src/core/framework/index_logger.cc delete mode 100644 src/include/zvec/core/framework/index_logger.h diff --git a/src/core/algorithm/diskann/diskann_file_reader.cc b/src/core/algorithm/diskann/diskann_file_reader.cc index cde0755..055470b 100644 --- a/src/core/algorithm/diskann/diskann_file_reader.cc +++ b/src/core/algorithm/diskann/diskann_file_reader.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #define MAX_EVENTS 1024 diff --git a/src/core/algorithm/flat_sparse/flat_sparse_builder.cc b/src/core/algorithm/flat_sparse/flat_sparse_builder.cc index 34fcda5..0a30ac8 100644 --- a/src/core/algorithm/flat_sparse/flat_sparse_builder.cc +++ b/src/core/algorithm/flat_sparse/flat_sparse_builder.cc @@ -17,9 +17,9 @@ #include #include #include +#include #include #include -#include #include "flat_sparse_index_format.h" #include "flat_sparse_utility.h" @@ -335,4 +335,4 @@ int FlatSparseBuilder::dump_mapping(const std::vector &keys, INDEX_FACTORY_REGISTER_BUILDER(FlatSparseBuilder); } // namespace core -} // namespace zvec \ No newline at end of file +} // namespace zvec diff --git a/src/core/algorithm/flat_sparse/flat_sparse_provider.h b/src/core/algorithm/flat_sparse/flat_sparse_provider.h index 8065b5f..5883c5e 100644 --- a/src/core/algorithm/flat_sparse/flat_sparse_provider.h +++ b/src/core/algorithm/flat_sparse/flat_sparse_provider.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "flat_sparse_streamer_entity.h" diff --git a/src/core/algorithm/flat_sparse/flat_sparse_searcher_entity.cc b/src/core/algorithm/flat_sparse/flat_sparse_searcher_entity.cc index 91357a5..5c57698 100644 --- a/src/core/algorithm/flat_sparse/flat_sparse_searcher_entity.cc +++ b/src/core/algorithm/flat_sparse/flat_sparse_searcher_entity.cc @@ -13,8 +13,8 @@ // limitations under the License. #include "flat_sparse_searcher_entity.h" +#include #include -#include #include "flat_sparse_utility.h" namespace zvec { @@ -238,4 +238,4 @@ uint64_t FlatSparseSearcherEntity::get_key(node_id_t id) const { } } // namespace core -} // namespace zvec \ No newline at end of file +} // namespace zvec diff --git a/src/core/algorithm/flat_sparse/flat_sparse_streamer_entity.cc b/src/core/algorithm/flat_sparse/flat_sparse_streamer_entity.cc index 1930d43..257b98f 100644 --- a/src/core/algorithm/flat_sparse/flat_sparse_streamer_entity.cc +++ b/src/core/algorithm/flat_sparse/flat_sparse_streamer_entity.cc @@ -19,9 +19,9 @@ #include #include #include +#include #include #include -#include #include "flat_sparse_index_format.h" #include "flat_sparse_utility.h" diff --git a/src/core/algorithm/hnsw/hnsw_chunk.cc b/src/core/algorithm/hnsw/hnsw_chunk.cc index 2d1ea24..9454957 100644 --- a/src/core/algorithm/hnsw/hnsw_chunk.cc +++ b/src/core/algorithm/hnsw/hnsw_chunk.cc @@ -15,10 +15,10 @@ #include #include #include +#include #include #include #include -#include #include namespace zvec { diff --git a/src/core/algorithm/hnsw/hnsw_chunk.h b/src/core/algorithm/hnsw/hnsw_chunk.h index 034a2dc..bcea6c1 100644 --- a/src/core/algorithm/hnsw/hnsw_chunk.h +++ b/src/core/algorithm/hnsw/hnsw_chunk.h @@ -20,9 +20,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/src/core/algorithm/hnsw_rabitq/hnsw_rabitq_chunk.cc b/src/core/algorithm/hnsw_rabitq/hnsw_rabitq_chunk.cc index 8833a61..eebf3d9 100644 --- a/src/core/algorithm/hnsw_rabitq/hnsw_rabitq_chunk.cc +++ b/src/core/algorithm/hnsw_rabitq/hnsw_rabitq_chunk.cc @@ -16,9 +16,9 @@ #include #include #include +#include "zvec/ailego/logger/logger.h" #include "zvec/core/framework/index_error.h" #include "zvec/core/framework/index_helper.h" -#include "zvec/core/framework/index_logger.h" #include "zvec/core/framework/index_streamer.h" namespace zvec { diff --git a/src/core/algorithm/hnsw_rabitq/hnsw_rabitq_chunk.h b/src/core/algorithm/hnsw_rabitq/hnsw_rabitq_chunk.h index f0bc339..6458dff 100644 --- a/src/core/algorithm/hnsw_rabitq/hnsw_rabitq_chunk.h +++ b/src/core/algorithm/hnsw_rabitq/hnsw_rabitq_chunk.h @@ -22,8 +22,8 @@ #include #include #include +#include "zvec/ailego/logger/logger.h" #include "zvec/core/framework/index_error.h" -#include "zvec/core/framework/index_logger.h" #include "zvec/core/framework/index_storage.h" #include "zvec/core/framework/index_streamer.h" diff --git a/src/core/algorithm/hnsw_rabitq/rabitq_utils.cc b/src/core/algorithm/hnsw_rabitq/rabitq_utils.cc index 9945ad7..61d4278 100644 --- a/src/core/algorithm/hnsw_rabitq/rabitq_utils.cc +++ b/src/core/algorithm/hnsw_rabitq/rabitq_utils.cc @@ -15,8 +15,8 @@ #include "rabitq_utils.h" #include #include +#include "zvec/ailego/logger/logger.h" #include "zvec/core/framework/index_error.h" -#include "zvec/core/framework/index_logger.h" namespace zvec { namespace core { diff --git a/src/core/algorithm/hnsw_sparse/hnsw_sparse_builder.cc b/src/core/algorithm/hnsw_sparse/hnsw_sparse_builder.cc index 4ca8f89..575ac81 100644 --- a/src/core/algorithm/hnsw_sparse/hnsw_sparse_builder.cc +++ b/src/core/algorithm/hnsw_sparse/hnsw_sparse_builder.cc @@ -15,9 +15,9 @@ #include #include #include +#include #include #include -#include #include "hnsw_sparse_algorithm.h" #include "hnsw_sparse_params.h" @@ -525,4 +525,4 @@ int HnswSparseBuilder::build(IndexThreads::Pointer threads, INDEX_FACTORY_REGISTER_BUILDER(HnswSparseBuilder); } // namespace core -} // namespace zvec \ No newline at end of file +} // namespace zvec diff --git a/src/core/algorithm/hnsw_sparse/hnsw_sparse_chunk.cc b/src/core/algorithm/hnsw_sparse/hnsw_sparse_chunk.cc index b3e6f49..09fdd94 100644 --- a/src/core/algorithm/hnsw_sparse/hnsw_sparse_chunk.cc +++ b/src/core/algorithm/hnsw_sparse/hnsw_sparse_chunk.cc @@ -15,10 +15,10 @@ #include #include #include +#include #include #include #include -#include #include namespace zvec { diff --git a/src/core/algorithm/hnsw_sparse/hnsw_sparse_chunk.h b/src/core/algorithm/hnsw_sparse/hnsw_sparse_chunk.h index 88000ce..785c8e8 100644 --- a/src/core/algorithm/hnsw_sparse/hnsw_sparse_chunk.h +++ b/src/core/algorithm/hnsw_sparse/hnsw_sparse_chunk.h @@ -20,9 +20,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/src/core/framework/index_factory.cc b/src/core/framework/index_factory.cc index d26192e..6fe67ae 100644 --- a/src/core/framework/index_factory.cc +++ b/src/core/framework/index_factory.cc @@ -35,23 +35,6 @@ std::vector IndexFactory::AllMetrics(void) { return ailego::Factory::Classes(); } -IndexLogger::Pointer IndexFactory::CreateLogger(const std::string &name) { - IndexLogger::Pointer obj = - ailego::Factory::MakeShared(name.c_str()); - if (obj) { - obj->set_name(name); - } - return obj; -} - -bool IndexFactory::HasLogger(const std::string &name) { - return ailego::Factory::Has(name.c_str()); -} - -std::vector IndexFactory::AllLoggers(void) { - return ailego::Factory::Classes(); -} - IndexDumper::Pointer IndexFactory::CreateDumper(const std::string &name) { IndexDumper::Pointer obj = ailego::Factory::MakeShared(name.c_str()); diff --git a/src/core/framework/index_logger.cc b/src/core/framework/index_logger.cc deleted file mode 100644 index 4ab6e2e..0000000 --- a/src/core/framework/index_logger.cc +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright 2025-present the zvec project -// -// 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. -#include -#include -#include -#include -#include -#include - -namespace zvec { -namespace core { - -const int IndexLogger::LEVEL_DEBUG = 0; -const int IndexLogger::LEVEL_INFO = 1; -const int IndexLogger::LEVEL_WARN = 2; -const int IndexLogger::LEVEL_ERROR = 3; -const int IndexLogger::LEVEL_FATAL = 4; - -/*! Console Logger - */ -struct ConsoleLogger : public IndexLogger { - //! Initialize Logger - int init(const zvec::ailego::Params &) override { - return 0; - } - - //! Cleanup Logger - int cleanup(void) override { - return 0; - } - - //! Log Message - void log(int level, const char *file, int line, const char *format, - va_list args) override { - char buffer[8192]; - std::ostringstream stream; - - ailego::Realtime::Localtime(buffer, sizeof(buffer)); - stream << '[' << LevelString(level) << ' ' << buffer << ' ' - << std::this_thread::get_id() << ' ' << ailego::File::BaseName(file) - << ':' << line << "] "; - - vsnprintf(buffer, sizeof(buffer), format, args); - stream << buffer << '\n'; - - if (level <= LEVEL_INFO) { - std::cout << stream.str() << std::flush; - } else { - std::cerr << stream.str() << std::flush; - } - } -}; - -//! Logger Level -int IndexLoggerBroker::logger_level_ = 0; - -//! Logger -IndexLogger::Pointer IndexLoggerBroker::logger_(new ConsoleLogger); - -} // namespace core -} // namespace zvec \ No newline at end of file diff --git a/src/core/framework/index_mapping.cc b/src/core/framework/index_mapping.cc index 7f5f5a1..2719d66 100644 --- a/src/core/framework/index_mapping.cc +++ b/src/core/framework/index_mapping.cc @@ -13,9 +13,9 @@ // limitations under the License. #include +#include #include #include -#include #include #include "ailego/utility/memory_helper.h" diff --git a/src/core/interface/indexes/holder_builder.h b/src/core/interface/indexes/holder_builder.h index 0714c2c..83021ad 100644 --- a/src/core/interface/indexes/holder_builder.h +++ b/src/core/interface/indexes/holder_builder.h @@ -20,10 +20,10 @@ #include #include #include +#include #include #include #include -#include #include namespace zvec::core_interface { diff --git a/src/core/mixed_reducer/mixed_streamer_reducer.cc b/src/core/mixed_reducer/mixed_streamer_reducer.cc index 6d8b31c..ffb0dcc 100644 --- a/src/core/mixed_reducer/mixed_streamer_reducer.cc +++ b/src/core/mixed_reducer/mixed_streamer_reducer.cc @@ -14,13 +14,13 @@ #include "mixed_streamer_reducer.h" #include #include +#include #include #include #include #include #include #include -#include #include "mixed_reducer/mixed_reducer_params.h" namespace zvec { diff --git a/src/core/quantizer/rotator/rotator.cc b/src/core/quantizer/rotator/rotator.cc index f78d1bf..bfd4778 100644 --- a/src/core/quantizer/rotator/rotator.cc +++ b/src/core/quantizer/rotator/rotator.cc @@ -16,8 +16,8 @@ #include #include #include +#include "zvec/ailego/logger/logger.h" #include "zvec/core/framework/index_error.h" -#include "zvec/core/framework/index_logger.h" #include "fht_rotator.h" #include "matrix_rotator.h" diff --git a/src/core/utility/sparse_utility.h b/src/core/utility/sparse_utility.h index d99b8d8..4495a48 100644 --- a/src/core/utility/sparse_utility.h +++ b/src/core/utility/sparse_utility.h @@ -17,8 +17,8 @@ #include #include #include +#include #include -#include #include namespace zvec { diff --git a/src/core/utility/visit_filter.h b/src/core/utility/visit_filter.h index 959a0b4..8874a94 100644 --- a/src/core/utility/visit_filter.h +++ b/src/core/utility/visit_filter.h @@ -23,8 +23,8 @@ #include #include #include +#include #include -#include namespace zvec { namespace core { diff --git a/src/db/index/storage/parquet_buffer_pool.cc b/src/db/index/storage/parquet_buffer_pool.cc index 03e454a..48879bc 100644 --- a/src/db/index/storage/parquet_buffer_pool.cc +++ b/src/db/index/storage/parquet_buffer_pool.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace zvec { diff --git a/src/include/zvec/core/framework/index_factory.h b/src/include/zvec/core/framework/index_factory.h index 1c9e287..3fd5a48 100644 --- a/src/include/zvec/core/framework/index_factory.h +++ b/src/include/zvec/core/framework/index_factory.h @@ -14,12 +14,12 @@ #pragma once +#include #include #include #include #include #include -#include #include #include #include @@ -50,15 +50,6 @@ struct IndexFactory { //! Retrieve all Metric classes static std::vector AllMetrics(void); - //! Create a index logger by name - static IndexLogger::Pointer CreateLogger(const std::string &name); - - //! Test if the logger is exist - static bool HasLogger(const std::string &name); - - //! Retrieve all logger classes - static std::vector AllLoggers(void); - //! Create a index dumper by name static IndexDumper::Pointer CreateDumper(const std::string &name); @@ -193,14 +184,6 @@ struct IndexFactory { #define INDEX_FACTORY_REGISTER_METRIC(__IMPL__, ...) \ INDEX_FACTORY_REGISTER_METRIC_ALIAS(__IMPL__, __IMPL__, ##__VA_ARGS__) -//! Register Index Logger -#define INDEX_FACTORY_REGISTER_LOGGER_ALIAS(__NAME__, __IMPL__, ...) \ - AILEGO_FACTORY_REGISTER(__NAME__, IndexLogger, __IMPL__, ##__VA_ARGS__) - -//! Register Index Logger -#define INDEX_FACTORY_REGISTER_LOGGER(__IMPL__, ...) \ - INDEX_FACTORY_REGISTER_LOGGER_ALIAS(__IMPL__, __IMPL__, ##__VA_ARGS__) - //! Register Index Dumper #define INDEX_FACTORY_REGISTER_DUMPER_ALIAS(__NAME__, __IMPL__, ...) \ AILEGO_FACTORY_REGISTER(__NAME__, IndexDumper, __IMPL__, ##__VA_ARGS__) diff --git a/src/include/zvec/core/framework/index_logger.h b/src/include/zvec/core/framework/index_logger.h deleted file mode 100644 index 67f7779..0000000 --- a/src/include/zvec/core/framework/index_logger.h +++ /dev/null @@ -1,169 +0,0 @@ -// Copyright 2025-present the zvec project -// -// 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 -#include -#include -#include -#include "index_module.h" - -#define ZVEC_LOG_IMPL(level, format, ...) \ - do { \ - if (zvec::core::IndexLoggerBroker::IsLevelEnabled(level)) { \ - zvec::core::IndexLoggerBroker::Log(level, __FILE__, __LINE__, format, \ - ##__VA_ARGS__); \ - } \ - } while (0) - -//! Log Debug Message -#ifndef LOG_DEBUG -#define LOG_DEBUG(format, ...) \ - ZVEC_LOG_IMPL(zvec::core::IndexLogger::LEVEL_DEBUG, format, ##__VA_ARGS__) -#endif - -//! Log Information Message -#ifndef LOG_INFO -#define LOG_INFO(format, ...) \ - ZVEC_LOG_IMPL(zvec::core::IndexLogger::LEVEL_INFO, format, ##__VA_ARGS__) -#endif - -//! Log Warn Message -#ifndef LOG_WARN -#define LOG_WARN(format, ...) \ - ZVEC_LOG_IMPL(zvec::core::IndexLogger::LEVEL_WARN, format, ##__VA_ARGS__) -#endif - -//! Log Error Message -#ifndef LOG_ERROR -#define LOG_ERROR(format, ...) \ - ZVEC_LOG_IMPL(zvec::core::IndexLogger::LEVEL_ERROR, format, ##__VA_ARGS__) -#endif - -//! Log Fatal Message -#ifndef LOG_FATAL -#define LOG_FATAL(format, ...) \ - ZVEC_LOG_IMPL(zvec::core::IndexLogger::LEVEL_FATAL, format, ##__VA_ARGS__) -#endif - -namespace zvec { -namespace core { - -/*! Index Logger - */ -struct IndexLogger : public IndexModule { - //! Index Logger Pointer - typedef std::shared_ptr Pointer; - - static const int LEVEL_DEBUG; - static const int LEVEL_INFO; - static const int LEVEL_WARN; - static const int LEVEL_ERROR; - static const int LEVEL_FATAL; - - //! Retrieve string of level - static const char *LevelString(int level) { - static const char *info[] = {"DEBUG", " INFO", " WARN", "ERROR", "FATAL"}; - if (level < (int)(sizeof(info) / sizeof(info[0]))) { - return info[level]; - } - return ""; - } - - //! Retrieve symbol of level - static char LevelSymbol(int level) { - static const char info[5] = {'D', 'I', 'W', 'E', 'F'}; - if (level < (int)(sizeof(info) / sizeof(info[0]))) { - return info[level]; - } - return ' '; - } - - //! Destructor - ~IndexLogger(void) override {} - - //! Initialize Logger - virtual int init(const zvec::ailego::Params ¶ms) = 0; - - //! Cleanup Logger - virtual int cleanup(void) = 0; - - //! Log Message - virtual void log(int level, const char *file, int line, const char *format, - va_list args) = 0; -}; - -/*! Index Logger Broker - */ -class IndexLoggerBroker { - public: - //! Register Logger - static IndexLogger::Pointer Register(IndexLogger::Pointer logger) { - IndexLogger::Pointer ret = std::move(logger_); - logger_ = std::move(logger); - return ret; - } - - //! Register Logger with init params - static int Register(IndexLogger::Pointer logger, - const ailego::Params ¶ms) { - //! Cleanup the previous, before initizlizing the new one - if (logger_) { - logger_->cleanup(); - } - logger_ = std::move(logger); - return logger_->init(params); - } - - //! Unregister Logger - static void Unregister(void) { - logger_ = nullptr; - } - - //! Set Level of Logger - static void SetLevel(int level) { - logger_level_ = level; - } - - //! Check if log level is enabled - static bool IsLevelEnabled(int level) { - return logger_level_ <= level && logger_; - } - - //! Log Message - AILEGO_PRINTF_FORMAT(4, 5) - static void Log(int level, const char *file, int line, const char *format, - ...) { - if (IsLevelEnabled(level)) { - va_list args; - va_start(args, format); - logger_->log(level, file, line, format, args); - va_end(args); - } - } - - private: - //! Disable them - IndexLoggerBroker(void) = delete; - IndexLoggerBroker(const IndexLoggerBroker &) = delete; - IndexLoggerBroker(IndexLoggerBroker &&) = delete; - - //! Members - static int logger_level_; - static IndexLogger::Pointer logger_; -}; - -} // namespace core -} // namespace zvec diff --git a/src/include/zvec/core/framework/index_unpacker.h b/src/include/zvec/core/framework/index_unpacker.h index 03e091e..edcb032 100644 --- a/src/include/zvec/core/framework/index_unpacker.h +++ b/src/include/zvec/core/framework/index_unpacker.h @@ -15,10 +15,10 @@ #pragma once #include +#include #include #include #include -#include namespace zvec { namespace core { diff --git a/src/turbo/quantizer/fp32_quantizer/fp32_quantizer.cc b/src/turbo/quantizer/fp32_quantizer/fp32_quantizer.cc index 839137e..159b95d 100644 --- a/src/turbo/quantizer/fp32_quantizer/fp32_quantizer.cc +++ b/src/turbo/quantizer/fp32_quantizer/fp32_quantizer.cc @@ -17,8 +17,8 @@ #include #include #include +#include #include -#include #include "core/quantizer/record_quantizer.h" namespace zvec { diff --git a/tests/ailego/logger/logger_test.cc b/tests/ailego/logger/logger_test.cc index ca05ba0..4c75a57 100644 --- a/tests/ailego/logger/logger_test.cc +++ b/tests/ailego/logger/logger_test.cc @@ -29,7 +29,7 @@ static void DoErrLogging() { LOG_ERROR("DoErrLogging: %d", ++err_log_count); } -TEST(IndexLogger, General) { +TEST(Logger, General) { ASSERT_TRUE(ailego::Factory::Has("ConsoleLogger")); for (int i = 0; i < 10; ++i) { @@ -64,4 +64,4 @@ TEST(IndexLogger, General) { LOG_WARN("%s", "LOG_WARN"); LOG_ERROR("%s", "LOG_ERROR"); LOG_FATAL("%s", "LOG_FATAL"); -} \ No newline at end of file +} diff --git a/tests/core/algorithm/flat_sparse/flat_sparse_searcher_test.cc b/tests/core/algorithm/flat_sparse/flat_sparse_searcher_test.cc index cbaa402..1ef146d 100644 --- a/tests/core/algorithm/flat_sparse/flat_sparse_searcher_test.cc +++ b/tests/core/algorithm/flat_sparse/flat_sparse_searcher_test.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include "tests/test_util.h" #include "zvec/core/framework/index_factory.h" #include "zvec/core/framework/index_meta.h" @@ -82,7 +83,7 @@ void FlatSparseSearcherTest::generate_sparse_data( void FlatSparseSearcherTest::SetUp(void) { - IndexLoggerBroker::SetLevel(2); + LoggerBroker::SetLevel(Logger::LEVEL_WARN); index_meta_ptr_.reset(new IndexMeta(IndexMeta::MetaType::MT_SPARSE, IndexMeta::DataType::DT_FP32)); @@ -816,4 +817,4 @@ TEST_F(FlatSparseSearcherTest, TestMultiThread) { #if defined(__GNUC__) || defined(__GNUG__) #pragma GCC diagnostic pop -#endif \ No newline at end of file +#endif diff --git a/tests/core/algorithm/flat_sparse/flat_sparse_streamer_test.cc b/tests/core/algorithm/flat_sparse/flat_sparse_streamer_test.cc index 88b5e26..c40f526 100644 --- a/tests/core/algorithm/flat_sparse/flat_sparse_streamer_test.cc +++ b/tests/core/algorithm/flat_sparse/flat_sparse_streamer_test.cc @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include "tests/test_util.h" @@ -83,7 +84,7 @@ void FlatSparseStreamerTest::generate_sparse_data( void FlatSparseStreamerTest::SetUp(void) { - IndexLoggerBroker::SetLevel(2); + LoggerBroker::SetLevel(Logger::LEVEL_WARN); index_meta_ptr_.reset(new IndexMeta(IndexMeta::MetaType::MT_SPARSE, IndexMeta::DataType::DT_FP32)); @@ -1723,4 +1724,4 @@ TEST_F(FlatSparseStreamerTest, TestAddAndSearchWithID) { #if defined(__GNUC__) || defined(__GNUG__) #pragma GCC diagnostic pop -#endif \ No newline at end of file +#endif diff --git a/tools/core/bench.cc b/tools/core/bench.cc index 2d35881..6a3fe39 100644 --- a/tools/core/bench.cc +++ b/tools/core/bench.cc @@ -817,17 +817,16 @@ int main(int argc, char *argv[]) { } auto config_common = config_node["IndexCommon"]; - map LOG_LEVEL = {{"debug", IndexLogger::LEVEL_DEBUG}, - {"info", IndexLogger::LEVEL_INFO}, - {"warn", IndexLogger::LEVEL_WARN}, - {"error", IndexLogger::LEVEL_ERROR}, - {"fatal", IndexLogger::LEVEL_FATAL}}; + map LOG_LEVEL = {{"debug", zvec::ailego::Logger::LEVEL_DEBUG}, + {"info", zvec::ailego::Logger::LEVEL_INFO}, + {"warn", zvec::ailego::Logger::LEVEL_WARN}, + {"error", zvec::ailego::Logger::LEVEL_ERROR}, + {"fatal", zvec::ailego::Logger::LEVEL_FATAL}}; string log_level = config_common["LogLevel"] ? config_common["LogLevel"].as() : "debug"; transform(log_level.begin(), log_level.end(), log_level.begin(), ::tolower); if (LOG_LEVEL.find(log_level) != LOG_LEVEL.end()) { - IndexLoggerBroker::SetLevel(LOG_LEVEL[log_level]); zvec::ailego::LoggerBroker::SetLevel(LOG_LEVEL[log_level]); } diff --git a/tools/core/bench_original.cc b/tools/core/bench_original.cc index bee3c1e..2ef3d66 100644 --- a/tools/core/bench_original.cc +++ b/tools/core/bench_original.cc @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "zvec/ailego/utility/string_helper.h" #include "zvec/core/framework/index_plugin.h" @@ -877,11 +878,11 @@ int main(int argc, char *argv[]) { } auto config_common = config_node["SearcherCommon"]; - map LOG_LEVEL = {{"debug", IndexLogger::LEVEL_DEBUG}, - {"info", IndexLogger::LEVEL_INFO}, - {"warn", IndexLogger::LEVEL_WARN}, - {"error", IndexLogger::LEVEL_ERROR}, - {"fatal", IndexLogger::LEVEL_FATAL}}; + map LOG_LEVEL = {{"debug", Logger::LEVEL_DEBUG}, + {"info", Logger::LEVEL_INFO}, + {"warn", Logger::LEVEL_WARN}, + {"error", Logger::LEVEL_ERROR}, + {"fatal", Logger::LEVEL_FATAL}}; string log_level = config_common["LogLevel"] ? config_common["LogLevel"].as() : "debug"; diff --git a/tools/core/local_builder.cc b/tools/core/local_builder.cc index 6ae7697..ff2d4d1 100644 --- a/tools/core/local_builder.cc +++ b/tools/core/local_builder.cc @@ -29,7 +29,6 @@ #include "zvec/ailego/logger/logger.h" #include "zvec/core/framework/index_dumper.h" #include "zvec/core/framework/index_factory.h" -#include "zvec/core/framework/index_logger.h" #include "zvec/core/framework/index_plugin.h" #include "zvec/core/framework/index_provider.h" #include "zvec/core/framework/index_reformer.h" @@ -1313,11 +1312,11 @@ int main(int argc, char *argv[]) { } auto config_common = config_root["BuilderCommon"]; - map LOG_LEVEL = {{"debug", IndexLogger::LEVEL_DEBUG}, - {"info", IndexLogger::LEVEL_INFO}, - {"warn", IndexLogger::LEVEL_WARN}, - {"error", IndexLogger::LEVEL_ERROR}, - {"fatal", IndexLogger::LEVEL_FATAL}}; + map LOG_LEVEL = {{"debug", zvec::ailego::Logger::LEVEL_DEBUG}, + {"info", zvec::ailego::Logger::LEVEL_INFO}, + {"warn", zvec::ailego::Logger::LEVEL_WARN}, + {"error", zvec::ailego::Logger::LEVEL_ERROR}, + {"fatal", zvec::ailego::Logger::LEVEL_FATAL}}; string log_level = config_common["LogLevel"] ? config_common["LogLevel"].as() @@ -1325,7 +1324,6 @@ int main(int argc, char *argv[]) { transform(log_level.begin(), log_level.end(), log_level.begin(), ::tolower); if (LOG_LEVEL.find(log_level) != LOG_LEVEL.end()) { - IndexLoggerBroker::SetLevel(LOG_LEVEL[log_level]); zvec::ailego::LoggerBroker::SetLevel(LOG_LEVEL[log_level]); } diff --git a/tools/core/local_builder_original.cc b/tools/core/local_builder_original.cc index 7a6111d..2464c2b 100644 --- a/tools/core/local_builder_original.cc +++ b/tools/core/local_builder_original.cc @@ -24,9 +24,9 @@ #include "algorithm/hnsw_rabitq/rabitq_converter.h" #include "algorithm/hnsw_rabitq/rabitq_reformer.h" #endif +#include "zvec/ailego/logger/logger.h" #include "zvec/core/framework/index_dumper.h" #include "zvec/core/framework/index_factory.h" -#include "zvec/core/framework/index_logger.h" #include "zvec/core/framework/index_plugin.h" #include "zvec/core/framework/index_provider.h" #include "zvec/core/framework/index_reformer.h" @@ -1219,11 +1219,11 @@ int main(int argc, char *argv[]) { } auto config_common = config_root["BuilderCommon"]; - map LOG_LEVEL = {{"debug", IndexLogger::LEVEL_DEBUG}, - {"info", IndexLogger::LEVEL_INFO}, - {"warn", IndexLogger::LEVEL_WARN}, - {"error", IndexLogger::LEVEL_ERROR}, - {"fatal", IndexLogger::LEVEL_FATAL}}; + map LOG_LEVEL = {{"debug", zvec::ailego::Logger::LEVEL_DEBUG}, + {"info", zvec::ailego::Logger::LEVEL_INFO}, + {"warn", zvec::ailego::Logger::LEVEL_WARN}, + {"error", zvec::ailego::Logger::LEVEL_ERROR}, + {"fatal", zvec::ailego::Logger::LEVEL_FATAL}}; string log_level = config_common["LogLevel"] ? config_common["LogLevel"].as() @@ -1231,7 +1231,6 @@ int main(int argc, char *argv[]) { transform(log_level.begin(), log_level.end(), log_level.begin(), ::tolower); if (LOG_LEVEL.find(log_level) != LOG_LEVEL.end()) { - IndexLoggerBroker::SetLevel(LOG_LEVEL[log_level]); zvec::ailego::LoggerBroker::SetLevel(LOG_LEVEL[log_level]); } diff --git a/tools/core/recall.cc b/tools/core/recall.cc index 4980eee..36b0e25 100644 --- a/tools/core/recall.cc +++ b/tools/core/recall.cc @@ -1660,17 +1660,16 @@ int main(int argc, char *argv[]) { } auto config_common = config_node["IndexCommon"]; - map LOG_LEVEL = {{"debug", IndexLogger::LEVEL_DEBUG}, - {"info", IndexLogger::LEVEL_INFO}, - {"warn", IndexLogger::LEVEL_WARN}, - {"error", IndexLogger::LEVEL_ERROR}, - {"fatal", IndexLogger::LEVEL_FATAL}}; + map LOG_LEVEL = {{"debug", zvec::ailego::Logger::LEVEL_DEBUG}, + {"info", zvec::ailego::Logger::LEVEL_INFO}, + {"warn", zvec::ailego::Logger::LEVEL_WARN}, + {"error", zvec::ailego::Logger::LEVEL_ERROR}, + {"fatal", zvec::ailego::Logger::LEVEL_FATAL}}; string log_level = config_common["LogLevel"] ? config_common["LogLevel"].as() : "debug"; transform(log_level.begin(), log_level.end(), log_level.begin(), ::tolower); if (LOG_LEVEL.find(log_level) != LOG_LEVEL.end()) { - IndexLoggerBroker::SetLevel(LOG_LEVEL[log_level]); zvec::ailego::LoggerBroker::SetLevel(LOG_LEVEL[log_level]); } diff --git a/tools/core/recall_original.cc b/tools/core/recall_original.cc index 22adbc5..ce8a2fb 100644 --- a/tools/core/recall_original.cc +++ b/tools/core/recall_original.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -1876,11 +1877,11 @@ int main(int argc, char *argv[]) { } auto config_common = config_node["SearcherCommon"]; - map LOG_LEVEL = {{"debug", IndexLogger::LEVEL_DEBUG}, - {"info", IndexLogger::LEVEL_INFO}, - {"warn", IndexLogger::LEVEL_WARN}, - {"error", IndexLogger::LEVEL_ERROR}, - {"fatal", IndexLogger::LEVEL_FATAL}}; + map LOG_LEVEL = {{"debug", Logger::LEVEL_DEBUG}, + {"info", Logger::LEVEL_INFO}, + {"warn", Logger::LEVEL_WARN}, + {"error", Logger::LEVEL_ERROR}, + {"fatal", Logger::LEVEL_FATAL}}; string log_level = config_common["LogLevel"] ? config_common["LogLevel"].as() : "debug";