Merge pull request #34 from fishpenguin/master-add-test

Remove SearchByID

CHANGELOG.md

@@ -17,6 +17,7 @@
 
 ### Task
 ---
+- \#33 - Remove SearchByID
 
 ## milvus-sdk-go 0.3.0 (2020-04-15)
 

README.md

@@ -7,6 +7,7 @@ Go SDK for [Milvus](https://github.com/milvus-io/milvus). To contribute code to
 | 0.7.0 | 0.1.0|
 | 0.7.1 | 0.2.0|
 | 0.8.0 | 0.3.0|
+| 0.9.0 | 0.4.0|
 
 ### Getting started
 

milvus/ClientProxy.go

@@ -230,37 +230,6 @@ func (client *Milvusclient) Search(searchParam SearchParam) (TopkQueryResult, St
 
 ////////////////////////////////////////////////////////////////////////////
 
-func (client *Milvusclient) SearchByID(searchByIDParam SearchByIDParam) (TopkQueryResult, Status, error) {
-	keyValuePair := make([]*pb.KeyValuePair, 1)
-	pair := pb.KeyValuePair{"params", searchByIDParam.ExtraParams, struct{}{}, nil, 0}
-	keyValuePair[0] = &pair
-	grpcSearchByIDParam := pb.SearchByIDParam{searchByIDParam.CollectionName, searchByIDParam.PartitionTag, searchByIDParam.IdArray, searchByIDParam.Topk,
-		keyValuePair, struct{}{}, nil, 0,}
-
-	topkQueryResult, err := client.Instance.SearchByID(grpcSearchByIDParam)
-	if err != nil {
-		return TopkQueryResult{nil}, nil, err
-	}
-	nq := topkQueryResult.GetRowNum()
-	if nq == 0 {
-		return TopkQueryResult{nil}, status{int64(topkQueryResult.Status.ErrorCode), topkQueryResult.Status.Reason,}, err
-	}
-	var result = make([]QueryResult, nq)
-	topk := int64(len(topkQueryResult.GetIds())) / nq
-	var i, j int64
-	for i = 0; i < nq; i++ {
-		result[i].Ids = make([]int64, topk)
-		result[i].Distances = make([]float32, topk)
-		for j = 0; j < topk; j++ {
-			result[i].Ids[j] = topkQueryResult.GetIds()[i*topk+j]
-			result[i].Distances[j] = topkQueryResult.GetDistances()[i*topk+j]
-		}
-	}
-	return TopkQueryResult{result}, status{int64(topkQueryResult.Status.ErrorCode), topkQueryResult.Status.Reason}, nil
-}
-
-////////////////////////////////////////////////////////////////////////////
-
 func (client *Milvusclient) DeleteEntityByID(collectionName string, id_array []int64) (Status, error) {
 	grpcParam := pb.DeleteByIDParam{collectionName, id_array, struct{}{}, nil, 0}
 	grpcStatus, err := client.Instance.DeleteByID(grpcParam)

milvus/MilvusClient.go

@@ -187,19 +187,6 @@ type SearchParam struct {
 	ExtraParams string
 }
 
-type SearchByIDParam struct {
-	// CollectionName collection name for search
-	CollectionName string
-	// QueryEntities query entities raw array
-	IdArray []int64
-	// Topk topk
-	Topk int64
-	// PartitionTag partition tag array
-	PartitionTag []string
-	// ExtraParams extra parameters
-	ExtraParams string
-}
-
 //QueryResult Query result
 type QueryResult struct {
 	// Ids id array
@@ -291,11 +278,6 @@ type MilvusClient interface {
 	// return indicate if query is successful.
 	Search(searchParam SearchParam) (TopkQueryResult, Status, error)
 
-	// SearchByID method
-	// This method is used to query entity in collection.
-	// return indicate if query is successful.
-	SearchByID(searchByIDParam SearchByIDParam) (TopkQueryResult, Status, error)
-
 	// DeleteEntityByID method
 	// This method is used to delete entities by ids
 	// return indicate if delete is successful

milvus/MilvusGrpcClient.go

@@ -65,8 +65,6 @@ type MilvusGrpcClient interface {
 
 	Search(searchParam pb.SearchParam) (*pb.TopKQueryResult, error)
 
-	SearchByID(searchByIDParam pb.SearchByIDParam) (*pb.TopKQueryResult, error)
-
 	SearchInFiles(searchInFilesParam pb.SearchInFilesParam) (*pb.TopKQueryResult, error)
 
 	Cmd(command pb.Command) (pb.StringReply, error)
@@ -255,15 +253,6 @@ func (grpcClient *milvusGrpcClient) Search(searchParam pb.SearchParam) (*pb.TopK
 	return topkQueryResult, err
 }
 
-func (grpcClient *milvusGrpcClient) SearchByID(searchByIDParam pb.SearchByIDParam) (*pb.TopKQueryResult, error) {
-	ctx := context.Background()
-	topkQueryResult, err := grpcClient.serviceInstance.SearchByID(ctx, &searchByIDParam)
-	if err != nil {
-		return &pb.TopKQueryResult{nil, 0, nil, nil, struct{}{}, nil, 0}, err
-	}
-	return topkQueryResult, err
-}
-
 func (grpcClient *milvusGrpcClient) SearchInFiles(searchInFilesParam pb.SearchInFilesParam) (*pb.TopKQueryResult, error) {
 	ctx := context.Background()
 	topkQueryResult, err := grpcClient.serviceInstance.SearchInFiles(ctx, &searchInFilesParam)