mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-06 17:18:35 +08:00
enhance: Refactor go_client test wrapper to use embedding and improve test structure (#45113)
Related to #45105 This commit refactors the test MilvusClient wrapper to leverage Go's embedding pattern and improves test organization with subtests. **File**: `tests/go_client/base/milvus_client.go` - **Use `typeutil.NewSet` for rate limiting**: Replace map-based `rateLogMethods` with `typeutil.NewSet` for cleaner and more efficient membership checking - **Embed `*client.Client` directly**: Change `MilvusClient` structure from wrapping the client as a field to embedding it directly - **Remove ~380 lines of wrapper methods**: All wrapper methods (database, collection, partition, index, read/write, RBAC, etc.) are now unnecessary thanks to Go's embedding feature, which automatically promotes embedded methods to the outer type - **Simplify initialization**: Update `NewMilvusClient` and `Close` to use embedded client directly - **Fix typo**: Correct comment "Ike the actual method" → "Invoke the actual method" **File**: `tests/go_client/testcases/search_test.go` - **Wrap assertions in subtests**: Each search expression test is now wrapped in `t.Run()` with descriptive names - **Dynamic subtest naming**: Format: `expr={expression}_dynamic-{true/false}` for clear test identification Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia
GitHub
parent
a75d19a4f0
commit
511a04a6a5
@ -9,24 +9,20 @@ import (
|
||||
"go.uber.org/zap"
|
||||
"google.golang.org/grpc"
|
||||
|
||||
"github.com/milvus-io/milvus/client/v2/entity"
|
||||
client "github.com/milvus-io/milvus/client/v2/milvusclient"
|
||||
"github.com/milvus-io/milvus/pkg/v2/log"
|
||||
"github.com/milvus-io/milvus/pkg/v2/util/typeutil"
|
||||
)
|
||||
|
||||
func LoggingUnaryInterceptor() grpc.UnaryClientInterceptor {
|
||||
// Limit debug logging for these methods
|
||||
rateLogMethods := map[string]struct{}{
|
||||
"GetFlushState": {},
|
||||
"GetLoadingProgress": {},
|
||||
"DescribeIndex": {},
|
||||
}
|
||||
ratedLogMethods := typeutil.NewSet("GetFlushState", "GetLoadingProgress", "DescribeIndex")
|
||||
|
||||
logWithRateLimit := func(_methodShortName string, logFunc func(msg string, fields ...zap.Field),
|
||||
logWithRateLimit := func(methodShortName string, logFunc func(msg string, fields ...zap.Field),
|
||||
logRateFunc func(cost float64, msg string, fields ...zap.Field) bool,
|
||||
msg string, fields ...zap.Field,
|
||||
) {
|
||||
if _, exists := rateLogMethods[_methodShortName]; exists {
|
||||
if ratedLogMethods.Contain(methodShortName) {
|
||||
logRateFunc(10, msg, fields...)
|
||||
} else {
|
||||
logFunc(msg, fields...)
|
||||
@ -55,7 +51,7 @@ func LoggingUnaryInterceptor() grpc.UnaryClientInterceptor {
|
||||
reqStr := marshalWithFallback(req, "could not marshal request")
|
||||
logWithRateLimit(_methodShortName, log.Info, log.RatedInfo, "Request", zap.String("method", _methodShortName), zap.String("reqs", reqStr))
|
||||
|
||||
// Ike the actual method
|
||||
// Invoke the actual method
|
||||
start := time.Now()
|
||||
errResp := invoker(ctx, method, req, reply, cc, opts...)
|
||||
cost := time.Since(start)
|
||||
@ -70,403 +66,18 @@ func LoggingUnaryInterceptor() grpc.UnaryClientInterceptor {
|
||||
}
|
||||
|
||||
type MilvusClient struct {
|
||||
mClient *client.Client
|
||||
*client.Client
|
||||
}
|
||||
|
||||
func NewMilvusClient(ctx context.Context, cfg *client.ClientConfig) (*MilvusClient, error) {
|
||||
cfg.DialOptions = append(cfg.DialOptions, grpc.WithUnaryInterceptor(LoggingUnaryInterceptor()))
|
||||
mClient, err := client.New(ctx, cfg)
|
||||
return &MilvusClient{
|
||||
mClient,
|
||||
Client: mClient,
|
||||
}, err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) Close(ctx context.Context) error {
|
||||
err := mc.mClient.Close(ctx)
|
||||
return err
|
||||
}
|
||||
|
||||
// -- database --
|
||||
|
||||
// UseDatabase list all database in milvus cluster.
|
||||
func (mc *MilvusClient) UseDatabase(ctx context.Context, option client.UseDatabaseOption) error {
|
||||
err := mc.mClient.UseDatabase(ctx, option)
|
||||
return err
|
||||
}
|
||||
|
||||
// ListDatabase list all database in milvus cluster.
|
||||
func (mc *MilvusClient) ListDatabase(ctx context.Context, option client.ListDatabaseOption, callOptions ...grpc.CallOption) ([]string, error) {
|
||||
databaseNames, err := mc.mClient.ListDatabase(ctx, option, callOptions...)
|
||||
return databaseNames, err
|
||||
}
|
||||
|
||||
// CreateDatabase create database with the given name.
|
||||
func (mc *MilvusClient) CreateDatabase(ctx context.Context, option client.CreateDatabaseOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.CreateDatabase(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// DropDatabase drop database with the given db name.
|
||||
func (mc *MilvusClient) DropDatabase(ctx context.Context, option client.DropDatabaseOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.DropDatabase(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// DescribeDatabase describe database with the given db name.
|
||||
func (mc *MilvusClient) DescribeDatabase(ctx context.Context, option client.DescribeDatabaseOption, callOptions ...grpc.CallOption) (*entity.Database, error) {
|
||||
database, err := mc.mClient.DescribeDatabase(ctx, option, callOptions...)
|
||||
return database, err
|
||||
}
|
||||
|
||||
// AlterDatabaseProperties alter database properties
|
||||
func (mc *MilvusClient) AlterDatabaseProperties(ctx context.Context, option client.AlterDatabasePropertiesOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.AlterDatabaseProperties(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// DropDatabaseProperties drop database properties
|
||||
func (mc *MilvusClient) DropDatabaseProperties(ctx context.Context, option client.DropDatabasePropertiesOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.AlterDatabaseProperties(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// -- collection --
|
||||
|
||||
// CreateCollection Create Collection
|
||||
func (mc *MilvusClient) CreateCollection(ctx context.Context, option client.CreateCollectionOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.CreateCollection(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// ListCollections Create Collection
|
||||
func (mc *MilvusClient) ListCollections(ctx context.Context, option client.ListCollectionOption, callOptions ...grpc.CallOption) ([]string, error) {
|
||||
collectionNames, err := mc.mClient.ListCollections(ctx, option, callOptions...)
|
||||
return collectionNames, err
|
||||
}
|
||||
|
||||
// DescribeCollection Describe collection
|
||||
func (mc *MilvusClient) DescribeCollection(ctx context.Context, option client.DescribeCollectionOption, callOptions ...grpc.CallOption) (*entity.Collection, error) {
|
||||
collection, err := mc.mClient.DescribeCollection(ctx, option, callOptions...)
|
||||
return collection, err
|
||||
}
|
||||
|
||||
// HasCollection Has collection
|
||||
func (mc *MilvusClient) HasCollection(ctx context.Context, option client.HasCollectionOption, callOptions ...grpc.CallOption) (bool, error) {
|
||||
has, err := mc.mClient.HasCollection(ctx, option, callOptions...)
|
||||
return has, err
|
||||
}
|
||||
|
||||
// DropCollection Drop Collection
|
||||
func (mc *MilvusClient) DropCollection(ctx context.Context, option client.DropCollectionOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.DropCollection(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// RenameCollection Rename Collection
|
||||
func (mc *MilvusClient) RenameCollection(ctx context.Context, option client.RenameCollectionOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.RenameCollection(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// AlterCollectionProperties Alter collection properties
|
||||
func (mc *MilvusClient) AlterCollectionProperties(ctx context.Context, option client.AlterCollectionPropertiesOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.AlterCollectionProperties(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// DropCollectionProperties Drop collection properties
|
||||
func (mc *MilvusClient) DropCollectionProperties(ctx context.Context, option client.DropCollectionPropertiesOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.DropCollectionProperties(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// AlterCollectionField Alter collection field
|
||||
func (mc *MilvusClient) AlterCollectionField(ctx context.Context, option client.AlterCollectionFieldPropertiesOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.AlterCollectionFieldProperty(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// GetCollectionStats Get collection stats
|
||||
func (mc *MilvusClient) GetCollectionStats(ctx context.Context, option client.GetCollectionOption) (map[string]string, error) {
|
||||
stats, err := mc.mClient.GetCollectionStats(ctx, option)
|
||||
return stats, err
|
||||
}
|
||||
|
||||
// -- partition --
|
||||
|
||||
// CreatePartition Create Partition
|
||||
func (mc *MilvusClient) CreatePartition(ctx context.Context, option client.CreatePartitionOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.CreatePartition(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// DropPartition Drop Partition
|
||||
func (mc *MilvusClient) DropPartition(ctx context.Context, option client.DropPartitionOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.DropPartition(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// HasPartition Has Partition
|
||||
func (mc *MilvusClient) HasPartition(ctx context.Context, option client.HasPartitionOption, callOptions ...grpc.CallOption) (bool, error) {
|
||||
has, err := mc.mClient.HasPartition(ctx, option, callOptions...)
|
||||
return has, err
|
||||
}
|
||||
|
||||
// ListPartitions List Partitions
|
||||
func (mc *MilvusClient) ListPartitions(ctx context.Context, option client.ListPartitionsOption, callOptions ...grpc.CallOption) ([]string, error) {
|
||||
partitionNames, err := mc.mClient.ListPartitions(ctx, option, callOptions...)
|
||||
return partitionNames, err
|
||||
}
|
||||
|
||||
// LoadPartitions Load Partitions into memory
|
||||
func (mc *MilvusClient) LoadPartitions(ctx context.Context, option client.LoadPartitionsOption, callOptions ...grpc.CallOption) (client.LoadTask, error) {
|
||||
loadTask, err := mc.mClient.LoadPartitions(ctx, option, callOptions...)
|
||||
return loadTask, err
|
||||
}
|
||||
|
||||
// ReleasePartitions Release Partitions from memory
|
||||
func (mc *MilvusClient) ReleasePartitions(ctx context.Context, option client.ReleasePartitionsOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.ReleasePartitions(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// -- index --
|
||||
|
||||
// CreateIndex Create Index
|
||||
func (mc *MilvusClient) CreateIndex(ctx context.Context, option client.CreateIndexOption, callOptions ...grpc.CallOption) (*client.CreateIndexTask, error) {
|
||||
createIndexTask, err := mc.mClient.CreateIndex(ctx, option, callOptions...)
|
||||
return createIndexTask, err
|
||||
}
|
||||
|
||||
// ListIndexes List Indexes
|
||||
func (mc *MilvusClient) ListIndexes(ctx context.Context, option client.ListIndexOption, callOptions ...grpc.CallOption) ([]string, error) {
|
||||
indexes, err := mc.mClient.ListIndexes(ctx, option, callOptions...)
|
||||
return indexes, err
|
||||
}
|
||||
|
||||
// DescribeIndex Describe Index
|
||||
func (mc *MilvusClient) DescribeIndex(ctx context.Context, option client.DescribeIndexOption, callOptions ...grpc.CallOption) (client.IndexDescription, error) {
|
||||
idxDesc, err := mc.mClient.DescribeIndex(ctx, option, callOptions...)
|
||||
return idxDesc, err
|
||||
}
|
||||
|
||||
// DropIndex Drop Index
|
||||
func (mc *MilvusClient) DropIndex(ctx context.Context, option client.DropIndexOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.DropIndex(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// -- write --
|
||||
|
||||
// Insert insert data
|
||||
func (mc *MilvusClient) Insert(ctx context.Context, option client.InsertOption, callOptions ...grpc.CallOption) (client.InsertResult, error) {
|
||||
insertRes, err := mc.mClient.Insert(ctx, option, callOptions...)
|
||||
if err == nil {
|
||||
log.Info("Insert", zap.Any("result", insertRes))
|
||||
}
|
||||
return insertRes, err
|
||||
}
|
||||
|
||||
// Flush flush data
|
||||
func (mc *MilvusClient) Flush(ctx context.Context, option client.FlushOption, callOptions ...grpc.CallOption) (*client.FlushTask, error) {
|
||||
flushTask, err := mc.mClient.Flush(ctx, option, callOptions...)
|
||||
return flushTask, err
|
||||
}
|
||||
|
||||
// Delete deletes data
|
||||
func (mc *MilvusClient) Delete(ctx context.Context, option client.DeleteOption, callOptions ...grpc.CallOption) (client.DeleteResult, error) {
|
||||
deleteRes, err := mc.mClient.Delete(ctx, option, callOptions...)
|
||||
return deleteRes, err
|
||||
}
|
||||
|
||||
// Upsert upsert data
|
||||
func (mc *MilvusClient) Upsert(ctx context.Context, option client.UpsertOption, callOptions ...grpc.CallOption) (client.UpsertResult, error) {
|
||||
upsertRes, err := mc.mClient.Upsert(ctx, option, callOptions...)
|
||||
return upsertRes, err
|
||||
}
|
||||
|
||||
// -- read --
|
||||
|
||||
// LoadCollection Load Collection
|
||||
func (mc *MilvusClient) LoadCollection(ctx context.Context, option client.LoadCollectionOption, callOptions ...grpc.CallOption) (client.LoadTask, error) {
|
||||
loadTask, err := mc.mClient.LoadCollection(ctx, option, callOptions...)
|
||||
return loadTask, err
|
||||
}
|
||||
|
||||
// ReleaseCollection Release Collection
|
||||
func (mc *MilvusClient) ReleaseCollection(ctx context.Context, option client.ReleaseCollectionOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.ReleaseCollection(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// Search search from collection
|
||||
func (mc *MilvusClient) Search(ctx context.Context, option client.SearchOption, callOptions ...grpc.CallOption) ([]client.ResultSet, error) {
|
||||
resultSets, err := mc.mClient.Search(ctx, option, callOptions...)
|
||||
return resultSets, err
|
||||
}
|
||||
|
||||
// Query query from collection
|
||||
func (mc *MilvusClient) Query(ctx context.Context, option client.QueryOption, callOptions ...grpc.CallOption) (client.ResultSet, error) {
|
||||
resultSet, err := mc.mClient.Query(ctx, option, callOptions...)
|
||||
return resultSet, err
|
||||
}
|
||||
|
||||
// Get get from collection
|
||||
func (mc *MilvusClient) Get(ctx context.Context, option client.QueryOption, callOptions ...grpc.CallOption) (client.ResultSet, error) {
|
||||
resultSet, err := mc.mClient.Get(ctx, option, callOptions...)
|
||||
return resultSet, err
|
||||
}
|
||||
|
||||
// HybridSearch hybrid search from collection
|
||||
func (mc *MilvusClient) HybridSearch(ctx context.Context, option client.HybridSearchOption, callOptions ...grpc.CallOption) ([]client.ResultSet, error) {
|
||||
resultSets, err := mc.mClient.HybridSearch(ctx, option, callOptions...)
|
||||
return resultSets, err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) SearchIterator(ctx context.Context, option client.SearchIteratorOption, callOptions ...grpc.CallOption) (client.SearchIterator, error) {
|
||||
searchIterator, err := mc.mClient.SearchIterator(ctx, option, callOptions...)
|
||||
return searchIterator, err
|
||||
}
|
||||
|
||||
// ListResourceGroups list all resource groups
|
||||
func (mc *MilvusClient) ListResourceGroups(ctx context.Context, option client.ListResourceGroupsOption, callOptions ...grpc.CallOption) ([]string, error) {
|
||||
resourceGroups, err := mc.mClient.ListResourceGroups(ctx, option, callOptions...)
|
||||
return resourceGroups, err
|
||||
}
|
||||
|
||||
// CreateResourceGroup create resource group
|
||||
func (mc *MilvusClient) CreateResourceGroup(ctx context.Context, option client.CreateResourceGroupOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.CreateResourceGroup(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// DropResourceGroup drop resource group
|
||||
func (mc *MilvusClient) DropResourceGroup(ctx context.Context, option client.DropResourceGroupOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.DropResourceGroup(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// DescribeResourceGroup describe resource group
|
||||
func (mc *MilvusClient) DescribeResourceGroup(ctx context.Context, option client.DescribeResourceGroupOption, callOptions ...grpc.CallOption) (*entity.ResourceGroup, error) {
|
||||
resourceGroup, err := mc.mClient.DescribeResourceGroup(ctx, option, callOptions...)
|
||||
return resourceGroup, err
|
||||
}
|
||||
|
||||
// UpdateResourceGroup update resource group
|
||||
func (mc *MilvusClient) UpdateResourceGroup(ctx context.Context, option client.UpdateResourceGroupOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.UpdateResourceGroup(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// TransferReplica transfer replica
|
||||
func (mc *MilvusClient) TransferReplica(ctx context.Context, option client.TransferReplicaOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.TransferReplica(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) CreateUser(ctx context.Context, option client.CreateUserOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.CreateUser(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) UpdatePassword(ctx context.Context, option client.UpdatePasswordOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.UpdatePassword(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) DropUser(ctx context.Context, option client.DropUserOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.DropUser(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) ListUsers(ctx context.Context, option client.ListUserOption, callOptions ...grpc.CallOption) ([]string, error) {
|
||||
users, err := mc.mClient.ListUsers(ctx, option, callOptions...)
|
||||
return users, err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) DescribeUser(ctx context.Context, option client.DescribeUserOption, callOptions ...grpc.CallOption) (*entity.User, error) {
|
||||
user, err := mc.mClient.DescribeUser(ctx, option, callOptions...)
|
||||
return user, err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) ListRoles(ctx context.Context, option client.ListRoleOption, callOptions ...grpc.CallOption) ([]string, error) {
|
||||
roles, err := mc.mClient.ListRoles(ctx, option, callOptions...)
|
||||
return roles, err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) CreateRole(ctx context.Context, option client.CreateRoleOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.CreateRole(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) GrantRole(ctx context.Context, option client.GrantRoleOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.GrantRole(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) RevokeRole(ctx context.Context, option client.RevokeRoleOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.RevokeRole(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) DropRole(ctx context.Context, option client.DropRoleOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.DropRole(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) DescribeRole(ctx context.Context, option client.DescribeRoleOption, callOptions ...grpc.CallOption) (*entity.Role, error) {
|
||||
role, err := mc.mClient.DescribeRole(ctx, option, callOptions...)
|
||||
return role, err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) GrantPrivilege(ctx context.Context, option client.GrantPrivilegeOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.GrantPrivilege(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) RevokePrivilege(ctx context.Context, option client.RevokePrivilegeOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.RevokePrivilege(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) GrantPrivilegeV2(ctx context.Context, option client.GrantPrivilegeV2Option, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.GrantPrivilegeV2(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) RevokePrivilegeV2(ctx context.Context, option client.RevokePrivilegeV2Option, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.RevokePrivilegeV2(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) CreatePrivilegeGroup(ctx context.Context, option client.CreatePrivilegeGroupOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.CreatePrivilegeGroup(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) DropPrivilegeGroup(ctx context.Context, option client.DropPrivilegeGroupOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.DropPrivilegeGroup(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) ListPrivilegeGroups(ctx context.Context, option client.ListPrivilegeGroupsOption, callOptions ...grpc.CallOption) ([]*entity.PrivilegeGroup, error) {
|
||||
privilegeGroups, err := mc.mClient.ListPrivilegeGroups(ctx, option, callOptions...)
|
||||
return privilegeGroups, err
|
||||
}
|
||||
|
||||
func (mc *MilvusClient) OperatePrivilegeGroup(ctx context.Context, option client.OperatePrivilegeGroupOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.OperatePrivilegeGroup(ctx, option, callOptions...)
|
||||
return err
|
||||
}
|
||||
|
||||
// RunAnalyzer run analyzer with params
|
||||
func (mc *MilvusClient) RunAnalyzer(ctx context.Context, option client.RunAnalyzerOption, callOptions ...grpc.CallOption) ([]*entity.AnalyzerResult, error) {
|
||||
tokenSets, err := mc.mClient.RunAnalyzer(ctx, option, callOptions...)
|
||||
return tokenSets, err
|
||||
}
|
||||
|
||||
// AddCollectionField Add collection field
|
||||
func (mc *MilvusClient) AddCollectionField(ctx context.Context, option client.AddCollectionFieldOption, callOptions ...grpc.CallOption) error {
|
||||
err := mc.mClient.AddCollectionField(ctx, option, callOptions...)
|
||||
err := mc.Client.Close(ctx)
|
||||
return err
|
||||
}
|
||||
|
||||
@ -702,7 +702,6 @@ func TestSearchJsonFieldExpr(t *testing.T) {
|
||||
|
||||
for _, dynamicField := range []bool{false, true} {
|
||||
// create collection
|
||||
|
||||
prepare, schema := hp.CollPrepare.CreateCollection(ctx, t, mc, hp.NewCreateCollectionParams(hp.Int64VecJSON), hp.TNewFieldsOption(), hp.TNewSchemaOption().
|
||||
TWithEnableDynamicField(dynamicField))
|
||||
prepare.InsertData(ctx, t, mc, hp.NewInsertParams(schema), hp.TNewDataOption())
|
||||
@ -712,13 +711,15 @@ func TestSearchJsonFieldExpr(t *testing.T) {
|
||||
|
||||
// search with jsonField expr key datatype and json data type mismatch
|
||||
for _, expr := range exprs {
|
||||
log.Debug("TestSearchJsonFieldExpr", zap.String("expr", expr))
|
||||
vectors := hp.GenSearchVectors(common.DefaultNq, common.DefaultDim, entity.FieldTypeFloatVector)
|
||||
searchRes, errSearch := mc.Search(ctx, client.NewSearchOption(schema.CollectionName, common.DefaultLimit, vectors).WithConsistencyLevel(entity.ClStrong).
|
||||
WithFilter(expr).WithANNSField(common.DefaultFloatVecFieldName).WithOutputFields(common.DefaultInt64FieldName, common.DefaultJSONFieldName))
|
||||
common.CheckErr(t, errSearch, true)
|
||||
common.CheckOutputFields(t, []string{common.DefaultInt64FieldName, common.DefaultJSONFieldName}, searchRes[0].Fields)
|
||||
common.CheckSearchResult(t, searchRes, common.DefaultNq, common.DefaultLimit)
|
||||
t.Run(fmt.Sprintf("expr=%s_dynamic-%t", expr, dynamicField), func(t *testing.T) {
|
||||
log.Debug("TestSearchJsonFieldExpr", zap.String("expr", expr))
|
||||
vectors := hp.GenSearchVectors(common.DefaultNq, common.DefaultDim, entity.FieldTypeFloatVector)
|
||||
searchRes, errSearch := mc.Search(ctx, client.NewSearchOption(schema.CollectionName, common.DefaultLimit, vectors).WithConsistencyLevel(entity.ClStrong).
|
||||
WithFilter(expr).WithANNSField(common.DefaultFloatVecFieldName).WithOutputFields(common.DefaultInt64FieldName, common.DefaultJSONFieldName))
|
||||
common.CheckErr(t, errSearch, true)
|
||||
common.CheckOutputFields(t, []string{common.DefaultInt64FieldName, common.DefaultJSONFieldName}, searchRes[0].Fields)
|
||||
common.CheckSearchResult(t, searchRes, common.DefaultNq, common.DefaultLimit)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user