hash write changes

Author: Hitenjain14

code/go/0chain.net/blobbercore/filestore/storage.go

@@ -246,7 +246,11 @@ func (fs *FileStore) CommitWrite(allocID, conID string, fileData *FileInputData)
 	fileSize := rStat.Size()
 	start := time.Now()
 	hasher := GetNewCommitHasher(fileSize)
-	buffer := make([]byte, BufferSize)
+	bufSize := BufferSize
+	if fileSize < BufferSize {
+		bufSize = int(fileSize)
+	}
+	buffer := make([]byte, bufSize)
 	_, err = io.CopyBuffer(hasher, r, buffer)
 	if err != nil {
 		return false, common.NewError("read_write_error", err.Error())

code/go/0chain.net/blobbercore/filestore/tree_validation.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io"
 	"math"
+	"sync"
 
 	"github.com/0chain/gosdk/core/util"
 	"golang.org/x/crypto/sha3"
@@ -402,30 +403,74 @@ func getNewValidationTree(dataSize int64) *validationTree {
 type commitHasher struct {
 	fmt           *fixedMerkleTree
 	vt            *validationTree
-	writer        io.Writer
 	isInitialized bool
 }
 
 func GetNewCommitHasher(dataSize int64) *commitHasher {
 	c := new(commitHasher)
 	c.fmt = getNewFixedMerkleTree()
 	c.vt = getNewValidationTree(dataSize)
-	c.writer = io.MultiWriter(c.fmt, c.vt)
 	c.isInitialized = true
 	return c
 }
 
 func (c *commitHasher) Write(b []byte) (int, error) {
-	return c.writer.Write(b)
+	var (
+		wg      sync.WaitGroup
+		errChan = make(chan error, 2)
+		n       int
+	)
+	wg.Add(2)
+	go func() {
+		_, err := c.fmt.Write(b)
+		if err != nil {
+			errChan <- err
+		}
+
+		wg.Done()
+	}()
+	go func() {
+		written, err := c.vt.Write(b)
+		if err != nil {
+			errChan <- err
+		}
+		n = written
+		wg.Done()
+	}()
+	wg.Wait()
+	close(errChan)
+	for err := range errChan {
+		return n, err
+	}
+	return n, nil
 }
 
 func (c *commitHasher) Finalize() error {
-	err := c.fmt.Finalize()
-	if err != nil {
+	var (
+		wg      sync.WaitGroup
+		errChan = make(chan error, 2)
+	)
+	wg.Add(2)
+	go func() {
+		err := c.fmt.Finalize()
+		if err != nil {
+			errChan <- err
+		}
+		wg.Done()
+	}()
+	go func() {
+		err := c.vt.Finalize()
+		if err != nil {
+			errChan <- err
+		}
+		wg.Done()
+	}()
+	wg.Wait()
+	close(errChan)
+	for err := range errChan {
 		return err
 	}
-
-	return c.vt.Finalize()
+	return nil
 }
 
 func (c *commitHasher) GetFixedMerkleRoot() string {

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

@@ -76,7 +76,7 @@ func (cmd *UploadFileCommand) IsValidated(ctx context.Context, req *http.Request
 		logging.Logger.Error(err.Error())
 		return common.NewError("database_error", "Got db error while getting ref")
 	}
-	elapsedRefExist := time.Since(start) - elapsedUnmarshal
+	elapsedRefExist := time.Since(start) - elapsedUnmarshal - elapsedReadForm
 	if isExist {
 		msg := fmt.Sprintf("File at path :%s: already exists", fileChanger.Path)
 		return common.NewError("duplicate_file", msg)