From dfd849caaa356734d69e56adc38b7fa7e73dbdca Mon Sep 17 00:00:00 2001 From: yangxuan Date: Wed, 4 Feb 2026 18:20:43 +0800 Subject: [PATCH 1/4] enhance: Update to the latest milvus-common Signed-off-by: yangxuan --- internal/core/thirdparty/milvus-common/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/core/thirdparty/milvus-common/CMakeLists.txt b/internal/core/thirdparty/milvus-common/CMakeLists.txt index 77bab8f964483..ec56b3910bf21 100644 --- a/internal/core/thirdparty/milvus-common/CMakeLists.txt +++ b/internal/core/thirdparty/milvus-common/CMakeLists.txt @@ -13,8 +13,8 @@ milvus_add_pkg_config("milvus-common") set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES "") -set( MILVUS-COMMON-VERSION c37f138 ) -set( GIT_REPOSITORY "https://github.com/zilliztech/milvus-common.git") +set( MILVUS-COMMON-VERSION a488ece ) +set( GIT_REPOSITORY "https://github.com/XuanYang-cn/milvus-common.git") message(STATUS "milvus-common repo: ${GIT_REPOSITORY}") message(STATUS "milvus-common version: ${MILVUS-COMMON-VERSION}") From 0d4768746e3154d502ffb3e8ae4faffff0557195 Mon Sep 17 00:00:00 2001 From: chyezh Date: Mon, 9 Feb 2026 21:19:53 +0800 Subject: [PATCH 2/4] fix: channel exclusive lost Signed-off-by: chyezh --- internal/querycoordv2/job/job_load.go | 18 ++++++++++-------- internal/querycoordv2/meta/replica.go | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/internal/querycoordv2/job/job_load.go b/internal/querycoordv2/job/job_load.go index 7a588542fb195..5deebbc61c8a2 100644 --- a/internal/querycoordv2/job/job_load.go +++ b/internal/querycoordv2/job/job_load.go @@ -37,6 +37,7 @@ import ( "github.com/milvus-io/milvus/pkg/v2/metrics" "github.com/milvus-io/milvus/pkg/v2/proto/querypb" "github.com/milvus-io/milvus/pkg/v2/streaming/util/message" + "github.com/milvus-io/milvus/pkg/v2/util/merr" "github.com/milvus-io/milvus/pkg/v2/util/typeutil" ) @@ -84,25 +85,26 @@ func NewLoadCollectionJob( func (job *LoadCollectionJob) Execute() error { req := job.result.Message.Header() - vchannels := job.result.GetVChannelsWithoutControlChannel() - log := log.Ctx(job.ctx).With(zap.Int64("collectionID", req.GetCollectionId())) meta.GlobalFailedLoadCache.Remove(req.GetCollectionId()) + collInfo, err := job.broker.DescribeCollection(job.ctx, req.GetCollectionId()) + if errors.Is(err, merr.ErrCollectionNotFound) { + return nil + } + if err != nil { + return err + } + // 1. create replica if not exist if _, err := utils.SpawnReplicasWithReplicaConfig(job.ctx, job.meta, meta.SpawnWithReplicaConfigParams{ CollectionID: req.GetCollectionId(), - Channels: vchannels, + Channels: collInfo.GetVirtualChannelNames(), Configs: req.GetReplicas(), }); err != nil { return err } - collInfo, err := job.broker.DescribeCollection(job.ctx, req.GetCollectionId()) - if err != nil { - return err - } - // 2. put load info meta fieldIndexIDs := make(map[int64]int64, len(req.GetLoadFields())) fieldIDs := make([]int64, 0, len(req.GetLoadFields())) diff --git a/internal/querycoordv2/meta/replica.go b/internal/querycoordv2/meta/replica.go index 0675f945b3f39..ce3a8a0809567 100644 --- a/internal/querycoordv2/meta/replica.go +++ b/internal/querycoordv2/meta/replica.go @@ -393,6 +393,7 @@ func (replica *mutableReplica) TryEnableChannelExclusiveMode(channelNames ...str if replica.exclusiveRWNodeToChannel == nil { replica.exclusiveRWNodeToChannel = make(map[int64]string) } + replica.tryBalanceNodeForChannel() } func (replica *mutableReplica) DisableChannelExclusiveMode() { From 38fad8b94728472ebfa3b6efeb80b278ba726986 Mon Sep 17 00:00:00 2001 From: "xianliang.li" Date: Tue, 10 Feb 2026 00:28:34 +0800 Subject: [PATCH 3/4] update common commit Signed-off-by: xianliang.li --- internal/core/thirdparty/milvus-common/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/core/thirdparty/milvus-common/CMakeLists.txt b/internal/core/thirdparty/milvus-common/CMakeLists.txt index ec56b3910bf21..e97d34b70fa3f 100644 --- a/internal/core/thirdparty/milvus-common/CMakeLists.txt +++ b/internal/core/thirdparty/milvus-common/CMakeLists.txt @@ -13,8 +13,8 @@ milvus_add_pkg_config("milvus-common") set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES "") -set( MILVUS-COMMON-VERSION a488ece ) -set( GIT_REPOSITORY "https://github.com/XuanYang-cn/milvus-common.git") +set( MILVUS-COMMON-VERSION f192a195 ) +set( GIT_REPOSITORY "https://github.com/zilliztech/milvus-common.git") message(STATUS "milvus-common repo: ${GIT_REPOSITORY}") message(STATUS "milvus-common version: ${MILVUS-COMMON-VERSION}") From ae90efb08f2f71d795c81aeb1e8fa55bd317079e Mon Sep 17 00:00:00 2001 From: "xianliang.li" Date: Tue, 10 Feb 2026 21:39:10 +0800 Subject: [PATCH 4/4] remove tracer Signed-off-by: xianliang.li --- internal/core/src/exec/Driver.cpp | 16 ++++----- internal/core/src/exec/Task.cpp | 18 +++++----- .../expression/BinaryArithOpEvalRangeExpr.cpp | 10 +++--- .../src/exec/expression/BinaryRangeExpr.cpp | 8 ++--- .../core/src/exec/expression/CallExpr.cpp | 4 +-- .../core/src/exec/expression/ColumnExpr.cpp | 4 +-- .../core/src/exec/expression/CompareExpr.cpp | 10 +++--- .../core/src/exec/expression/ConjunctExpr.cpp | 6 ++-- .../core/src/exec/expression/ExistsExpr.cpp | 8 ++--- internal/core/src/exec/expression/Expr.cpp | 2 +- .../src/exec/expression/JsonContainsExpr.cpp | 8 ++--- .../src/exec/expression/LogicalBinaryExpr.cpp | 2 +- .../src/exec/expression/LogicalUnaryExpr.cpp | 2 +- .../core/src/exec/expression/NullExpr.cpp | 6 ++-- .../core/src/exec/expression/TermExpr.cpp | 8 ++--- .../core/src/exec/expression/UnaryExpr.cpp | 10 +++--- .../core/src/exec/expression/ValueExpr.cpp | 4 +-- internal/core/src/exec/operator/CountNode.cpp | 4 +-- .../core/src/exec/operator/FilterBitsNode.cpp | 6 ++-- .../core/src/exec/operator/GroupByNode.cpp | 10 +++--- .../src/exec/operator/IterativeFilterNode.cpp | 10 +++--- internal/core/src/exec/operator/MvccNode.cpp | 4 +-- .../src/exec/operator/RandomSampleNode.cpp | 14 ++++---- .../core/src/exec/operator/RescoresNode.cpp | 6 ++-- .../src/exec/operator/VectorSearchNode.cpp | 12 +++---- internal/core/src/index/BitmapIndex.cpp | 30 ++++++++-------- .../core/src/index/InvertedIndexTantivy.cpp | 36 +++++++++---------- internal/core/src/index/JsonFlatIndex.h | 36 +++++++++---------- .../core/src/index/NgramInvertedIndex.cpp | 34 +++++++++--------- internal/core/src/index/StringIndexMarisa.cpp | 32 ++++++++--------- internal/core/src/index/TextMatchIndex.cpp | 6 ++-- internal/core/src/index/VectorMemIndex.cpp | 10 +++--- .../core/src/query/ExecPlanNodeVisitor.cpp | 12 +++---- internal/core/src/query/SearchBruteForce.cpp | 6 ++-- .../src/segcore/ChunkedSegmentSealedImpl.cpp | 8 ++--- .../core/src/segcore/SegmentInterface.cpp | 8 ++--- internal/core/src/segcore/reduce/Reduce.cpp | 20 +++++------ internal/core/src/segcore/reduce_c.cpp | 4 +-- internal/core/src/segcore/segment_c.cpp | 6 ++-- 39 files changed, 220 insertions(+), 220 deletions(-) diff --git a/internal/core/src/exec/Driver.cpp b/internal/core/src/exec/Driver.cpp index fed2ca6dc1bc9..07e2a2afff4f2 100644 --- a/internal/core/src/exec/Driver.cpp +++ b/internal/core/src/exec/Driver.cpp @@ -59,49 +59,49 @@ DriverFactory::CreateDriver(std::unique_ptr ctx, if (auto filterbitsnode = std::dynamic_pointer_cast( plannode)) { - tracer::AddEvent("create_operator: FilterBitsNode"); + // tracer::AddEvent("create_operator: FilterBitsNode"); operators.push_back(std::make_unique( id, ctx.get(), filterbitsnode)); } else if (auto filternode = std::dynamic_pointer_cast( plannode)) { - tracer::AddEvent("create_operator: FilterNode"); + // tracer::AddEvent("create_operator: FilterNode"); operators.push_back(std::make_unique( id, ctx.get(), filternode)); } else if (auto mvccnode = std::dynamic_pointer_cast( plannode)) { - tracer::AddEvent("create_operator: MvccNode"); + // tracer::AddEvent("create_operator: MvccNode"); operators.push_back( std::make_unique(id, ctx.get(), mvccnode)); } else if (auto countnode = std::dynamic_pointer_cast( plannode)) { - tracer::AddEvent("create_operator: CountNode"); + // tracer::AddEvent("create_operator: CountNode"); operators.push_back( std::make_unique(id, ctx.get(), countnode)); } else if (auto vectorsearchnode = std::dynamic_pointer_cast( plannode)) { - tracer::AddEvent("create_operator: VectorSearchNode"); + // tracer::AddEvent("create_operator: VectorSearchNode"); operators.push_back(std::make_unique( id, ctx.get(), vectorsearchnode)); } else if (auto groupbynode = std::dynamic_pointer_cast( plannode)) { - tracer::AddEvent("create_operator: GroupByNode"); + // tracer::AddEvent("create_operator: GroupByNode"); operators.push_back( std::make_unique(id, ctx.get(), groupbynode)); } else if (auto samplenode = std::dynamic_pointer_cast( plannode)) { - tracer::AddEvent("create_operator: RandomSampleNode"); + // tracer::AddEvent("create_operator: RandomSampleNode"); operators.push_back(std::make_unique( id, ctx.get(), samplenode)); } else if (auto rescoresnode = std::dynamic_pointer_cast( plannode)) { - tracer::AddEvent("create_operator: RescoresNode"); + // tracer::AddEvent("create_operator: RescoresNode"); operators.push_back( std::make_unique(id, ctx.get(), rescoresnode)); } diff --git a/internal/core/src/exec/Task.cpp b/internal/core/src/exec/Task.cpp index 4bd9525eb4171..a60e779394978 100644 --- a/internal/core/src/exec/Task.cpp +++ b/internal/core/src/exec/Task.cpp @@ -147,7 +147,7 @@ Task::Next(ContinueFuture* future) { AssertInfo(state_ == TaskState::kRunning, "Task has already finished processing."); - tracer::AutoSpan span("Task::Next", tracer::GetRootSpan(), true); + // tracer::AutoSpan span("Task::Next", tracer::GetRootSpan(), true); if (driver_factories_.empty()) { AssertInfo( consumer_supplier_ == nullptr, @@ -201,15 +201,15 @@ Task::Next(ContinueFuture* future) { auto result = drivers_[i]->Next(blocking_state); if (result) { - tracer::AddEvent( - fmt::format("driver_result_produced: driver_id={}, rows={}", - i, - result->childrens()[0]->size())); + // tracer::AddEvent( + // fmt::format("driver_result_produced: driver_id={}, rows={}", + // i, + // result->childrens()[0]->size())); return result; } if (blocking_state) { - tracer::AddEvent(fmt::format("driver_{}_blocked", i)); + // tracer::AddEvent(fmt::format("driver_{}_blocked", i)); futures[i] = blocking_state->future(); } @@ -218,9 +218,9 @@ Task::Next(ContinueFuture* future) { } } - tracer::AddEvent(fmt::format("iteration: runnable={}, blocked={}", - runnable_drivers, - blocked_drivers)); + // tracer::AddEvent(fmt::format("iteration: runnable={}, blocked={}", + // runnable_drivers, + // blocked_drivers)); if (runnable_drivers == 0) { if (blocked_drivers > 0) { diff --git a/internal/core/src/exec/expression/BinaryArithOpEvalRangeExpr.cpp b/internal/core/src/exec/expression/BinaryArithOpEvalRangeExpr.cpp index 3226cff0aff70..667768e2a1452 100644 --- a/internal/core/src/exec/expression/BinaryArithOpEvalRangeExpr.cpp +++ b/internal/core/src/exec/expression/BinaryArithOpEvalRangeExpr.cpp @@ -21,11 +21,11 @@ namespace exec { void PhyBinaryArithOpEvalRangeExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span( - "PhyBinaryArithOpEvalRangeExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("data_type", - static_cast(expr_->column_.data_type_)); - span.GetSpan()->SetAttribute("op_type", static_cast(expr_->op_type_)); + // tracer::AutoSpan span( + // "PhyBinaryArithOpEvalRangeExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("data_type", + // static_cast(expr_->column_.data_type_)); + // span.GetSpan()->SetAttribute("op_type", static_cast(expr_->op_type_)); auto input = context.get_offset_input(); SetHasOffsetInput((input != nullptr)); diff --git a/internal/core/src/exec/expression/BinaryRangeExpr.cpp b/internal/core/src/exec/expression/BinaryRangeExpr.cpp index 79817d23324b9..fcd4554cb2ae8 100644 --- a/internal/core/src/exec/expression/BinaryRangeExpr.cpp +++ b/internal/core/src/exec/expression/BinaryRangeExpr.cpp @@ -24,10 +24,10 @@ namespace exec { void PhyBinaryRangeFilterExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span( - "PhyBinaryRangeFilterExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("data_type", - static_cast(expr_->column_.data_type_)); + // tracer::AutoSpan span( + // "PhyBinaryRangeFilterExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("data_type", + // static_cast(expr_->column_.data_type_)); auto input = context.get_offset_input(); SetHasOffsetInput((input != nullptr)); diff --git a/internal/core/src/exec/expression/CallExpr.cpp b/internal/core/src/exec/expression/CallExpr.cpp index 350296c78371b..ccfebedd1a88a 100644 --- a/internal/core/src/exec/expression/CallExpr.cpp +++ b/internal/core/src/exec/expression/CallExpr.cpp @@ -28,8 +28,8 @@ namespace exec { void PhyCallExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span("PhyCallExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("function_name", expr_->fun_name()); + // tracer::AutoSpan span("PhyCallExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("function_name", expr_->fun_name()); auto offset_input = context.get_offset_input(); SetHasOffsetInput(offset_input != nullptr); diff --git a/internal/core/src/exec/expression/ColumnExpr.cpp b/internal/core/src/exec/expression/ColumnExpr.cpp index 3a78bcdf25010..0560986f01f14 100644 --- a/internal/core/src/exec/expression/ColumnExpr.cpp +++ b/internal/core/src/exec/expression/ColumnExpr.cpp @@ -30,8 +30,8 @@ PhyColumnExpr::GetNextBatchSize() { void PhyColumnExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span("PhyColumnExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("data_type", static_cast(expr_->type())); + // tracer::AutoSpan span("PhyColumnExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("data_type", static_cast(expr_->type())); auto input = context.get_offset_input(); SetHasOffsetInput(input != nullptr); diff --git a/internal/core/src/exec/expression/CompareExpr.cpp b/internal/core/src/exec/expression/CompareExpr.cpp index 0161120fb7f60..bd95a97de07bc 100644 --- a/internal/core/src/exec/expression/CompareExpr.cpp +++ b/internal/core/src/exec/expression/CompareExpr.cpp @@ -215,11 +215,11 @@ PhyCompareFilterExpr::ExecCompareExprDispatcher(OpType op, EvalCtx& context) { void PhyCompareFilterExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span( - "PhyCompareFilterExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("op_type", static_cast(expr_->op_type_)); - span.GetSpan()->SetAttribute("left_indexed", is_left_indexed_); - span.GetSpan()->SetAttribute("right_indexed", is_right_indexed_); + // tracer::AutoSpan span( + // "PhyCompareFilterExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("op_type", static_cast(expr_->op_type_)); + // span.GetSpan()->SetAttribute("left_indexed", is_left_indexed_); + // span.GetSpan()->SetAttribute("right_indexed", is_right_indexed_); auto input = context.get_offset_input(); SetHasOffsetInput((input != nullptr)); diff --git a/internal/core/src/exec/expression/ConjunctExpr.cpp b/internal/core/src/exec/expression/ConjunctExpr.cpp index 26666002d2eba..1fe5239e9a1e3 100644 --- a/internal/core/src/exec/expression/ConjunctExpr.cpp +++ b/internal/core/src/exec/expression/ConjunctExpr.cpp @@ -90,9 +90,9 @@ PhyConjunctFilterExpr::SkipFollowingExprs(int start) { void PhyConjunctFilterExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span( - "PhyConjunctFilterExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("is_and", is_and_); + // tracer::AutoSpan span( + // "PhyConjunctFilterExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("is_and", is_and_); if (input_order_.empty()) { input_order_.resize(inputs_.size()); diff --git a/internal/core/src/exec/expression/ExistsExpr.cpp b/internal/core/src/exec/expression/ExistsExpr.cpp index 377a59d0208ec..d783031449df9 100644 --- a/internal/core/src/exec/expression/ExistsExpr.cpp +++ b/internal/core/src/exec/expression/ExistsExpr.cpp @@ -26,10 +26,10 @@ namespace exec { void PhyExistsFilterExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span( - "PhyExistsFilterExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("data_type", - static_cast(expr_->column_.data_type_)); + // tracer::AutoSpan span( + // "PhyExistsFilterExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("data_type", + // static_cast(expr_->column_.data_type_)); context.set_apply_valid_data_after_flip(false); auto input = context.get_offset_input(); diff --git a/internal/core/src/exec/expression/Expr.cpp b/internal/core/src/exec/expression/Expr.cpp index 078d99f516c59..eab5f1f7a0edc 100644 --- a/internal/core/src/exec/expression/Expr.cpp +++ b/internal/core/src/exec/expression/Expr.cpp @@ -49,7 +49,7 @@ ExprSet::Eval(int32_t begin, bool initialize, EvalCtx& context, std::vector& results) { - tracer::AutoSpan span("ExprSet::Eval", tracer::GetRootSpan(), true); + // tracer::AutoSpan span("ExprSet::Eval", tracer::GetRootSpan(), true); results.resize(exprs_.size()); auto* exec_ctx = context.get_exec_context(); diff --git a/internal/core/src/exec/expression/JsonContainsExpr.cpp b/internal/core/src/exec/expression/JsonContainsExpr.cpp index 5b99f1361649e..063c011cbfb3e 100644 --- a/internal/core/src/exec/expression/JsonContainsExpr.cpp +++ b/internal/core/src/exec/expression/JsonContainsExpr.cpp @@ -24,10 +24,10 @@ namespace exec { void PhyJsonContainsFilterExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span( - "PhyJsonContainsFilterExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("data_type", - static_cast(expr_->column_.data_type_)); + // tracer::AutoSpan span( + // "PhyJsonContainsFilterExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("data_type", + // static_cast(expr_->column_.data_type_)); auto input = context.get_offset_input(); SetHasOffsetInput((input != nullptr)); diff --git a/internal/core/src/exec/expression/LogicalBinaryExpr.cpp b/internal/core/src/exec/expression/LogicalBinaryExpr.cpp index ec227f84c3ded..a77a9f328763a 100644 --- a/internal/core/src/exec/expression/LogicalBinaryExpr.cpp +++ b/internal/core/src/exec/expression/LogicalBinaryExpr.cpp @@ -21,7 +21,7 @@ namespace exec { void PhyLogicalBinaryExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span("PhyLogicalBinaryExpr::Eval", tracer::GetRootSpan()); + // tracer::AutoSpan span("PhyLogicalBinaryExpr::Eval", tracer::GetRootSpan()); AssertInfo( inputs_.size() == 2, diff --git a/internal/core/src/exec/expression/LogicalUnaryExpr.cpp b/internal/core/src/exec/expression/LogicalUnaryExpr.cpp index 4ad45d1751083..b8a9594a278f7 100644 --- a/internal/core/src/exec/expression/LogicalUnaryExpr.cpp +++ b/internal/core/src/exec/expression/LogicalUnaryExpr.cpp @@ -21,7 +21,7 @@ namespace exec { void PhyLogicalUnaryExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span("PhyLogicalUnaryExpr::Eval", tracer::GetRootSpan()); + // tracer::AutoSpan span("PhyLogicalUnaryExpr::Eval", tracer::GetRootSpan()); AssertInfo(inputs_.size() == 1, "logical unary expr must has one input, but now {}", diff --git a/internal/core/src/exec/expression/NullExpr.cpp b/internal/core/src/exec/expression/NullExpr.cpp index e0f2dc5c6cfac..4108463f92b5c 100644 --- a/internal/core/src/exec/expression/NullExpr.cpp +++ b/internal/core/src/exec/expression/NullExpr.cpp @@ -26,9 +26,9 @@ namespace exec { void PhyNullExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span("PhyNullExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("data_type", - static_cast(expr_->column_.data_type_)); + // tracer::AutoSpan span("PhyNullExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("data_type", + // static_cast(expr_->column_.data_type_)); auto input = context.get_offset_input(); switch (expr_->column_.data_type_) { diff --git a/internal/core/src/exec/expression/TermExpr.cpp b/internal/core/src/exec/expression/TermExpr.cpp index 5b16d478521e0..2b5538c8e1349 100644 --- a/internal/core/src/exec/expression/TermExpr.cpp +++ b/internal/core/src/exec/expression/TermExpr.cpp @@ -24,10 +24,10 @@ namespace exec { void PhyTermFilterExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span( - "PhyTermFilterExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("data_type", - static_cast(expr_->column_.data_type_)); + // tracer::AutoSpan span( + // "PhyTermFilterExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("data_type", + // static_cast(expr_->column_.data_type_)); auto input = context.get_offset_input(); SetHasOffsetInput((input != nullptr)); diff --git a/internal/core/src/exec/expression/UnaryExpr.cpp b/internal/core/src/exec/expression/UnaryExpr.cpp index c00fda8933963..f749553126db4 100644 --- a/internal/core/src/exec/expression/UnaryExpr.cpp +++ b/internal/core/src/exec/expression/UnaryExpr.cpp @@ -155,11 +155,11 @@ PhyUnaryRangeFilterExpr::ExecRangeVisitorImplArrayForIndex( void PhyUnaryRangeFilterExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span( - "PhyUnaryRangeFilterExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("data_type", - static_cast(expr_->column_.data_type_)); - span.GetSpan()->SetAttribute("op_type", static_cast(expr_->op_type_)); + // tracer::AutoSpan span( + // "PhyUnaryRangeFilterExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("data_type", + // static_cast(expr_->column_.data_type_)); + // span.GetSpan()->SetAttribute("op_type", static_cast(expr_->op_type_)); auto input = context.get_offset_input(); SetHasOffsetInput((input != nullptr)); diff --git a/internal/core/src/exec/expression/ValueExpr.cpp b/internal/core/src/exec/expression/ValueExpr.cpp index fc8df4eaca829..280651e7f7d16 100644 --- a/internal/core/src/exec/expression/ValueExpr.cpp +++ b/internal/core/src/exec/expression/ValueExpr.cpp @@ -22,8 +22,8 @@ namespace exec { void PhyValueExpr::Eval(EvalCtx& context, VectorPtr& result) { - tracer::AutoSpan span("PhyValueExpr::Eval", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("data_type", static_cast(expr_->type())); + // tracer::AutoSpan span("PhyValueExpr::Eval", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("data_type", static_cast(expr_->type())); auto input = context.get_offset_input(); SetHasOffsetInput((input != nullptr)); diff --git a/internal/core/src/exec/operator/CountNode.cpp b/internal/core/src/exec/operator/CountNode.cpp index 00d7aa0739edf..9e1745aed5f10 100644 --- a/internal/core/src/exec/operator/CountNode.cpp +++ b/internal/core/src/exec/operator/CountNode.cpp @@ -59,7 +59,7 @@ PhyCountNode::GetOutput() { if (is_finished_ || !no_more_input_) { return nullptr; } - tracer::AutoSpan span("PhyCountNode::Execute", tracer::GetRootSpan(), true); + // tracer::AutoSpan span("PhyCountNode::Execute", tracer::GetRootSpan(), true); auto col_input = GetColumnVector(input_); TargetBitmapView view(col_input->GetRawData(), col_input->size()); auto cnt = view.size() - view.count(); @@ -67,7 +67,7 @@ PhyCountNode::GetOutput() { std::move(*(wrap_num_entities(cnt, view.size())))); is_finished_ = true; - tracer::AddEvent(fmt::format("count_result: {}", cnt)); + // tracer::AddEvent(fmt::format("count_result: {}", cnt)); return input_; } diff --git a/internal/core/src/exec/operator/FilterBitsNode.cpp b/internal/core/src/exec/operator/FilterBitsNode.cpp index 32833eaa3fc2f..c5d0dc3acdc8c 100644 --- a/internal/core/src/exec/operator/FilterBitsNode.cpp +++ b/internal/core/src/exec/operator/FilterBitsNode.cpp @@ -67,9 +67,9 @@ PhyFilterBitsNode::GetOutput() { return nullptr; } - tracer::AutoSpan span( - "PhyFilterBitsNode::Execute", tracer::GetRootSpan(), true); - tracer::AddEvent(fmt::format("input_rows: {}", need_process_rows_)); + // tracer::AutoSpan span( + // "PhyFilterBitsNode::Execute", tracer::GetRootSpan(), true); + // tracer::AddEvent(fmt::format("input_rows: {}", need_process_rows_)); std::chrono::high_resolution_clock::time_point scalar_start = std::chrono::high_resolution_clock::now(); diff --git a/internal/core/src/exec/operator/GroupByNode.cpp b/internal/core/src/exec/operator/GroupByNode.cpp index bf296c1790631..032a2562df062 100644 --- a/internal/core/src/exec/operator/GroupByNode.cpp +++ b/internal/core/src/exec/operator/GroupByNode.cpp @@ -51,15 +51,15 @@ PhyGroupByNode::GetOutput() { return nullptr; } - tracer::AutoSpan span( - "PhyGroupByNode::Execute", tracer::GetRootSpan(), true); + // tracer::AutoSpan span( + // "PhyGroupByNode::Execute", tracer::GetRootSpan(), true); DeferLambda([&]() { is_finished_ = true; }); if (input_ == nullptr) { return nullptr; } - tracer::AddEvent(fmt::format("group_size: {}", search_info_.group_size_)); + // tracer::AddEvent(fmt::format("group_size: {}", search_info_.group_size_)); std::chrono::high_resolution_clock::time_point vector_start = std::chrono::high_resolution_clock::now(); @@ -89,8 +89,8 @@ PhyGroupByNode::GetOutput() { search_result.group_by_values_.value().size(), search_result.seg_offsets_.size()); } - tracer::AddEvent( - fmt::format("grouped_results: {}", search_result.seg_offsets_.size())); + // tracer::AddEvent( + // fmt::format("grouped_results: {}", search_result.seg_offsets_.size())); query_context_->set_search_result(std::move(search_result)); std::chrono::high_resolution_clock::time_point vector_end = diff --git a/internal/core/src/exec/operator/IterativeFilterNode.cpp b/internal/core/src/exec/operator/IterativeFilterNode.cpp index e77c875d86361..d26e3bc59a420 100644 --- a/internal/core/src/exec/operator/IterativeFilterNode.cpp +++ b/internal/core/src/exec/operator/IterativeFilterNode.cpp @@ -119,8 +119,8 @@ PhyIterativeFilterNode::GetOutput() { return nullptr; } - tracer::AutoSpan span( - "PhyIterativeFilterNode::Execute", tracer::GetRootSpan(), true); + // tracer::AutoSpan span( + // "PhyIterativeFilterNode::Execute", tracer::GetRootSpan(), true); DeferLambda([&]() { is_finished_ = true; }); @@ -274,9 +274,9 @@ PhyIterativeFilterNode::GetOutput() { scalar_cost / 1000); if (!is_native_supported_) { - tracer::AddEvent(fmt::format("total_processed: {}, matched: {}", - need_process_rows_, - need_process_rows_ - bitset.count())); + // tracer::AddEvent(fmt::format("total_processed: {}, matched: {}", + // need_process_rows_, + // need_process_rows_ - bitset.count())); } return input_; diff --git a/internal/core/src/exec/operator/MvccNode.cpp b/internal/core/src/exec/operator/MvccNode.cpp index a8474f5c00259..8a9ce2be7ba2f 100644 --- a/internal/core/src/exec/operator/MvccNode.cpp +++ b/internal/core/src/exec/operator/MvccNode.cpp @@ -52,7 +52,7 @@ PhyMvccNode::GetOutput() { return nullptr; } - tracer::AutoSpan span("PhyMvccNode::Execute", tracer::GetRootSpan(), true); + // tracer::AutoSpan span("PhyMvccNode::Execute", tracer::GetRootSpan(), true); if (!is_source_node_ && input_ == nullptr) { return nullptr; @@ -63,7 +63,7 @@ PhyMvccNode::GetOutput() { return nullptr; } - tracer::AddEvent(fmt::format("input_rows: {}", active_count_)); + // tracer::AddEvent(fmt::format("input_rows: {}", active_count_)); // the first vector is filtering result and second bitset is a valid bitset // if valid_bitset[i]==false, means result[i] is null auto col_input = is_source_node_ ? std::make_shared( diff --git a/internal/core/src/exec/operator/RandomSampleNode.cpp b/internal/core/src/exec/operator/RandomSampleNode.cpp index 3459c85e4765f..6a188c77e04bd 100644 --- a/internal/core/src/exec/operator/RandomSampleNode.cpp +++ b/internal/core/src/exec/operator/RandomSampleNode.cpp @@ -98,8 +98,8 @@ PhyRandomSampleNode::GetOutput() { return nullptr; } - tracer::AutoSpan span( - "PhyRandomSampleNode::Execute", tracer::GetRootSpan(), true); + // tracer::AutoSpan span( + // "PhyRandomSampleNode::Execute", tracer::GetRootSpan(), true); if (!is_source_node_ && input_ == nullptr) { return nullptr; @@ -110,8 +110,8 @@ PhyRandomSampleNode::GetOutput() { return nullptr; } - tracer::AddEvent(fmt::format( - "sample_factor: {}, active_count: {}", factor_, active_count_)); + // tracer::AddEvent(fmt::format( + // "sample_factor: {}, active_count: {}", factor_, active_count_)); std::chrono::high_resolution_clock::time_point start = std::chrono::high_resolution_clock::now(); @@ -183,9 +183,9 @@ PhyRandomSampleNode::GetOutput() { TargetBitmapView result_data(result_col->GetRawData(), result_col->size()); auto sampled_count = result_col->size() - result_data.count(); - tracer::AddEvent(fmt::format("sampled_count: {}, total_count: {}", - sampled_count, - active_count_)); + // tracer::AddEvent(fmt::format("sampled_count: {}, total_count: {}", + // sampled_count, + // active_count_)); } is_finished_ = true; diff --git a/internal/core/src/exec/operator/RescoresNode.cpp b/internal/core/src/exec/operator/RescoresNode.cpp index 314c9505317a1..b46db8d3bb5e7 100644 --- a/internal/core/src/exec/operator/RescoresNode.cpp +++ b/internal/core/src/exec/operator/RescoresNode.cpp @@ -59,8 +59,8 @@ PhyRescoresNode::GetOutput() { return nullptr; } - tracer::AutoSpan span( - "PhyRescoresNode::Execute", tracer::GetRootSpan(), true); + // tracer::AutoSpan span( + // "PhyRescoresNode::Execute", tracer::GetRootSpan(), true); DeferLambda([&]() { is_finished_ = true; }); @@ -212,7 +212,7 @@ PhyRescoresNode::GetOutput() { milvus::monitor::internal_core_search_latency_rescore.Observe(scalar_cost / 1000); - tracer::AddEvent(fmt::format("rescored_count: {}", offsets.size())); + // tracer::AddEvent(fmt::format("rescored_count: {}", offsets.size())); return input_; }; diff --git a/internal/core/src/exec/operator/VectorSearchNode.cpp b/internal/core/src/exec/operator/VectorSearchNode.cpp index 76ecbd84f1487..7012024f605f3 100644 --- a/internal/core/src/exec/operator/VectorSearchNode.cpp +++ b/internal/core/src/exec/operator/VectorSearchNode.cpp @@ -62,16 +62,16 @@ PhyVectorSearchNode::GetOutput() { return nullptr; } - tracer::AutoSpan span( - "PhyVectorSearchNode::Execute", tracer::GetRootSpan(), true); + // tracer::AutoSpan span( + // "PhyVectorSearchNode::Execute", tracer::GetRootSpan(), true); DeferLambda([&]() { is_finished_ = true; }); if (input_ == nullptr) { return nullptr; } - span.GetSpan()->SetAttribute("search_type", search_info_.metric_type_); - span.GetSpan()->SetAttribute("topk", search_info_.topk_); + // span.GetSpan()->SetAttribute("search_type", search_info_.metric_type_); + // span.GetSpan()->SetAttribute("topk", search_info_.topk_); std::chrono::high_resolution_clock::time_point vector_start = std::chrono::high_resolution_clock::now(); @@ -105,8 +105,8 @@ PhyVectorSearchNode::GetOutput() { search_result.total_data_cnt_ = final_view.size(); - span.GetSpan()->SetAttribute( - "result_count", static_cast(search_result.seg_offsets_.size())); + // span.GetSpan()->SetAttribute( + // "result_count", static_cast(search_result.seg_offsets_.size())); query_context_->set_search_result(std::move(search_result)); std::chrono::high_resolution_clock::time_point vector_end = diff --git a/internal/core/src/index/BitmapIndex.cpp b/internal/core/src/index/BitmapIndex.cpp index e5dc68cbbcece..ccc18c6aa0ddd 100644 --- a/internal/core/src/index/BitmapIndex.cpp +++ b/internal/core/src/index/BitmapIndex.cpp @@ -597,7 +597,7 @@ BitmapIndex::Load(milvus::tracer::TraceContext ctx, const Config& config) { template const TargetBitmap BitmapIndex::In(const size_t n, const T* values) { - tracer::AutoSpan span("BitmapIndex::In", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::In", tracer::GetRootSpan()); AssertInfo(is_built_, "index has not been built"); TargetBitmap res(total_num_rows_, false); @@ -638,7 +638,7 @@ BitmapIndex::In(const size_t n, const T* values) { template const TargetBitmap BitmapIndex::NotIn(const size_t n, const T* values) { - tracer::AutoSpan span("BitmapIndex::NotIn", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::NotIn", tracer::GetRootSpan()); AssertInfo(is_built_, "index has not been built"); @@ -689,7 +689,7 @@ BitmapIndex::NotIn(const size_t n, const T* values) { template const TargetBitmap BitmapIndex::IsNull() { - tracer::AutoSpan span("BitmapIndex::IsNull", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::IsNull", tracer::GetRootSpan()); AssertInfo(is_built_, "index has not been built"); TargetBitmap res(total_num_rows_, true); @@ -701,7 +701,7 @@ BitmapIndex::IsNull() { template TargetBitmap BitmapIndex::IsNotNull() { - tracer::AutoSpan span("BitmapIndex::IsNotNull", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::IsNotNull", tracer::GetRootSpan()); AssertInfo(is_built_, "index has not been built"); TargetBitmap res(total_num_rows_, true); @@ -712,7 +712,7 @@ BitmapIndex::IsNotNull() { template TargetBitmap BitmapIndex::RangeForBitset(const T value, const OpType op) { - tracer::AutoSpan span("BitmapIndex::RangeForBitset", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::RangeForBitset", tracer::GetRootSpan()); AssertInfo(is_built_, "index has not been built"); TargetBitmap res(total_num_rows_, false); @@ -786,7 +786,7 @@ BitmapIndex::Range(const T value, OpType op) { template TargetBitmap BitmapIndex::RangeForMmap(const T value, const OpType op) { - tracer::AutoSpan span("BitmapIndex::RangeForMmap", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::RangeForMmap", tracer::GetRootSpan()); AssertInfo(is_built_, "index has not been built"); TargetBitmap res(total_num_rows_, false); @@ -850,8 +850,8 @@ BitmapIndex::RangeForMmap(const T value, const OpType op) { template TargetBitmap BitmapIndex::RangeForRoaring(const T value, const OpType op) { - tracer::AutoSpan span("BitmapIndex::RangeForRoaring", - tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::RangeForRoaring", + // tracer::GetRootSpan()); AssertInfo(is_built_, "index has not been built"); TargetBitmap res(total_num_rows_, false); @@ -917,7 +917,7 @@ BitmapIndex::RangeForBitset(const T lower_value, bool lb_inclusive, const T upper_value, bool ub_inclusive) { - tracer::AutoSpan span("BitmapIndex::RangeForBitset", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::RangeForBitset", tracer::GetRootSpan()); AssertInfo(is_built_, "index has not been built"); TargetBitmap res(total_num_rows_, false); @@ -995,7 +995,7 @@ BitmapIndex::RangeForMmap(const T lower_value, bool lb_inclusive, const T upper_value, bool ub_inclusive) { - tracer::AutoSpan span("BitmapIndex::RangeForMmap", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::RangeForMmap", tracer::GetRootSpan()); AssertInfo(is_built_, "index has not been built"); TargetBitmap res(total_num_rows_, false); @@ -1056,8 +1056,8 @@ BitmapIndex::RangeForRoaring(const T lower_value, bool lb_inclusive, const T upper_value, bool ub_inclusive) { - tracer::AutoSpan span("BitmapIndex::RangeForRoaring", - tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::RangeForRoaring", + // tracer::GetRootSpan()); AssertInfo(is_built_, "index has not been built"); TargetBitmap res(total_num_rows_, false); @@ -1132,7 +1132,7 @@ std::optional BitmapIndex::Reverse_Lookup(size_t idx) const { AssertInfo(is_built_, "index has not been built"); AssertInfo(idx < total_num_rows_, "out of range of total count"); - tracer::AutoSpan span("BitmapIndex::Reverse_Lookup", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::Reverse_Lookup", tracer::GetRootSpan()); if (!valid_bitset_[idx]) { return std::nullopt; @@ -1251,7 +1251,7 @@ template <> const TargetBitmap BitmapIndex::Query(const DatasetPtr& dataset) { AssertInfo(is_built_, "index has not been built"); - tracer::AutoSpan span("BitmapIndex::Query", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::Query", tracer::GetRootSpan()); auto op = dataset->Get(OPERATOR_TYPE); auto val = dataset->Get(MATCH_VALUE); @@ -1299,7 +1299,7 @@ template <> const TargetBitmap BitmapIndex::RegexQuery(const std::string& regex_pattern) { AssertInfo(is_built_, "index has not been built"); - tracer::AutoSpan span("BitmapIndex::RegexQuery", tracer::GetRootSpan()); + // tracer::AutoSpan span("BitmapIndex::RegexQuery", tracer::GetRootSpan()); RegexMatcher matcher(regex_pattern); TargetBitmap res(total_num_rows_, false); diff --git a/internal/core/src/index/InvertedIndexTantivy.cpp b/internal/core/src/index/InvertedIndexTantivy.cpp index c873fd2eacec1..716113942dfc3 100644 --- a/internal/core/src/index/InvertedIndexTantivy.cpp +++ b/internal/core/src/index/InvertedIndexTantivy.cpp @@ -286,7 +286,7 @@ InvertedIndexTantivy::RetainTantivyIndexFiles( template const TargetBitmap InvertedIndexTantivy::In(size_t n, const T* values) { - tracer::AutoSpan span("InvertedIndexTantivy::In", tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::In", tracer::GetRootSpan()); TargetBitmap bitset(Count()); wrapper_->terms_query(values, n, &bitset); return bitset; @@ -295,8 +295,8 @@ InvertedIndexTantivy::In(size_t n, const T* values) { template const TargetBitmap InvertedIndexTantivy::IsNull() { - tracer::AutoSpan span("InvertedIndexTantivy::IsNull", - tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::IsNull", + // tracer::GetRootSpan()); int64_t count = Count(); TargetBitmap bitset(count); @@ -321,8 +321,8 @@ InvertedIndexTantivy::IsNull() { template TargetBitmap InvertedIndexTantivy::IsNotNull() { - tracer::AutoSpan span("InvertedIndexTantivy::IsNotNull", - tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::IsNotNull", + // tracer::GetRootSpan()); int64_t count = Count(); TargetBitmap bitset(count, true); @@ -348,8 +348,8 @@ template const TargetBitmap InvertedIndexTantivy::InApplyFilter( size_t n, const T* values, const std::function& filter) { - tracer::AutoSpan span("InvertedIndexTantivy::InApplyFilter", - tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::InApplyFilter", + // tracer::GetRootSpan()); TargetBitmap bitset(Count()); wrapper_->terms_query(values, n, &bitset); // todo(SpadeA): could push-down the filter to tantivy query @@ -361,8 +361,8 @@ template void InvertedIndexTantivy::InApplyCallback( size_t n, const T* values, const std::function& callback) { - tracer::AutoSpan span("InvertedIndexTantivy::InApplyCallback", - tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::InApplyCallback", + // tracer::GetRootSpan()); TargetBitmap bitset(Count()); wrapper_->terms_query(values, n, &bitset); // todo(SpadeA): could push-down the callback to tantivy query @@ -372,7 +372,7 @@ InvertedIndexTantivy::InApplyCallback( template const TargetBitmap InvertedIndexTantivy::NotIn(size_t n, const T* values) { - tracer::AutoSpan span("InvertedIndexTantivy::NotIn", tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::NotIn", tracer::GetRootSpan()); int64_t count = Count(); TargetBitmap bitset(count); wrapper_->terms_query(values, n, &bitset); @@ -400,7 +400,7 @@ InvertedIndexTantivy::NotIn(size_t n, const T* values) { template const TargetBitmap InvertedIndexTantivy::Range(T value, OpType op) { - tracer::AutoSpan span("InvertedIndexTantivy::Range", tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::Range", tracer::GetRootSpan()); TargetBitmap bitset(Count()); switch (op) { @@ -430,8 +430,8 @@ InvertedIndexTantivy::Range(T lower_bound_value, bool lb_inclusive, T upper_bound_value, bool ub_inclusive) { - tracer::AutoSpan span("InvertedIndexTantivy::RangeWithBounds", - tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::RangeWithBounds", + // tracer::GetRootSpan()); TargetBitmap bitset(Count()); wrapper_->range_query(lower_bound_value, upper_bound_value, @@ -444,8 +444,8 @@ InvertedIndexTantivy::Range(T lower_bound_value, template const TargetBitmap InvertedIndexTantivy::PrefixMatch(const std::string_view prefix) { - tracer::AutoSpan span("InvertedIndexTantivy::PrefixMatch", - tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::PrefixMatch", + // tracer::GetRootSpan()); TargetBitmap bitset(Count()); std::string s(prefix); wrapper_->prefix_query(s, &bitset); @@ -461,7 +461,7 @@ InvertedIndexTantivy::Query(const DatasetPtr& dataset) { template <> const TargetBitmap InvertedIndexTantivy::Query(const DatasetPtr& dataset) { - tracer::AutoSpan span("InvertedIndexTantivy::Query", tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::Query", tracer::GetRootSpan()); auto op = dataset->Get(OPERATOR_TYPE); if (op == OpType::PrefixMatch) { auto prefix = dataset->Get(MATCH_VALUE); @@ -473,8 +473,8 @@ InvertedIndexTantivy::Query(const DatasetPtr& dataset) { template const TargetBitmap InvertedIndexTantivy::RegexQuery(const std::string& regex_pattern) { - tracer::AutoSpan span("InvertedIndexTantivy::RegexQuery", - tracer::GetRootSpan()); + // tracer::AutoSpan span("InvertedIndexTantivy::RegexQuery", + // tracer::GetRootSpan()); TargetBitmap bitset(Count()); wrapper_->regex_query(regex_pattern, &bitset); return bitset; diff --git a/internal/core/src/index/JsonFlatIndex.h b/internal/core/src/index/JsonFlatIndex.h index 6464912c71fda..66a82811f1708 100644 --- a/internal/core/src/index/JsonFlatIndex.h +++ b/internal/core/src/index/JsonFlatIndex.h @@ -36,8 +36,8 @@ class JsonFlatIndexQueryExecutor : public InvertedIndexTantivy { const TargetBitmap In(size_t n, const T* values) override { - tracer::AutoSpan span("JsonFlatIndexQueryExecutor::In", - tracer::GetRootSpan()); + // tracer::AutoSpan span("JsonFlatIndexQueryExecutor::In", + // tracer::GetRootSpan()); TargetBitmap bitset(this->Count()); for (size_t i = 0; i < n; ++i) { this->wrapper_->json_term_query(json_path_, values[i], &bitset); @@ -47,8 +47,8 @@ class JsonFlatIndexQueryExecutor : public InvertedIndexTantivy { TargetBitmap Exists() { - tracer::AutoSpan span("JsonFlatIndexQueryExecutor::Exists", - tracer::GetRootSpan()); + // tracer::AutoSpan span("JsonFlatIndexQueryExecutor::Exists", + // tracer::GetRootSpan()); TargetBitmap bitset(this->Count()); this->wrapper_->json_exist_query(json_path_, &bitset); return bitset; @@ -59,8 +59,8 @@ class JsonFlatIndexQueryExecutor : public InvertedIndexTantivy { size_t n, const T* values, const std::function& filter) override { - tracer::AutoSpan span("JsonFlatIndexQueryExecutor::InApplyFilter", - tracer::GetRootSpan()); + // tracer::AutoSpan span("JsonFlatIndexQueryExecutor::InApplyFilter", + // tracer::GetRootSpan()); TargetBitmap bitset(this->Count()); for (size_t i = 0; i < n; ++i) { this->wrapper_->json_term_query(json_path_, values[i], &bitset); @@ -74,8 +74,8 @@ class JsonFlatIndexQueryExecutor : public InvertedIndexTantivy { size_t n, const T* values, const std::function& callback) override { - tracer::AutoSpan span("JsonFlatIndexQueryExecutor::InApplyCallback", - tracer::GetRootSpan()); + // tracer::AutoSpan span("JsonFlatIndexQueryExecutor::InApplyCallback", + // tracer::GetRootSpan()); TargetBitmap bitset(this->Count()); for (size_t i = 0; i < n; ++i) { this->wrapper_->json_term_query(json_path_, values[i], &bitset); @@ -85,8 +85,8 @@ class JsonFlatIndexQueryExecutor : public InvertedIndexTantivy { const TargetBitmap NotIn(size_t n, const T* values) override { - tracer::AutoSpan span("JsonFlatIndexQueryExecutor::NotIn", - tracer::GetRootSpan()); + // tracer::AutoSpan span("JsonFlatIndexQueryExecutor::NotIn", + // tracer::GetRootSpan()); TargetBitmap bitset(this->Count()); for (size_t i = 0; i < n; ++i) { this->wrapper_->json_term_query(json_path_, values[i], &bitset); @@ -104,8 +104,8 @@ class JsonFlatIndexQueryExecutor : public InvertedIndexTantivy { const TargetBitmap Range(T value, OpType op) override { LOG_INFO("[executor] JsonFlatIndexQueryExecutor Range"); - tracer::AutoSpan span("JsonFlatIndexQueryExecutor::Range", - tracer::GetRootSpan()); + // tracer::AutoSpan span("JsonFlatIndexQueryExecutor::Range", + // tracer::GetRootSpan()); TargetBitmap bitset(this->Count()); switch (op) { case OpType::LessThan: { @@ -141,8 +141,8 @@ class JsonFlatIndexQueryExecutor : public InvertedIndexTantivy { bool lb_inclusive, T upper_bound_value, bool ub_inclusive) override { - tracer::AutoSpan span("JsonFlatIndexQueryExecutor::RangeWithBounds", - tracer::GetRootSpan()); + // tracer::AutoSpan span("JsonFlatIndexQueryExecutor::RangeWithBounds", + // tracer::GetRootSpan()); TargetBitmap bitset(this->Count()); this->wrapper_->json_range_query(json_path_, lower_bound_value, @@ -157,8 +157,8 @@ class JsonFlatIndexQueryExecutor : public InvertedIndexTantivy { const TargetBitmap PrefixMatch(const std::string_view prefix) override { - tracer::AutoSpan span("JsonFlatIndexQueryExecutor::PrefixMatch", - tracer::GetRootSpan()); + // tracer::AutoSpan span("JsonFlatIndexQueryExecutor::PrefixMatch", + // tracer::GetRootSpan()); TargetBitmap bitset(this->Count()); this->wrapper_->json_prefix_query( json_path_, std::string(prefix), &bitset); @@ -167,8 +167,8 @@ class JsonFlatIndexQueryExecutor : public InvertedIndexTantivy { const TargetBitmap RegexQuery(const std::string& pattern) override { - tracer::AutoSpan span("JsonFlatIndexQueryExecutor::RegexQuery", - tracer::GetRootSpan()); + // tracer::AutoSpan span("JsonFlatIndexQueryExecutor::RegexQuery", + // tracer::GetRootSpan()); TargetBitmap bitset(this->Count()); this->wrapper_->json_regex_query(json_path_, pattern, &bitset); return bitset; diff --git a/internal/core/src/index/NgramInvertedIndex.cpp b/internal/core/src/index/NgramInvertedIndex.cpp index a564dc5b4b0a2..79576cb7b4121 100644 --- a/internal/core/src/index/NgramInvertedIndex.cpp +++ b/internal/core/src/index/NgramInvertedIndex.cpp @@ -178,8 +178,8 @@ std::optional NgramInvertedIndex::ExecuteQuery(const std::string& literal, proto::plan::OpType op_type, exec::SegmentExpr* segment) { - tracer::AutoSpan span( - "NgramInvertedIndex::ExecuteQuery", tracer::GetRootSpan(), true); + // tracer::AutoSpan span( + // "NgramInvertedIndex::ExecuteQuery", tracer::GetRootSpan(), true); if (literal.length() < min_gram_) { return std::nullopt; } @@ -188,11 +188,11 @@ NgramInvertedIndex::ExecuteQuery(const std::string& literal, case proto::plan::OpType::Match: return MatchQuery(literal, segment); case proto::plan::OpType::InnerMatch: { - span.GetSpan()->SetAttribute("op_type", "InnerMatch"); - span.GetSpan()->SetAttribute("query_literal_length", - static_cast(literal.length())); - span.GetSpan()->SetAttribute("min_gram", min_gram_); - span.GetSpan()->SetAttribute("max_gram", max_gram_); + // span.GetSpan()->SetAttribute("op_type", "InnerMatch"); + // span.GetSpan()->SetAttribute("query_literal_length", + // static_cast(literal.length())); + // span.GetSpan()->SetAttribute("min_gram", min_gram_); + // span.GetSpan()->SetAttribute("max_gram", max_gram_); bool need_post_filter = literal.length() > max_gram_; if (schema_.data_type() == proto::schema::DataType::JSON) { @@ -218,11 +218,11 @@ NgramInvertedIndex::ExecuteQuery(const std::string& literal, } } case proto::plan::OpType::PrefixMatch: { - span.GetSpan()->SetAttribute("op_type", "PrefixMatch"); - span.GetSpan()->SetAttribute("query_literal_length", - static_cast(literal.length())); - span.GetSpan()->SetAttribute("min_gram", min_gram_); - span.GetSpan()->SetAttribute("max_gram", max_gram_); + // span.GetSpan()->SetAttribute("op_type", "PrefixMatch"); + // span.GetSpan()->SetAttribute("query_literal_length", + // static_cast(literal.length())); + // span.GetSpan()->SetAttribute("min_gram", min_gram_); + // span.GetSpan()->SetAttribute("max_gram", max_gram_); if (schema_.data_type() == proto::schema::DataType::JSON) { auto predicate = [&literal, this](const milvus::Json& data) { auto x = @@ -251,11 +251,11 @@ NgramInvertedIndex::ExecuteQuery(const std::string& literal, } } case proto::plan::OpType::PostfixMatch: { - span.GetSpan()->SetAttribute("op_type", "PostfixMatch"); - span.GetSpan()->SetAttribute("query_literal_length", - static_cast(literal.length())); - span.GetSpan()->SetAttribute("min_gram", min_gram_); - span.GetSpan()->SetAttribute("max_gram", max_gram_); + // span.GetSpan()->SetAttribute("op_type", "PostfixMatch"); + // span.GetSpan()->SetAttribute("query_literal_length", + // static_cast(literal.length())); + // span.GetSpan()->SetAttribute("min_gram", min_gram_); + // span.GetSpan()->SetAttribute("max_gram", max_gram_); if (schema_.data_type() == proto::schema::DataType::JSON) { auto predicate = [&literal, this](const milvus::Json& data) { auto x = diff --git a/internal/core/src/index/StringIndexMarisa.cpp b/internal/core/src/index/StringIndexMarisa.cpp index 2d56f61420e9a..38a1526ed95e9 100644 --- a/internal/core/src/index/StringIndexMarisa.cpp +++ b/internal/core/src/index/StringIndexMarisa.cpp @@ -303,7 +303,7 @@ StringIndexMarisa::Load(milvus::tracer::TraceContext ctx, const TargetBitmap StringIndexMarisa::In(size_t n, const std::string* values) { - tracer::AutoSpan span("StringIndexMarisa::In", tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::In", tracer::GetRootSpan()); TargetBitmap bitset(str_ids_.size()); for (size_t i = 0; i < n; i++) { auto str = values[i]; @@ -320,7 +320,7 @@ StringIndexMarisa::In(size_t n, const std::string* values) { const TargetBitmap StringIndexMarisa::NotIn(size_t n, const std::string* values) { - tracer::AutoSpan span("StringIndexMarisa::NotIn", tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::NotIn", tracer::GetRootSpan()); TargetBitmap bitset(str_ids_.size(), true); for (size_t i = 0; i < n; i++) { auto str = values[i]; @@ -339,7 +339,7 @@ StringIndexMarisa::NotIn(size_t n, const std::string* values) { const TargetBitmap StringIndexMarisa::IsNull() { - tracer::AutoSpan span("StringIndexMarisa::IsNull", tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::IsNull", tracer::GetRootSpan()); TargetBitmap bitset(str_ids_.size()); SetNull(bitset); return bitset; @@ -347,7 +347,7 @@ StringIndexMarisa::IsNull() { void StringIndexMarisa::SetNull(TargetBitmap& bitset) { - tracer::AutoSpan span("StringIndexMarisa::SetNull", tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::SetNull", tracer::GetRootSpan()); for (size_t i = 0; i < bitset.size(); i++) { if (str_ids_[i] == MARISA_NULL_KEY_ID) { bitset.set(i); @@ -357,8 +357,8 @@ StringIndexMarisa::SetNull(TargetBitmap& bitset) { void StringIndexMarisa::ResetNull(TargetBitmap& bitset) { - tracer::AutoSpan span("StringIndexMarisa::ResetNull", - tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::ResetNull", + // tracer::GetRootSpan()); for (size_t i = 0; i < bitset.size(); i++) { if (str_ids_[i] == MARISA_NULL_KEY_ID) { bitset.reset(i); @@ -368,8 +368,8 @@ StringIndexMarisa::ResetNull(TargetBitmap& bitset) { TargetBitmap StringIndexMarisa::IsNotNull() { - tracer::AutoSpan span("StringIndexMarisa::IsNotNull", - tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::IsNotNull", + // tracer::GetRootSpan()); TargetBitmap bitset(str_ids_.size()); for (size_t i = 0; i < bitset.size(); i++) { if (str_ids_[i] != MARISA_NULL_KEY_ID) { @@ -381,7 +381,7 @@ StringIndexMarisa::IsNotNull() { const TargetBitmap StringIndexMarisa::Range(std::string value, OpType op) { - tracer::AutoSpan span("StringIndexMarisa::Range", tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::Range", tracer::GetRootSpan()); auto count = Count(); TargetBitmap bitset(count); std::vector ids; @@ -504,7 +504,7 @@ StringIndexMarisa::Range(std::string lower_bound_value, bool lb_inclusive, std::string upper_bound_value, bool ub_inclusive) { - tracer::AutoSpan span("StringIndexMarisa::Range", tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::Range", tracer::GetRootSpan()); auto count = Count(); TargetBitmap bitset(count); if (lower_bound_value.compare(upper_bound_value) > 0 || @@ -556,8 +556,8 @@ StringIndexMarisa::Range(std::string lower_bound_value, const TargetBitmap StringIndexMarisa::PrefixMatch(std::string_view prefix) { - tracer::AutoSpan span("StringIndexMarisa::PrefixMatch", - tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::PrefixMatch", + // tracer::GetRootSpan()); TargetBitmap bitset(str_ids_.size()); auto matched = prefix_match(prefix); for (const auto str_id : matched) { @@ -610,8 +610,8 @@ StringIndexMarisa::lookup(const std::string_view str) { std::vector StringIndexMarisa::prefix_match(const std::string_view prefix) { - tracer::AutoSpan span("StringIndexMarisa::prefix_match", - tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::prefix_match", + // tracer::GetRootSpan()); std::vector ret; marisa::Agent agent; agent.set_query(prefix.data()); @@ -622,8 +622,8 @@ StringIndexMarisa::prefix_match(const std::string_view prefix) { } std::optional StringIndexMarisa::Reverse_Lookup(size_t offset) const { - tracer::AutoSpan span("StringIndexMarisa::Reverse_Lookup", - tracer::GetRootSpan()); + // tracer::AutoSpan span("StringIndexMarisa::Reverse_Lookup", + // tracer::GetRootSpan()); AssertInfo(offset < str_ids_.size(), "out of range of total count"); marisa::Agent agent; if (str_ids_[offset] < 0) { diff --git a/internal/core/src/index/TextMatchIndex.cpp b/internal/core/src/index/TextMatchIndex.cpp index 43669352d1323..584656a3dd9ff 100644 --- a/internal/core/src/index/TextMatchIndex.cpp +++ b/internal/core/src/index/TextMatchIndex.cpp @@ -304,7 +304,7 @@ TextMatchIndex::RegisterTokenizer(const char* tokenizer_name, TargetBitmap TextMatchIndex::MatchQuery(const std::string& query, uint32_t min_should_match) { - tracer::AutoSpan span("TextMatchIndex::MatchQuery", tracer::GetRootSpan()); + // tracer::AutoSpan span("TextMatchIndex::MatchQuery", tracer::GetRootSpan()); if (shouldTriggerCommit()) { Commit(); Reload(); @@ -320,8 +320,8 @@ TextMatchIndex::MatchQuery(const std::string& query, TargetBitmap TextMatchIndex::PhraseMatchQuery(const std::string& query, uint32_t slop) { - tracer::AutoSpan span("TextMatchIndex::PhraseMatchQuery", - tracer::GetRootSpan()); + // tracer::AutoSpan span("TextMatchIndex::PhraseMatchQuery", + // tracer::GetRootSpan()); if (shouldTriggerCommit()) { Commit(); Reload(); diff --git a/internal/core/src/index/VectorMemIndex.cpp b/internal/core/src/index/VectorMemIndex.cpp index 2de98b4d00dde..042cd44c072e2 100644 --- a/internal/core/src/index/VectorMemIndex.cpp +++ b/internal/core/src/index/VectorMemIndex.cpp @@ -481,10 +481,10 @@ VectorMemIndex::Query(const DatasetPtr dataset, auto index_type = GetIndexType(); if (CheckAndUpdateKnowhereRangeSearchParam( search_info, topk, GetMetricType(), search_conf)) { - milvus::tracer::AddEvent("start_knowhere_index_range_search"); + // milvus::tracer::AddEvent("start_knowhere_index_range_search"); auto res = index_.RangeSearch(dataset, search_conf, bitset, op_context); - milvus::tracer::AddEvent("finish_knowhere_index_range_search"); + // milvus::tracer::AddEvent("finish_knowhere_index_range_search"); if (!res.has_value()) { ThrowInfo(ErrorCode::UnexpectedError, "failed to range search: {}: {}", @@ -493,12 +493,12 @@ VectorMemIndex::Query(const DatasetPtr dataset, } auto result = ReGenRangeSearchResult( res.value(), topk, num_vectors, GetMetricType()); - milvus::tracer::AddEvent("finish_ReGenRangeSearchResult"); + // milvus::tracer::AddEvent("finish_ReGenRangeSearchResult"); return result; } else { - milvus::tracer::AddEvent("start_knowhere_index_search"); + // milvus::tracer::AddEvent("start_knowhere_index_search"); auto res = index_.Search(dataset, search_conf, bitset, op_context); - milvus::tracer::AddEvent("finish_knowhere_index_search"); + // milvus::tracer::AddEvent("finish_knowhere_index_search"); if (!res.has_value()) { ThrowInfo( ErrorCode::UnexpectedError, diff --git a/internal/core/src/query/ExecPlanNodeVisitor.cpp b/internal/core/src/query/ExecPlanNodeVisitor.cpp index f918c475eca1c..9568d9c22c06f 100644 --- a/internal/core/src/query/ExecPlanNodeVisitor.cpp +++ b/internal/core/src/query/ExecPlanNodeVisitor.cpp @@ -40,9 +40,9 @@ BitsetType ExecPlanNodeVisitor::ExecuteTask( plan::PlanFragment& plan, std::shared_ptr query_context) { - tracer::AutoSpan span("ExecuteTask", tracer::GetRootSpan(), true); - span.GetSpan()->SetAttribute("active_count", - query_context->get_active_count()); + // tracer::AutoSpan span("ExecuteTask", tracer::GetRootSpan(), true); + // span.GetSpan()->SetAttribute("active_count", + // query_context->get_active_count()); LOG_DEBUG("plannode: {}, active_count: {}, timestamp: {}", plan.plan_node_->ToString(), @@ -71,8 +71,8 @@ ExecPlanNodeVisitor::ExecuteTask( } } - span.GetSpan()->SetAttribute("total_rows", processed_num); - span.GetSpan()->SetAttribute("matched_rows", bitset_holder.count()); + // span.GetSpan()->SetAttribute("total_rows", processed_num); + // span.GetSpan()->SetAttribute("matched_rows", bitset_holder.count()); return bitset_holder; } @@ -141,7 +141,7 @@ ExecPlanNodeVisitor::visit(RetrievePlanNode& node) { op_context.storage_usage.scanned_total_bytes.load(); } else { retrieve_result.total_data_cnt_ = bitset_holder.size(); - tracer::AutoSpan _("Find Limit Pk", tracer::GetRootSpan(), true); + // tracer::AutoSpan _("Find Limit Pk", tracer::GetRootSpan(), true); auto results_pair = segment->find_first(node.limit_, bitset_holder); retrieve_result.result_offsets_ = std::move(results_pair.first); retrieve_result.has_more_result = results_pair.second; diff --git a/internal/core/src/query/SearchBruteForce.cpp b/internal/core/src/query/SearchBruteForce.cpp index cfae1f2507df9..7eb7f0b7d8bc2 100644 --- a/internal/core/src/query/SearchBruteForce.cpp +++ b/internal/core/src/query/SearchBruteForce.cpp @@ -186,7 +186,7 @@ BruteForceSearch(const dataset::SearchDataset& query_ds, "Unsupported dataType for chunk brute force range search:{}", data_type); } - milvus::tracer::AddEvent("knowhere_finish_BruteForce_RangeSearch"); + // milvus::tracer::AddEvent("knowhere_finish_BruteForce_RangeSearch"); if (!res.has_value()) { ThrowInfo(KnowhereError, "Brute force range search fail: {}, {}", @@ -195,7 +195,7 @@ BruteForceSearch(const dataset::SearchDataset& query_ds, } auto result = ReGenRangeSearchResult(res.value(), topk, nq, query_ds.metric_type); - milvus::tracer::AddEvent("ReGenRangeSearchResult"); + // milvus::tracer::AddEvent("ReGenRangeSearchResult"); std::copy_n( GetDatasetIDs(result), nq * topk, sub_result.get_seg_offsets()); std::copy_n( @@ -261,7 +261,7 @@ BruteForceSearch(const dataset::SearchDataset& query_ds, "Unsupported dataType for chunk brute force search:{}", data_type); } - milvus::tracer::AddEvent("knowhere_finish_BruteForce_SearchWithBuf"); + // milvus::tracer::AddEvent("knowhere_finish_BruteForce_SearchWithBuf"); if (stat != knowhere::Status::success) { ThrowInfo(KnowhereError, "Brute force search fail: " + KnowhereStatusString(stat)); diff --git a/internal/core/src/segcore/ChunkedSegmentSealedImpl.cpp b/internal/core/src/segcore/ChunkedSegmentSealedImpl.cpp index b2b7f0e363c9a..4b0ff548a3c04 100644 --- a/internal/core/src/segcore/ChunkedSegmentSealedImpl.cpp +++ b/internal/core/src/segcore/ChunkedSegmentSealedImpl.cpp @@ -872,8 +872,8 @@ ChunkedSegmentSealedImpl::vector_search(SearchInfo& search_info, bitset, op_context, output); - milvus::tracer::AddEvent( - "finish_searching_vector_temperate_binlog_index"); + // milvus::tracer::AddEvent( + // "finish_searching_vector_temperate_binlog_index"); } else if (get_bit(index_ready_bitset_, field_id)) { AssertInfo(vector_indexings_.is_ready(field_id), "vector indexes isn't ready for field " + @@ -887,7 +887,7 @@ ChunkedSegmentSealedImpl::vector_search(SearchInfo& search_info, bitset, op_context, output); - milvus::tracer::AddEvent("finish_searching_vector_index"); + // milvus::tracer::AddEvent("finish_searching_vector_index"); } else { AssertInfo( get_bit(field_data_ready_bitset_, field_id), @@ -916,7 +916,7 @@ ChunkedSegmentSealedImpl::vector_search(SearchInfo& search_info, bitset, op_context, output); - milvus::tracer::AddEvent("finish_searching_vector_data"); + // milvus::tracer::AddEvent("finish_searching_vector_data"); } } diff --git a/internal/core/src/segcore/SegmentInterface.cpp b/internal/core/src/segcore/SegmentInterface.cpp index 491c0c0bfd1a8..3aec7c09c08d2 100644 --- a/internal/core/src/segcore/SegmentInterface.cpp +++ b/internal/core/src/segcore/SegmentInterface.cpp @@ -100,7 +100,7 @@ SegmentInternalInterface::Search( int32_t consistency_level, Timestamp collection_ttl) const { std::shared_lock lck(mutex_); - milvus::tracer::AddEvent("obtained_segment_lock_mutex"); + // milvus::tracer::AddEvent("obtained_segment_lock_mutex"); check_search(plan); query::ExecPlanNodeVisitor visitor(*this, timestamp, @@ -124,7 +124,7 @@ SegmentInternalInterface::Retrieve(tracer::TraceContext* trace_ctx, int32_t consistency_level, Timestamp collection_ttl) const { std::shared_lock lck(mutex_); - tracer::AutoSpan span("Retrieve", tracer::GetRootSpan(), true); + // tracer::AutoSpan span("Retrieve", tracer::GetRootSpan(), true); auto results = std::make_unique(); query::ExecPlanNodeVisitor visitor( *this, timestamp, cancel_token, consistency_level, collection_ttl); @@ -187,7 +187,7 @@ SegmentInternalInterface::FillTargetEntry( int64_t size, bool ignore_non_pk, bool fill_ids) const { - tracer::AutoSpan span("FillTargetEntry", tracer::GetRootSpan()); + // tracer::AutoSpan span("FillTargetEntry", tracer::GetRootSpan()); auto fields_data = results->mutable_fields_data(); auto ids = results->mutable_ids(); @@ -295,7 +295,7 @@ SegmentInternalInterface::Retrieve(tracer::TraceContext* trace_ctx, const int64_t* offsets, int64_t size) const { std::shared_lock lck(mutex_); - tracer::AutoSpan span("RetrieveByOffsets", tracer::GetRootSpan()); + // tracer::AutoSpan span("RetrieveByOffsets", tracer::GetRootSpan()); auto results = std::make_unique(); std::chrono::high_resolution_clock::time_point get_target_entry_start = std::chrono::high_resolution_clock::now(); diff --git a/internal/core/src/segcore/reduce/Reduce.cpp b/internal/core/src/segcore/reduce/Reduce.cpp index ef27eb7307a3f..6b9491e3649de 100644 --- a/internal/core/src/segcore/reduce/Reduce.cpp +++ b/internal/core/src/segcore/reduce/Reduce.cpp @@ -66,7 +66,7 @@ ReduceHelper::Reduce() { void ReduceHelper::Marshal() { - tracer::AutoSpan span("ReduceHelper::Marshal", tracer::GetRootSpan()); + // tracer::AutoSpan span("ReduceHelper::Marshal", tracer::GetRootSpan()); // get search result data blobs of slices search_result_data_blobs_ = std::make_unique(); @@ -130,8 +130,8 @@ ReduceHelper::FilterInvalidSearchResult(SearchResult* search_result) { void ReduceHelper::FillPrimaryKey() { - tracer::AutoSpan span("ReduceHelper::FillPrimaryKey", - tracer::GetRootSpan()); + // tracer::AutoSpan span("ReduceHelper::FillPrimaryKey", + // tracer::GetRootSpan()); // get primary keys for duplicates removal uint32_t valid_index = 0; for (auto& search_result : search_results_) { @@ -154,8 +154,8 @@ ReduceHelper::FillPrimaryKey() { void ReduceHelper::SortEqualScoresByPks() { - tracer::AutoSpan span("ReduceHelper::SortEqualScoresByPks", - tracer::GetRootSpan()); + // tracer::AutoSpan span("ReduceHelper::SortEqualScoresByPks", + // tracer::GetRootSpan()); for (auto& search_result : search_results_) { for (int64_t i = 0; i < search_result->total_nq_; i++) { auto nq_begin = search_result->topk_per_nq_prefix_sum_[i]; @@ -231,8 +231,8 @@ ReduceHelper::SortEqualScoresOneNQ(size_t nq_begin, void ReduceHelper::RefreshSearchResults() { - tracer::AutoSpan span("ReduceHelper::RefreshSearchResults", - tracer::GetRootSpan()); + // tracer::AutoSpan span("ReduceHelper::RefreshSearchResults", + // tracer::GetRootSpan()); for (int i = 0; i < num_segments_; i++) { std::vector real_topks(total_nq_, 0); auto search_result = search_results_[i]; @@ -269,7 +269,7 @@ ReduceHelper::RefreshSingleSearchResult(SearchResult* search_result, void ReduceHelper::FillEntryData() { - tracer::AutoSpan span("ReduceHelper::FillEntryData", tracer::GetRootSpan()); + // tracer::AutoSpan span("ReduceHelper::FillEntryData", tracer::GetRootSpan()); for (auto search_result : search_results_) { auto segment = static_cast( search_result->segment_); @@ -349,8 +349,8 @@ ReduceHelper::ReduceSearchResultForOneNQ(int64_t qi, void ReduceHelper::ReduceResultData() { - tracer::AutoSpan span("ReduceHelper::ReduceResultData", - tracer::GetRootSpan()); + // tracer::AutoSpan span("ReduceHelper::ReduceResultData", + // tracer::GetRootSpan()); for (int i = 0; i < num_segments_; i++) { auto search_result = search_results_[i]; auto result_count = search_result->get_total_result_count(); diff --git a/internal/core/src/segcore/reduce_c.cpp b/internal/core/src/segcore/reduce_c.cpp index a059feb4faf39..f5a9892c0c667 100644 --- a/internal/core/src/segcore/reduce_c.cpp +++ b/internal/core/src/segcore/reduce_c.cpp @@ -98,8 +98,8 @@ ReduceSearchResultsAndFillData(CTraceContext c_trace, AssertInfo(num_segments > 0, "num_segments must be greater than 0"); auto trace_ctx = milvus::tracer::TraceContext{ c_trace.traceID, c_trace.spanID, c_trace.traceFlags}; - milvus::tracer::AutoSpan span( - "ReduceSearchResultsAndFillData", &trace_ctx, true); + // milvus::tracer::AutoSpan span( + // "ReduceSearchResultsAndFillData", &trace_ctx, true); std::vector search_results(num_segments); for (int i = 0; i < num_segments; ++i) { search_results[i] = static_cast(c_search_results[i]); diff --git a/internal/core/src/segcore/segment_c.cpp b/internal/core/src/segcore/segment_c.cpp index 45e74caca820f..37fc5a6959079 100644 --- a/internal/core/src/segcore/segment_c.cpp +++ b/internal/core/src/segcore/segment_c.cpp @@ -338,7 +338,7 @@ AsyncRetrieve(CTraceContext c_trace, collection_ttl](folly::CancellationToken cancel_token) { auto trace_ctx = milvus::tracer::TraceContext{ c_trace.traceID, c_trace.spanID, c_trace.traceFlags}; - milvus::tracer::AutoSpan span("SegCoreRetrieve", &trace_ctx, true); + // milvus::tracer::AutoSpan span("SegCoreRetrieve", &trace_ctx, true); segment->LazyCheckSchema(plan->schema_); @@ -374,8 +374,8 @@ AsyncRetrieveByOffsets(CTraceContext c_trace, folly::CancellationToken cancel_token) { auto trace_ctx = milvus::tracer::TraceContext{ c_trace.traceID, c_trace.spanID, c_trace.traceFlags}; - milvus::tracer::AutoSpan span( - "SegCoreRetrieveByOffsets", &trace_ctx, true); + // milvus::tracer::AutoSpan span( + // "SegCoreRetrieveByOffsets", &trace_ctx, true); auto retrieve_result = segment->Retrieve(&trace_ctx, plan, offsets, len);