clean up

Signed-off-by: shaoting-huang <shaoting.huang@zilliz.com>
milvus-io · Jun 27, 2024 · 87604a5 · 87604a5
1 parent 890b33e
commit 87604a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/internal/storage/serde_events.go b/internal/storage/serde_events.go
@@ -231,7 +231,7 @@ func NewBinlogDeserializeReader(blobs []*Blob, PKfieldID UniqueID) (*Deserialize
 	}), nil
 }
 
-func NewDeltalogDeserializeReader(blobs []*Blob) (*DeserializeReader[*DeleteLog], error) {
+func NewDeltalogOneFieldReader(blobs []*Blob) (*DeserializeReader[*DeleteLog], error) {
 	reader, err := newCompositeBinlogRecordReader(blobs)
 	if err != nil {
 		return nil, err
@@ -474,7 +474,6 @@ func (dsw *DeltalogStreamWriter) writeDeltalogHeaders(w io.Writer) error {
 	// Write descriptor
 	de := NewBaseDescriptorEvent(dsw.collectionID, dsw.partitionID, dsw.segmentID)
 	de.PayloadDataType = dsw.fieldSchema.DataType
-	de.FieldID = dsw.fieldSchema.FieldID
 	de.descriptorEventData.AddExtra(originalSizeKey, strconv.Itoa(dsw.memorySize))
 	if err := de.Write(w); err != nil {
 		return err
@@ -830,11 +829,14 @@ func NewDeltalogMultiFieldReader(blobs []*Blob) (*DeserializeReader[*DeleteLog],
 	}), nil
 }
 
-func NewDeltalogDeserializeReaderUnified(blobs []*Blob) (*DeserializeReader[*DeleteLog], error) {
+// NewDeltalogDeserializeReader is the entry point for the delta log reader.
+// It includes NewDeltalogOneFieldReader, which uses the existing log format with only one column in a log file,
+// and NewDeltalogMultiFieldReader, which uses the new format and supports multiple fields in a log file.
+func NewDeltalogDeserializeReader(blobs []*Blob) (*DeserializeReader[*DeleteLog], error) {
 	if supportMultiFieldFormat(blobs) {
 		return NewDeltalogMultiFieldReader(blobs)
 	}
-	return NewDeltalogDeserializeReader(blobs)
+	return NewDeltalogOneFieldReader(blobs)
 }
 
 // check delta log description data to see if it is the format with

diff --git a/internal/storage/serde_events_test.go b/internal/storage/serde_events_test.go
@@ -291,7 +291,7 @@ func TestDeltalogDeserializeReader(t *testing.T) {
 
 func TestDeltalogSerializeWriter(t *testing.T) {
 	t.Run("test empty data", func(t *testing.T) {
-		reader, err := NewDeltalogDeserializeReaderUnified(nil)
+		reader, err := NewDeltalogDeserializeReader(nil)
 		assert.NoError(t, err)
 		defer reader.Close()
 		err = reader.Next()
@@ -302,7 +302,7 @@ func TestDeltalogSerializeWriter(t *testing.T) {
 		size := 16
 		blob, err := generateTestDeltalogData(size)
 		assert.NoError(t, err)
-		reader, err := NewDeltalogDeserializeReaderUnified([]*Blob{blob})
+		reader, err := NewDeltalogDeserializeReader([]*Blob{blob})
 		assert.NoError(t, err)
 		defer reader.Close()
 
@@ -331,7 +331,7 @@ func TestDeltalogSerializeWriter(t *testing.T) {
 		assert.NoError(t, err)
 		assert.NotNil(t, newblob)
 		// assert.Equal(t, blobs[0].Value, newblobs[0].Value)
-		reader, err = NewDeltalogDeserializeReaderUnified([]*Blob{newblob})
+		reader, err = NewDeltalogDeserializeReader([]*Blob{newblob})
 		assert.NoError(t, err)
 		defer reader.Close()
 		for i := 0; i < size; i++ {
@@ -346,7 +346,7 @@ func TestDeltalogSerializeWriter(t *testing.T) {
 
 func TestDeltalogV2(t *testing.T) {
 	t.Run("test empty data", func(t *testing.T) {
-		reader, err := NewDeltalogDeserializeReaderUnified(nil)
+		reader, err := NewDeltalogDeserializeReader(nil)
 		assert.NoError(t, err)
 		defer reader.Close()
 		err = reader.Next()
@@ -384,7 +384,7 @@ func TestDeltalogV2(t *testing.T) {
 		blobs := []*Blob{blob}
 
 		// Deserialize the data
-		reader, err := NewDeltalogDeserializeReaderUnified(blobs)
+		reader, err := NewDeltalogDeserializeReader(blobs)
 		assert.NoError(t, err)
 		defer reader.Close()
 		for i := 0; i < size; i++ {