diff --git a/internal/datacoord/index_meta.go b/internal/datacoord/index_meta.go index 4b29eb8e26..05d2e57f0b 100644 --- a/internal/datacoord/index_meta.go +++ b/internal/datacoord/index_meta.go @@ -117,12 +117,12 @@ func checkParams(fieldIndex *model.Index, req *indexpb.CreateIndexRequest) bool if notEq { return false } - if len(fieldIndex.IndexParams) != len(req.IndexParams) { + if len(fieldIndex.UserIndexParams) != len(req.GetUserIndexParams()) { return false } - for _, param1 := range fieldIndex.IndexParams { + for _, param1 := range fieldIndex.UserIndexParams { exist := false - for _, param2 := range req.IndexParams { + for _, param2 := range req.GetUserIndexParams() { if param2.Key == param1.Key && param2.Value == param1.Value { exist = true } diff --git a/internal/datacoord/index_meta_test.go b/internal/datacoord/index_meta_test.go index 341fc7a02b..2a25c0bbf5 100644 --- a/internal/datacoord/index_meta_test.go +++ b/internal/datacoord/index_meta_test.go @@ -84,7 +84,7 @@ func TestMeta_CanCreateIndex(t *testing.T) { IndexParams: indexParams, Timestamp: 0, IsAutoIndex: false, - UserIndexParams: nil, + UserIndexParams: indexParams, } t.Run("can create index", func(t *testing.T) { @@ -102,7 +102,7 @@ func TestMeta_CanCreateIndex(t *testing.T) { TypeParams: typeParams, IndexParams: indexParams, IsAutoIndex: false, - UserIndexParams: nil, + UserIndexParams: indexParams, } err = m.CreateIndex(index) @@ -125,17 +125,19 @@ func TestMeta_CanCreateIndex(t *testing.T) { assert.Equal(t, int64(0), tmpIndexID) req.TypeParams = typeParams - req.IndexParams = append(req.IndexParams, &commonpb.KeyValuePair{Key: "metrics_type", Value: "L2"}) + req.UserIndexParams = append(indexParams, &commonpb.KeyValuePair{Key: "metrics_type", Value: "L2"}) tmpIndexID, err = m.CanCreateIndex(req) assert.Error(t, err) assert.Equal(t, int64(0), tmpIndexID) req.IndexParams = []*commonpb.KeyValuePair{{Key: common.IndexTypeKey, Value: "HNSW"}} + req.UserIndexParams = req.IndexParams tmpIndexID, err = m.CanCreateIndex(req) assert.Error(t, err) assert.Equal(t, int64(0), tmpIndexID) req.IndexParams = indexParams + req.UserIndexParams = indexParams req.FieldID++ tmpIndexID, err = m.CanCreateIndex(req) assert.Error(t, err) @@ -198,7 +200,7 @@ func TestMeta_HasSameReq(t *testing.T) { IndexParams: indexParams, Timestamp: 0, IsAutoIndex: false, - UserIndexParams: nil, + UserIndexParams: indexParams, } t.Run("no indexes", func(t *testing.T) { @@ -219,7 +221,7 @@ func TestMeta_HasSameReq(t *testing.T) { TypeParams: typeParams, IndexParams: indexParams, IsAutoIndex: false, - UserIndexParams: nil, + UserIndexParams: indexParams, }, } has, _ := m.HasSameReq(req) @@ -240,6 +242,12 @@ func TestMeta_HasSameReq(t *testing.T) { } func TestMeta_CreateIndex(t *testing.T) { + indexParams := []*commonpb.KeyValuePair{ + { + Key: common.IndexTypeKey, + Value: "FLAT", + }, + } index := &model.Index{ TenantID: "", CollectionID: 1, @@ -254,14 +262,9 @@ func TestMeta_CreateIndex(t *testing.T) { Value: "128", }, }, - IndexParams: []*commonpb.KeyValuePair{ - { - Key: common.IndexTypeKey, - Value: "FLAT", - }, - }, + IndexParams: indexParams, IsAutoIndex: false, - UserIndexParams: nil, + UserIndexParams: indexParams, } t.Run("success", func(t *testing.T) { @@ -352,7 +355,6 @@ func TestMeta_AddSegmentIndex(t *testing.T) { CreateTime: 12, IndexFileKeys: nil, IndexSize: 0, - WriteHandoff: false, } t.Run("save meta fail", func(t *testing.T) { @@ -417,7 +419,7 @@ func TestMeta_GetIndexIDByName(t *testing.T) { TypeParams: typeParams, IndexParams: indexParams, IsAutoIndex: false, - UserIndexParams: nil, + UserIndexParams: indexParams, }, } @@ -491,7 +493,7 @@ func TestMeta_GetSegmentIndexState(t *testing.T) { TypeParams: typeParams, IndexParams: indexParams, IsAutoIndex: false, - UserIndexParams: nil, + UserIndexParams: indexParams, }, } state := m.GetSegmentIndexState(collID, segID) @@ -519,7 +521,6 @@ func TestMeta_GetSegmentIndexState(t *testing.T) { CreateTime: 12, IndexFileKeys: nil, IndexSize: 0, - WriteHandoff: false, }) state := m.GetSegmentIndexState(collID, segID) @@ -542,7 +543,6 @@ func TestMeta_GetSegmentIndexState(t *testing.T) { CreateTime: 12, IndexFileKeys: nil, IndexSize: 0, - WriteHandoff: false, }) state := m.GetSegmentIndexState(collID, segID) @@ -597,7 +597,6 @@ func TestMeta_GetSegmentIndexStateOnField(t *testing.T) { CreateTime: 10, IndexFileKeys: nil, IndexSize: 0, - WriteHandoff: false, }, }, }, @@ -618,7 +617,7 @@ func TestMeta_GetSegmentIndexStateOnField(t *testing.T) { TypeParams: typeParams, IndexParams: indexParams, IsAutoIndex: false, - UserIndexParams: nil, + UserIndexParams: indexParams, }, }, }, @@ -638,7 +637,6 @@ func TestMeta_GetSegmentIndexStateOnField(t *testing.T) { CreateTime: 10, IndexFileKeys: nil, IndexSize: 0, - WriteHandoff: false, }, }, } @@ -832,6 +830,12 @@ func TestMeta_GetIndexNameByID(t *testing.T) { } func TestMeta_GetTypeParams(t *testing.T) { + indexParams := []*commonpb.KeyValuePair{ + { + Key: common.IndexTypeKey, + Value: "HNSW", + }, + } m := &meta{ indexes: map[UniqueID]map[UniqueID]*model.Index{ collID: { @@ -849,14 +853,9 @@ func TestMeta_GetTypeParams(t *testing.T) { Value: "128", }, }, - IndexParams: []*commonpb.KeyValuePair{ - { - Key: common.IndexTypeKey, - Value: "HNSW", - }, - }, + IndexParams: indexParams, IsAutoIndex: false, - UserIndexParams: nil, + UserIndexParams: indexParams, }, }, }, @@ -877,6 +876,12 @@ func TestMeta_GetTypeParams(t *testing.T) { } func TestMeta_GetIndexParams(t *testing.T) { + indexParams := []*commonpb.KeyValuePair{ + { + Key: common.IndexTypeKey, + Value: "HNSW", + }, + } m := &meta{ indexes: map[UniqueID]map[UniqueID]*model.Index{ collID: { @@ -894,14 +899,9 @@ func TestMeta_GetIndexParams(t *testing.T) { Value: "128", }, }, - IndexParams: []*commonpb.KeyValuePair{ - { - Key: common.IndexTypeKey, - Value: "HNSW", - }, - }, + IndexParams: indexParams, IsAutoIndex: false, - UserIndexParams: nil, + UserIndexParams: indexParams, }, }, }, @@ -939,7 +939,6 @@ func TestMeta_GetIndexJob(t *testing.T) { CreateTime: 0, IndexFileKeys: nil, IndexSize: 0, - WriteHandoff: false, }, }, } @@ -1044,7 +1043,6 @@ func updateSegmentIndexMeta(t *testing.T) *meta { CreateTime: 0, IndexFileKeys: nil, IndexSize: 0, - WriteHandoff: false, }, }, }, @@ -1083,7 +1081,6 @@ func updateSegmentIndexMeta(t *testing.T) *meta { CreateTime: 0, IndexFileKeys: nil, IndexSize: 0, - WriteHandoff: false, }, }, }