diff --git a/cpp/src/db/insert/VectorSource.cpp b/cpp/src/db/insert/VectorSource.cpp index b9771925755c76b3d0024f793de154071590f07c..f7d6a48297f89745f129caae1cbdec48d40472b9 100644 --- a/cpp/src/db/insert/VectorSource.cpp +++ b/cpp/src/db/insert/VectorSource.cpp @@ -24,7 +24,7 @@ Status VectorSource::Add(const ExecutionEnginePtr &execution_engine, size_t &num_vectors_added, IDNumbers &vector_ids) { - server::CollectorAddMetrics metrics(n_, table_file_schema.dimension_); + server::CollectAddMetrics metrics(n_, table_file_schema.dimension_); num_vectors_added = current_num_vectors_added + num_vectors_to_add <= n_ ? num_vectors_to_add : n_ - current_num_vectors_added; diff --git a/cpp/src/metrics/Metrics.h b/cpp/src/metrics/Metrics.h index 99c97c424f49e9f1bd2888fc98866038cdd948a8..48f9f2b1118409a1e403a0618bf74ba8013095df 100644 --- a/cpp/src/metrics/Metrics.h +++ b/cpp/src/metrics/Metrics.h @@ -157,13 +157,13 @@ private: size_t size_; }; -class CollectorAddMetrics { +class CollectAddMetrics { public: - CollectorAddMetrics(size_t n, uint16_t dimension) : n_(n), dimension_(dimension) { + CollectAddMetrics(size_t n, uint16_t dimension) : n_(n), dimension_(dimension) { start_time_ = METRICS_NOW_TIME; } - ~CollectorAddMetrics() { + ~CollectAddMetrics() { auto end_time = METRICS_NOW_TIME; auto total_time = METRICS_MICROSECONDS(start_time_, end_time); server::Metrics::GetInstance().AddVectorsPerSecondGaugeSet(static_cast(n_), @@ -177,13 +177,13 @@ private: uint16_t dimension_; }; -class CollectorDurationMetrics { +class CollectDurationMetrics { public: - CollectorDurationMetrics() { + CollectDurationMetrics(int index_type) : index_type_(index_type) { start_time_ = METRICS_NOW_TIME; } - ~CollectorDurationMetrics() { + ~CollectDurationMetrics() { auto end_time = METRICS_NOW_TIME; auto total_time = METRICS_MICROSECONDS(start_time_, end_time); switch (index_type_) { diff --git a/cpp/src/scheduler/task/SearchTask.cpp b/cpp/src/scheduler/task/SearchTask.cpp index 6c64436bea15e13d62ff9b238fd8e694b9beea1a..b387e2de3b1a02e4ef976903b2b946a9bab768d2 100644 --- a/cpp/src/scheduler/task/SearchTask.cpp +++ b/cpp/src/scheduler/task/SearchTask.cpp @@ -141,7 +141,7 @@ XSearchTask::Execute() { server::TimeRecorder rc("DoSearch file id:" + std::to_string(index_id_)); - server::CollectorDurationMetrics metrics(index_type_); + server::CollectDurationMetrics metrics(index_type_); std::vector output_ids; std::vector output_distence; diff --git a/cpp/unittest/metrics/metrics_test.cpp b/cpp/unittest/metrics/metrics_test.cpp index a6301e05e1a95cf70fe08bd09ad840ad01c56379..c1c674f12b3e1436cd4bd8d83e28bd3805a8d80d 100644 --- a/cpp/unittest/metrics/metrics_test.cpp +++ b/cpp/unittest/metrics/metrics_test.cpp @@ -119,4 +119,33 @@ TEST_F(MetricTest, Metric_Tes) { delete [] qxb; }; +TEST_F(MetricTest, Collector_Metrics_Test){ + engine::Status status = engine::Status::OK(); + server::CollectInsertMetrics insert_metrics0(0, status); + status = engine::Status::Error("error"); + server::CollectInsertMetrics insert_metrics1(0, status); + + server::CollectQueryMetrics query_metrics(10); + + server::CollectMergeFilesMetrics merge_metrics(); + + server::CollectBuildIndexMetrics build_index_metrics(); + + server::CollectExecutionEngineMetrics execution_metrics(10); + + server::CollectSerializeMetrics serialize_metrics(10); + + server::CollectAddMetrics add_metrics(10, 128); + + server::CollectDurationMetrics duration_metrics_raw(engine::meta::TableFileSchema::RAW); + server::CollectDurationMetrics duration_metrics_index(engine::meta::TableFileSchema::TO_INDEX); + server::CollectDurationMetrics duration_metrics_delete(engine::meta::TableFileSchema::TO_DELETE); + + server::CollectSearchTaskMetrics search_metrics_raw(engine::meta::TableFileSchema::RAW); + server::CollectSearchTaskMetrics search_metrics_index(engine::meta::TableFileSchema::TO_INDEX); + server::CollectSearchTaskMetrics search_metrics_delete(engine::meta::TableFileSchema::TO_DELETE); + + server::MetricCollector metric_collector(); +} +