rename columnReader to fieldReader

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>

internal/util/importutilv2/numpy/column_reader.go → internal/util/importutilv2/numpy/field_reader.go

@@ -33,7 +33,7 @@ import (
 	"github.com/milvus-io/milvus/pkg/util/typeutil"
 )
 
-type ColumnReader struct {
+type FieldReader struct {
 	reader    io.Reader
 	npyReader *npy.Reader
 	order     binary.ByteOrder
@@ -44,7 +44,7 @@ type ColumnReader struct {
 	readPosition int
 }
 
-func NewColumnReader(reader io.Reader, field *schemapb.FieldSchema) (*ColumnReader, error) {
+func NewFieldReader(reader io.Reader, field *schemapb.FieldSchema) (*FieldReader, error) {
 	r, err := npyio.NewReader(reader)
 	if err != nil {
 		return nil, err
@@ -63,7 +63,7 @@ func NewColumnReader(reader io.Reader, field *schemapb.FieldSchema) (*ColumnRead
 		return nil, err
 	}
 
-	cr := &ColumnReader{
+	cr := &FieldReader{
 		reader:    reader,
 		npyReader: r,
 		dim:       dim,
@@ -82,7 +82,7 @@ func ReadN[T any](reader io.Reader, order binary.ByteOrder, n int64) ([]T, error
 	return data, nil
 }
 
-func (c *ColumnReader) getCount(count int64) int64 {
+func (c *FieldReader) getCount(count int64) int64 {
 	shape := c.npyReader.Header.Descr.Shape
 	if len(shape) == 0 {
 		return 0
@@ -105,7 +105,7 @@ func (c *ColumnReader) getCount(count int64) int64 {
 	return count
 }
 
-func (c *ColumnReader) Next(count int64) (any, error) {
+func (c *FieldReader) Next(count int64) (any, error) {
 	readCount := c.getCount(count)
 	if readCount == 0 {
 		return nil, nil
@@ -225,10 +225,10 @@ func (c *ColumnReader) Next(count int64) (any, error) {
 	return data, nil
 }
 
-func (c *ColumnReader) Close() {}
+func (c *FieldReader) Close() {}
 
 // setByteOrder sets BigEndian/LittleEndian, the logic of this method is copied from npyio lib
-func (c *ColumnReader) setByteOrder() {
+func (c *FieldReader) setByteOrder() {
 	var nativeEndian binary.ByteOrder
 	v := uint16(1)
 	switch byte(v >> 8) {
@@ -248,7 +248,7 @@ func (c *ColumnReader) setByteOrder() {
 	}
 }
 
-func (c *ColumnReader) ReadString(count int64) ([]string, error) {
+func (c *FieldReader) ReadString(count int64) ([]string, error) {
 	// varchar length, this is the max length, some item is shorter than this length, but they also occupy bytes of max length
 	maxLen, utf, err := stringLen(c.npyReader.Header.Descr.Type)
 	if err != nil || maxLen <= 0 {

internal/util/importutilv2/numpy/reader.go

@@ -28,16 +28,16 @@ import (
 type Reader struct {
 	schema     *schemapb.CollectionSchema
 	bufferSize int
-	crs        map[int64]*ColumnReader // fieldID -> ColumnReader
+	frs        map[int64]*FieldReader // fieldID -> FieldReader
 }
 
 func NewReader(schema *schemapb.CollectionSchema, readers map[int64]io.Reader, bufferSize int) (*Reader, error) {
 	fields := lo.KeyBy(schema.GetFields(), func(field *schemapb.FieldSchema) int64 {
 		return field.GetFieldID()
 	})
-	crs := make(map[int64]*ColumnReader)
+	crs := make(map[int64]*FieldReader)
 	for fieldID, r := range readers {
-		cr, err := NewColumnReader(r, fields[fieldID])
+		cr, err := NewFieldReader(r, fields[fieldID])
 		if err != nil {
 			return nil, err
 		}
@@ -46,7 +46,7 @@ func NewReader(schema *schemapb.CollectionSchema, readers map[int64]io.Reader, b
 	return &Reader{
 		schema:     schema,
 		bufferSize: bufferSize,
-		crs:        crs,
+		frs:        crs,
 	}, nil
 }
 
@@ -57,7 +57,7 @@ func (r *Reader) Read() (*storage.InsertData, error) {
 	}
 OUTER:
 	for {
-		for fieldID, cr := range r.crs {
+		for fieldID, cr := range r.frs {
 			data, err := cr.Next(1)
 			if err != nil {
 				return nil, err
@@ -75,7 +75,7 @@ OUTER:
 		}
 	}
 
-	for fieldID := range r.crs {
+	for fieldID := range r.frs {
 		if insertData.Data[fieldID].RowNum() == 0 {
 			return nil, nil
 		}
@@ -84,7 +84,7 @@ OUTER:
 }
 
 func (r *Reader) Close() {
-	for _, cr := range r.crs {
+	for _, cr := range r.frs {
 		cr.Close()
 	}
 }