Rename IndexParamsFile to IndexParamsKey (#9563)

Signed-off-by: dragondriver <jiquan.long@zilliz.com>
pull/9591/head
dragondriver 2021-10-09 19:27:02 +08:00 committed by GitHub
parent 0b01ba52d5
commit dedf745b76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions

View File

@ -116,10 +116,10 @@ func (loader *indexLoader) getIndexBinlog(indexPath []string) ([][]byte, indexPa
return nil, nil, "", err
}
// get index params when detecting indexParamPrefix
if path.Base(p) == storage.IndexParamsFile {
if path.Base(p) == storage.IndexParamsKey {
_, indexParams, indexName, _, err = indexCodec.Deserialize([]*storage.Blob{
{
Key: storage.IndexParamsFile,
Key: storage.IndexParamsKey,
Value: []byte(indexPiece),
},
})

View File

@ -31,9 +31,9 @@ import (
)
const (
Ts = "ts"
DDL = "ddl"
IndexParamsFile = "indexParams"
Ts = "ts"
DDL = "ddl"
IndexParamsKey = "indexParams"
)
// when the blob of index file is too large, we can split blob into several rows,
@ -826,7 +826,7 @@ func (codec *IndexFileBinlogCodec) Serialize(
// https://github.com/milvus-io/milvus/issues/9449
// store index parameters to extra, in bytes format.
params, _ := json.Marshal(indexParams)
writer.descriptorEvent.AddExtra(IndexParamsFile, params)
writer.descriptorEvent.AddExtra(IndexParamsKey, params)
eventWriter, err := writer.NextIndexFileEventWriter()
if err != nil {
@ -867,7 +867,7 @@ func (codec *IndexFileBinlogCodec) Serialize(
}
// save index params
writer := NewIndexFileBinlogWriter(indexBuildID, version, collectionID, partitionID, segmentID, fieldID, indexName, indexID, "indexParams")
writer := NewIndexFileBinlogWriter(indexBuildID, version, collectionID, partitionID, segmentID, fieldID, indexName, indexID, IndexParamsKey)
eventWriter, err := writer.NextIndexFileEventWriter()
if err != nil {
@ -902,7 +902,7 @@ func (codec *IndexFileBinlogCodec) Serialize(
}
blobs = append(blobs, &Blob{
Key: "indexParams",
Key: IndexParamsKey,
//Key: strconv.Itoa(len(datas)),
Value: buffer,
})
@ -1004,7 +1004,7 @@ func (codec *IndexFileBinlogCodec) DeserializeImpl(blobs []*Blob) (
content = append(content, []byte(singleString)...)
}
if key == "indexParams" {
if key == IndexParamsKey {
_ = json.Unmarshal(content, &indexParams)
} else {
datas = append(datas, &Blob{
@ -1062,14 +1062,14 @@ func (indexCodec *IndexCodec) Serialize(blobs []*Blob, params map[string]string,
if err != nil {
return nil, err
}
blobs = append(blobs, &Blob{Key: IndexParamsFile, Value: paramsBytes})
blobs = append(blobs, &Blob{Key: IndexParamsKey, Value: paramsBytes})
return blobs, nil
}
func (indexCodec *IndexCodec) Deserialize(blobs []*Blob) ([]*Blob, map[string]string, string, UniqueID, error) {
var file *Blob
for i := 0; i < len(blobs); i++ {
if blobs[i].Key != IndexParamsFile {
if blobs[i].Key != IndexParamsKey {
continue
}
file = blobs[i]

View File

@ -468,7 +468,7 @@ func TestIndexCodec(t *testing.T) {
blobsInput, err := indexCodec.Serialize(blobs, indexParams, "index_test_name", 1234)
assert.Nil(t, err)
assert.EqualValues(t, 4, len(blobsInput))
assert.EqualValues(t, IndexParamsFile, blobsInput[3].Key)
assert.EqualValues(t, IndexParamsKey, blobsInput[3].Key)
blobsOutput, indexParamsOutput, indexName, indexID, err := indexCodec.Deserialize(blobsInput)
assert.Nil(t, err)
assert.EqualValues(t, 3, len(blobsOutput))

View File

@ -377,7 +377,7 @@ func printDDLPayloadValues(eventType EventTypeCode, colType schemapb.DataType, r
// only print slice meta and index params
func printIndexFilePayloadValues(reader PayloadReaderInterface, key string) error {
if key == IndexParamsFile {
if key == IndexParamsKey {
rows, err := reader.GetPayloadLengthFromReader()
if err != nil {
return err