Merge branch 'staging' into sprint-1.16

Author: Jayashsatolia403

code/go/0chain.net/blobbercore/allocation/allocationchange.go

@@ -98,6 +98,15 @@ func (change *AllocationChange) Save(ctx context.Context) error {
 	return db.Save(change).Error
 }
 
+func (change *AllocationChange) Update(ctx context.Context) error {
+	db := datastore.GetStore().GetTransaction(ctx)
+	return db.Table(change.TableName()).Where("lookup_hash = ?", change.LookupHash).Updates(map[string]interface{}{
+		"size":       change.Size,
+		"updated_at": time.Now(),
+		"input":      change.Input,
+	}).Error
+}
+
 func (change *AllocationChange) Create(ctx context.Context) error {
 	db := datastore.GetStore().GetTransaction(ctx)
 	return db.Create(change).Error
@@ -162,6 +171,34 @@ func GetAllocationChanges(ctx context.Context, connectionID, allocationID, clien
 	return nil, err
 }
 
+func GetConnectionObj(ctx context.Context, connectionID, allocationID, clientID string) (*AllocationChangeCollector, error) {
+	cc := &AllocationChangeCollector{}
+	db := datastore.GetStore().GetTransaction(ctx)
+	err := db.Where("id = ? and allocation_id = ? and client_id = ?",
+		connectionID,
+		allocationID,
+		clientID,
+	).Take(cc).Error
+
+	if err == nil {
+		return cc, nil
+	}
+
+	if err == gorm.ErrRecordNotFound {
+		cc.ID = connectionID
+		cc.AllocationID = allocationID
+		cc.ClientID = clientID
+		cc.Status = NewConnection
+		err = cc.Create(ctx)
+		if err != nil {
+			return nil, err
+		}
+		return cc, nil
+	}
+
+	return nil, err
+}
+
 func (cc *AllocationChangeCollector) AddChange(allocationChange *AllocationChange, changeProcessor AllocationChangeProcessor) {
 	cc.AllocationChanges = append(cc.AllocationChanges, changeProcessor)
 	allocationChange.Input, _ = changeProcessor.Marshal()

code/go/0chain.net/blobbercore/allocation/file_changer_base.go

@@ -95,7 +95,7 @@ type FileCommand interface {
 	ProcessThumbnail(allocationObj *Allocation) error
 
 	// UpdateChange update AllocationChangeProcessor. It will be president in db for committing transcation
-	UpdateChange(ctx context.Context, connectionObj *AllocationChangeCollector) error
+	UpdateChange(ctx context.Context) error
 
 	// AddChange add Allocation change to db
 	AddChange(ctx context.Context) error

code/go/0chain.net/blobbercore/handler/file_command_delete.go

@@ -62,7 +62,7 @@ func (cmd *DeleteFileCommand) IsValidated(ctx context.Context, req *http.Request
 }
 
 // UpdateChange add DeleteFileChange in db
-func (cmd *DeleteFileCommand) UpdateChange(ctx context.Context, connectionObj *allocation.AllocationChangeCollector) error {
+func (cmd *DeleteFileCommand) UpdateChange(ctx context.Context) error {
 	err := cmd.AddChange(ctx)
 	if err == gorm.ErrDuplicatedKey {
 		return nil

code/go/0chain.net/blobbercore/handler/file_command_update.go

@@ -205,30 +205,11 @@ func (cmd *UpdateFileCommand) reloadChange() {
 }
 
 // UpdateChange add UpdateFileChanger in db
-func (cmd *UpdateFileCommand) UpdateChange(ctx context.Context, connectionObj *allocation.AllocationChangeCollector) error {
-	cmd.fileChanger.AllocationID = connectionObj.AllocationID
-	for _, c := range connectionObj.Changes {
-		filePath, _ := c.GetOrParseAffectedFilePath()
-		if c.Operation != sdkConst.FileOperationUpdate || cmd.fileChanger.Path != filePath {
-			continue
-		}
-
-		c.Size = connectionObj.Size
-		c.Input, _ = cmd.fileChanger.Marshal()
-
-		//c.ModelWithTS.UpdatedAt = time.Now()
-		err := connectionObj.Save(ctx)
-		if err != nil {
-			return err
-		}
-
-		return c.Save(ctx)
-	}
-
-	//NOT FOUND
-	connectionObj.AddChange(cmd.allocationChange, cmd.fileChanger)
-
-	return connectionObj.Save(ctx)
+func (cmd *UpdateFileCommand) UpdateChange(ctx context.Context) error {
+	connectionInput, _ := cmd.fileChanger.Marshal()
+	cmd.allocationChange.LookupHash = reference.GetReferenceLookup(cmd.fileChanger.AllocationID, cmd.fileChanger.Path)
+	cmd.allocationChange.Input = connectionInput
+	return cmd.allocationChange.Update(ctx)
 }
 
 func (cmd *UpdateFileCommand) AddChange(ctx context.Context) error {

code/go/0chain.net/blobbercore/handler/file_command_upload.go

@@ -223,29 +223,11 @@ func (cmd *UploadFileCommand) reloadChange() {
 }
 
 // UpdateChange replace AddFileChange in db
-func (cmd *UploadFileCommand) UpdateChange(ctx context.Context, connectionObj *allocation.AllocationChangeCollector) error {
-	cmd.fileChanger.AllocationID = connectionObj.AllocationID
-	for _, c := range connectionObj.Changes {
-		filePath, _ := c.GetOrParseAffectedFilePath()
-		if c.Operation != constants.FileOperationInsert || cmd.fileChanger.Path != filePath {
-			continue
-		}
-		c.Size = cmd.fileChanger.Size
-		c.Input, _ = cmd.fileChanger.Marshal()
-
-		//c.ModelWithTS.UpdatedAt = time.Now()
-		err := connectionObj.Save(ctx)
-		if err != nil {
-			return err
-		}
-
-		return c.Save(ctx)
-	}
-
-	//NOT FOUND
-	connectionObj.AddChange(cmd.allocationChange, cmd.fileChanger)
-
-	return connectionObj.Save(ctx)
+func (cmd *UploadFileCommand) UpdateChange(ctx context.Context) error {
+	connectionInput, _ := cmd.fileChanger.Marshal()
+	cmd.allocationChange.LookupHash = reference.GetReferenceLookup(cmd.fileChanger.AllocationID, cmd.fileChanger.Path)
+	cmd.allocationChange.Input = connectionInput
+	return cmd.allocationChange.Update(ctx)
 }
 
 func (cmd *UploadFileCommand) AddChange(ctx context.Context) error {

code/go/0chain.net/blobbercore/handler/object_operation_handler.go

@@ -1385,11 +1385,11 @@ func (fsh *StorageHandler) WriteFile(ctx context.Context, r *http.Request) (*all
 	}
 	// Update/Save the change
 	if res.UpdateChange {
-		dbConnectionObj, err := allocation.GetAllocationChanges(ctx, connectionID, allocationID, clientID)
+		_, err := allocation.GetConnectionObj(ctx, connectionID, allocationID, clientID)
 		if err != nil {
 			return nil, err
 		}
-		err = cmd.UpdateChange(ctx, dbConnectionObj)
+		err = cmd.UpdateChange(ctx)
 		if err != nil {
 			return nil, err
 		}

goose/migrations/1718188301_change_idx.sql

@@ -0,0 +1,5 @@
+-- +goose Up
+-- +goose StatementBegin
+
+CREATE INDEX idx_allocation_changes_lookup_hash ON allocation_changes USING HASH(lookup_hash);
+-- +goose StatementEnd