addressing Felix's comments

Author: alexbondar92

pkg/dataplane/item.go

@@ -85,28 +85,32 @@ func (i Item) GetFieldUint64(name string) (uint64, error) {
 }
 
 // For internal use only - DO NOT USE!
-func (i Item) GetShard() (map[uint64]*ItemChunk, *ItemCurrentChunkMetadata, error) {
+func (i Item) GetShard() (map[int]*ItemChunk, *ItemCurrentChunkMetadata, error) {
 	const streamDataPrefix = "__data_stream["
 	const streamMetadataPrefix = "__data_stream_metadata["
 	const offsetPrefix = "__data_stream[0000]["
 
 	currentChunkMetadata := ItemCurrentChunkMetadata{}
-	chunkMap := make(map[uint64]*ItemChunk)
+	chunkMap := make(map[int]*ItemChunk)
 
 	for k, v := range i {
 		if strings.HasPrefix(k, streamDataPrefix) {
-			chunkID, ok := strconv.ParseUint(k[len(streamDataPrefix):][:4], 16, 64)
+			chunkID64, ok := strconv.ParseUint(k[len(streamDataPrefix):][:4], 16, 64)
 			if ok != nil {
 				return nil, nil, v3ioerrors.ErrInvalidTypeConversion
 			}
+			chunkID := int(chunkID64)
+
 			offset, ok := strconv.ParseUint(k[len(offsetPrefix):][:16], 16, 64)
 			if ok != nil {
 				return nil, nil, v3ioerrors.ErrInvalidTypeConversion
 			}
-			data, ok2 := v.([]byte)
-			if !ok2 {
+
+			data, castingSuccess := v.([]byte)
+			if !castingSuccess {
 				return nil, nil, v3ioerrors.ErrInvalidTypeConversion
 			}
+
 			streamData := ItemChunkData{Offset: offset, Data: &data}
 			if _, ok := chunkMap[chunkID]; !ok {
 				chunkMap[chunkID] = &ItemChunk{}
@@ -115,21 +119,24 @@ func (i Item) GetShard() (map[uint64]*ItemChunk, *ItemCurrentChunkMetadata, erro
 		}
 
 		if strings.HasPrefix(k, streamMetadataPrefix) {
-			chunkID, ok := strconv.ParseUint(k[len(streamMetadataPrefix):][:4], 16, 64)
+			chunkID64, ok := strconv.ParseUint(k[len(streamMetadataPrefix):][:4], 16, 64)
 			if ok != nil {
 				return nil, nil, v3ioerrors.ErrInvalidTypeConversion
 			}
+			chunkID := int(chunkID64)
 
-			metadata, ok2 := v.([]byte)
-			if !ok2 {
+			metadata, castingSuccess := v.([]byte)
+			if !castingSuccess {
 				return nil, nil, v3ioerrors.ErrInvalidTypeConversion
 			}
+
 			buf := bytes.NewBuffer(metadata[8:64])
 			chunkMetaData := ItemChunkMetadata{}
 			err := binary.Read(buf, binary.LittleEndian, &chunkMetaData)
 			if err != nil {
 				return nil, nil, err
 			}
+
 			if _, ok := chunkMap[chunkID]; !ok {
 				chunkMap[chunkID] = &ItemChunk{}
 			}

pkg/dataplane/test/sync_test.go

@@ -1420,7 +1420,7 @@ func (suite *syncStreamBackupRestoreTestSuite) TestStream() {
 	suite.Require().NoError(err)
 
 	type Shard struct {
-		Chunks       map[uint64]*v3io.ItemChunk
+		Chunks       map[int]*v3io.ItemChunk
 		CurrentChunk *v3io.ItemCurrentChunkMetadata
 	}
 	streamBackup := map[string]*Shard{}
@@ -1431,7 +1431,7 @@ func (suite *syncStreamBackupRestoreTestSuite) TestStream() {
 		suite.Require().NoError(err, "Failed to get stream")
 
 		if _, ok := streamBackup[shardName]; !ok {
-			streamBackup[shardName] = &Shard{Chunks: map[uint64]*v3io.ItemChunk{}}
+			streamBackup[shardName] = &Shard{Chunks: map[int]*v3io.ItemChunk{}}
 		}
 
 		for chunkId := range chunkMap {

pkg/dataplane/types.go

@@ -392,7 +392,7 @@ type CurrentChunkMetadata struct {
 type PutChunkInput struct {
 	DataPlaneInput       `json:"-"`
 	Path                 string                `json:"-"`
-	ChunkSeqNumber       uint64                `json:"ChunkSequenceNumber,omitempty"`
+	ChunkSeqNumber       int                   `json:"ChunkSequenceNumber,omitempty"`
 	Offset               uint64                `json:"Offset,omitempty"`
 	Data                 []byte                `json:"Data,omitempty"`
 	ChunksMetadata       []*ChunkMetadata      `json:"Metadata,omitempty"`