Skip to content

Commit 73512c7

Browse files
authored
Remove calc_distance (milvus-io#25663)
Signed-off-by: Yudong Cai <yudong.cai@zilliz.com>
1 parent 9a61c02 commit 73512c7

36 files changed

Lines changed: 240 additions & 1753 deletions

internal/proxy/impl.go

Lines changed: 6 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -3150,88 +3150,12 @@ func (node *Proxy) AlterAlias(ctx context.Context, request *milvuspb.AlterAliasR
31503150

31513151
// CalcDistance calculates the distances between vectors.
31523152
func (node *Proxy) CalcDistance(ctx context.Context, request *milvuspb.CalcDistanceRequest) (*milvuspb.CalcDistanceResults, error) {
3153-
if !node.checkHealthy() {
3154-
return &milvuspb.CalcDistanceResults{
3155-
Status: unhealthyStatus(),
3156-
}, nil
3157-
}
3158-
3159-
ctx, sp := otel.Tracer(typeutil.ProxyRole).Start(ctx, "Proxy-CalcDistance")
3160-
defer sp.End()
3161-
3162-
query := func(ids *milvuspb.VectorIDs) (*milvuspb.QueryResults, error) {
3163-
outputFields := []string{ids.FieldName}
3164-
3165-
queryRequest := &milvuspb.QueryRequest{
3166-
DbName: "",
3167-
CollectionName: ids.CollectionName,
3168-
PartitionNames: ids.PartitionNames,
3169-
OutputFields: outputFields,
3170-
}
3171-
3172-
qt := &queryTask{
3173-
ctx: ctx,
3174-
Condition: NewTaskCondition(ctx),
3175-
RetrieveRequest: &internalpb.RetrieveRequest{
3176-
Base: commonpbutil.NewMsgBase(
3177-
commonpbutil.WithMsgType(commonpb.MsgType_Retrieve),
3178-
commonpbutil.WithSourceID(paramtable.GetNodeID()),
3179-
),
3180-
ReqID: paramtable.GetNodeID(),
3181-
},
3182-
request: queryRequest,
3183-
qc: node.queryCoord,
3184-
ids: ids.IdArray,
3185-
}
3186-
3187-
log := log.Ctx(ctx).With(
3188-
zap.String("collection", queryRequest.CollectionName),
3189-
zap.Any("partitions", queryRequest.PartitionNames),
3190-
zap.Any("OutputFields", queryRequest.OutputFields))
3191-
3192-
err := node.sched.dqQueue.Enqueue(qt)
3193-
if err != nil {
3194-
log.Error("CalcDistance queryTask failed to enqueue",
3195-
zap.Error(err))
3196-
3197-
return &milvuspb.QueryResults{
3198-
Status: &commonpb.Status{
3199-
ErrorCode: commonpb.ErrorCode_UnexpectedError,
3200-
Reason: err.Error(),
3201-
},
3202-
}, err
3203-
}
3204-
3205-
log.Debug("CalcDistance queryTask enqueued")
3206-
3207-
err = qt.WaitToFinish()
3208-
if err != nil {
3209-
log.Error("CalcDistance queryTask failed to WaitToFinish",
3210-
zap.Error(err))
3211-
3212-
return &milvuspb.QueryResults{
3213-
Status: &commonpb.Status{
3214-
ErrorCode: commonpb.ErrorCode_UnexpectedError,
3215-
Reason: err.Error(),
3216-
},
3217-
}, err
3218-
}
3219-
3220-
log.Debug("CalcDistance queryTask Done")
3221-
3222-
return &milvuspb.QueryResults{
3223-
Status: qt.result.Status,
3224-
FieldsData: qt.result.FieldsData,
3225-
}, nil
3226-
}
3227-
3228-
// calcDistanceTask is not a standard task, no need to enqueue
3229-
task := &calcDistanceTask{
3230-
traceID: sp.SpanContext().TraceID().String(),
3231-
queryFunc: query,
3232-
}
3233-
3234-
return task.Execute(ctx, request)
3153+
return &milvuspb.CalcDistanceResults{
3154+
Status: &commonpb.Status{
3155+
ErrorCode: commonpb.ErrorCode_UnexpectedError,
3156+
Reason: "interface obsolete",
3157+
},
3158+
}, nil
32353159
}
32363160

32373161
// FlushAll notifies Proxy to flush all collection's DML messages.

internal/proxy/proxy_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ import (
6363
"github.com/milvus-io/milvus/pkg/tracer"
6464
"github.com/milvus-io/milvus/pkg/util"
6565
"github.com/milvus-io/milvus/pkg/util/crypto"
66-
"github.com/milvus-io/milvus/pkg/util/distance"
6766
"github.com/milvus-io/milvus/pkg/util/etcd"
6867
"github.com/milvus-io/milvus/pkg/util/funcutil"
68+
"github.com/milvus-io/milvus/pkg/util/metric"
6969
"github.com/milvus-io/milvus/pkg/util/metricsinfo"
7070
"github.com/milvus-io/milvus/pkg/util/paramtable"
7171
"github.com/milvus-io/milvus/pkg/util/typeutil"
@@ -639,7 +639,7 @@ func TestProxy(t *testing.T) {
639639
},
640640
{
641641
Key: common.MetricTypeKey,
642-
Value: distance.L2,
642+
Value: metric.L2,
643643
},
644644
{
645645
Key: common.IndexTypeKey,
@@ -1543,7 +1543,7 @@ func TestProxy(t *testing.T) {
15431543
Params: []*commonpb.KeyValuePair{
15441544
{
15451545
Key: common.MetricTypeKey,
1546-
Value: distance.L2,
1546+
Value: metric.L2,
15471547
},
15481548
},
15491549
})

0 commit comments

Comments
 (0)