milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore index param from create_collection 

Signed-off-by: neza2017 <yefu.chen@zilliz.com>
pull/4973/head^2
neza2017 2021-02-26 14:40:53 +08:00 committed by yefu.chen
parent 007e7ea858
commit 4ea27335fd
3 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/distributed/masterservice/masterservice_test.go
View File

@ -449,7 +449,7 @@ func TestGrpcService(t *testing.T) {
}
collMeta, err := core.MetaTable.GetCollectionByName("testColl")
assert.Nil(t, err)
assert.Equal(t, len(collMeta.FieldIndexes), 1)
assert.Equal(t, len(collMeta.FieldIndexes), 0)
rsp, err := cli.CreateIndex(req)
assert.Nil(t, err)
assert.Equal(t, rsp.ErrorCode, commonpb.ErrorCode_SUCCESS)

25
internal/masterservice/master_service_test.go
View File

@ -606,8 +606,7 @@ func TestMasterService(t *testing.T) {
}
collMeta, err := core.MetaTable.GetCollectionByName("testColl")
assert.Nil(t, err)
assert.Equal(t, len(collMeta.FieldIndexes), 1)
assert.Equal(t, len(collMeta.FieldIndexes), 1)
assert.Equal(t, len(collMeta.FieldIndexes), 0)
rsp, err := core.CreateIndex(req)
assert.Nil(t, err)
@ -618,8 +617,8 @@ func TestMasterService(t *testing.T) {
assert.ElementsMatch(t, files, []string{"file0-100", "file1-100", "file2-100"})
collMeta, err = core.MetaTable.GetCollectionByName("testColl")
assert.Nil(t, err)
assert.Equal(t, len(collMeta.FieldIndexes), 2)
idxMeta, err := core.MetaTable.GetIndexByID(collMeta.FieldIndexes[1].IndexID)
assert.Equal(t, len(collMeta.FieldIndexes), 1)
idxMeta, err := core.MetaTable.GetIndexByID(collMeta.FieldIndexes[0].IndexID)
assert.Nil(t, err)
assert.Equal(t, idxMeta.IndexName, Params.DefaultIndexName)
@ -665,9 +664,8 @@ func TestMasterService(t *testing.T) {
rsp, err := core.DescribeIndex(req)
assert.Nil(t, err)
assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_SUCCESS)
assert.Equal(t, len(rsp.IndexDescriptions), 2)
idxNames := []string{rsp.IndexDescriptions[0].IndexName, rsp.IndexDescriptions[1].IndexName}
assert.ElementsMatch(t, idxNames, []string{"testColl_index_100", Params.DefaultIndexName})
assert.Equal(t, len(rsp.IndexDescriptions), 1)
assert.Equal(t, rsp.IndexDescriptions[0].IndexName, Params.DefaultIndexName)
})
t.Run("flush segment", func(t *testing.T) {
@ -743,17 +741,8 @@ func TestMasterService(t *testing.T) {
rsp, err := core.DescribeIndex(req)
assert.Nil(t, err)
assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_SUCCESS)
assert.Equal(t, len(rsp.IndexDescriptions), 2)
indexNames := make([]string, 0)
for _, d := range rsp.IndexDescriptions {
indexNames = append(indexNames, d.IndexName)
}
assert.ElementsMatch(t, indexNames, []string{
"testColl_index_100",
Params.DefaultIndexName,
})
assert.Equal(t, len(rsp.IndexDescriptions), 1)
assert.Equal(t, rsp.IndexDescriptions[0].IndexName, Params.DefaultIndexName)
})
t.Run("drop index", func(t *testing.T) {

43
internal/masterservice/task.go
View File

@ -117,27 +117,28 @@ func (t *CreateCollectionReqTask) Execute() error {
SegmentIDs: make([]typeutil.UniqueID, 0, 16),
}
idxInfo := make([]*etcdpb.IndexInfo, 0, 16)
for _, field := range schema.Fields {
if field.DataType == schemapb.DataType_VECTOR_FLOAT || field.DataType == schemapb.DataType_VECTOR_BINARY {
if len(field.IndexParams) > 0 {
idxID, err := t.core.idAllocator.AllocOne()
if err != nil {
return err
}
filedIdx := &etcdpb.FieldIndexInfo{
FiledID: field.FieldID,
IndexID: idxID,
}
idx := &etcdpb.IndexInfo{
IndexName: fmt.Sprintf("%s_index_%d", collMeta.Schema.Name, field.FieldID),
IndexID: idxID,
IndexParams: field.IndexParams,
}
idxInfo = append(idxInfo, idx)
collMeta.FieldIndexes = append(collMeta.FieldIndexes, filedIdx)
}
}
}
/////////////////////// ignore index param from create_collection /////////////////////////
//for _, field := range schema.Fields {
// if field.DataType == schemapb.DataType_VECTOR_FLOAT || field.DataType == schemapb.DataType_VECTOR_BINARY {
// if len(field.IndexParams) > 0 {
// idxID, err := t.core.idAllocator.AllocOne()
// if err != nil {
// return err
// }
// filedIdx := &etcdpb.FieldIndexInfo{
// FiledID: field.FieldID,
// IndexID: idxID,
// }
// idx := &etcdpb.IndexInfo{
// IndexName: fmt.Sprintf("%s_index_%d", collMeta.Schema.Name, field.FieldID),
// IndexID: idxID,
// IndexParams: field.IndexParams,
// }
// idxInfo = append(idxInfo, idx)
// collMeta.FieldIndexes = append(collMeta.FieldIndexes, filedIdx)
// }
// }
//}
err = t.core.MetaTable.AddCollection(&collMeta, &partMeta, idxInfo)
if err != nil {