feat: add test for readblob and findblob

GitDataAI · Dec 11, 2023 · 24a532d · 24a532d
1 parent 5456cc4
commit 24a532d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 19 deletions.
diff --git a/versionmgr/worktree.go b/versionmgr/worktree.go
@@ -143,6 +143,7 @@ func (workTree *WorkTree) WriteBlob(ctx context.Context, adapter block.Adapter,
 	}
 
 	return &models.Blob{
+		Type: models.BlobObject,
 		Hash: hash,
 		Size: hashReader.CopiedSize,
 	}, nil

diff --git a/versionmgr/worktree_test.go b/versionmgr/worktree_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"errors"
+	"io"
 	"testing"
 
 	"github.com/jiaozifs/jiaozifs/utils/hash"
@@ -27,16 +28,22 @@ func TestTreeOpWriteBlob(t *testing.T) {
 	adapter := mem.New(ctx)
 	objRepo := models.NewObjectRepo(db)
 
-	treeOp, err := NewWorkTree(ctx, objRepo, EmptyDirEntry)
+	workTree, err := NewWorkTree(ctx, objRepo, EmptyDirEntry)
 	require.NoError(t, err)
 
 	binary := []byte("Build simple, secure, scalable systems with Go")
 	bLen := int64(len(binary))
 	r := bytes.NewReader(binary)
-	blob, err := treeOp.WriteBlob(ctx, adapter, r, bLen, block.PutOpts{})
+	blob, err := workTree.WriteBlob(ctx, adapter, r, bLen, block.PutOpts{})
 	require.NoError(t, err)
 	assert.Equal(t, bLen, blob.Size)
 	assert.Equal(t, "f3b39786b86a96372589aa1166966643", blob.Hash.Hex())
+
+	reader, err := workTree.ReadBlob(ctx, adapter, blob, nil)
+	require.NoError(t, err)
+	content, err := io.ReadAll(reader)
+	require.NoError(t, err)
+	require.Equal(t, binary, content)
 }
 
 func TestTreeOpTreeOp(t *testing.T) {
@@ -47,45 +54,52 @@ func TestTreeOpTreeOp(t *testing.T) {
 	adapter := mem.New(ctx)
 	objRepo := models.NewObjectRepo(db)
 
-	treeOp, err := NewWorkTree(ctx, objRepo, EmptyDirEntry)
+	workTree, err := NewWorkTree(ctx, objRepo, EmptyDirEntry)
 	require.NoError(t, err)
 
 	binary := []byte("Build simple, secure, scalable systems with Go")
 	bLen := int64(len(binary))
 	r := bytes.NewReader(binary)
-	blob, err := treeOp.WriteBlob(ctx, adapter, r, bLen, block.PutOpts{})
+	blob, err := workTree.WriteBlob(ctx, adapter, r, bLen, block.PutOpts{})
 	require.NoError(t, err)
 
-	err = treeOp.AddLeaf(ctx, "a/b/c.txt", blob)
+	err = workTree.AddLeaf(ctx, "a/b/c.txt", blob)
 	require.NoError(t, err)
-	require.Equal(t, "3bf643c30934d121ee45d413b165f135", hash.Hash(treeOp.Root().Hash()).Hex())
+	require.Equal(t, "3bf643c30934d121ee45d413b165f135", hash.Hash(workTree.Root().Hash()).Hex())
 
 	//add again expect get an error
-	err = treeOp.AddLeaf(ctx, "a/b/c.txt", blob)
+	err = workTree.AddLeaf(ctx, "a/b/c.txt", blob)
 	require.True(t, errors.Is(err, ErrEntryExit))
 
 	//update path
 	binary = []byte(`“At the time, no single team member knew Go, but within a month, everyone was writing in Go and we were building out the endpoints. ”`)
 	bLen = int64(len(binary))
 	r = bytes.NewReader(binary)
-	blob, err = treeOp.WriteBlob(ctx, adapter, r, bLen, block.PutOpts{})
+	blob, err = workTree.WriteBlob(ctx, adapter, r, bLen, block.PutOpts{})
 	require.NoError(t, err)
 
-	err = treeOp.ReplaceLeaf(ctx, "a/b/c.txt", blob)
+	err = workTree.ReplaceLeaf(ctx, "a/b/c.txt", blob)
 	require.NoError(t, err)
-	require.Equal(t, "8856b15f0f6c7ad21bfabe812df69e83", hash.Hash(treeOp.Root().Hash()).Hex())
+	require.Equal(t, "8856b15f0f6c7ad21bfabe812df69e83", hash.Hash(workTree.Root().Hash()).Hex())
 
+	{
+		//find blob
+		findBlob, name, err := workTree.FindBlob(ctx, "a/b/c.txt")
+		require.NoError(t, err)
+		require.Equal(t, "c.txt", name)
+		require.Equal(t, blob.Hash.Hex(), findBlob.Hash.Hex())
+	}
 	{
 		//add another branch
-		err = treeOp.AddLeaf(ctx, "a/b/d.txt", blob)
+		err = workTree.AddLeaf(ctx, "a/b/d.txt", blob)
 		require.NoError(t, err)
-		require.Equal(t, "225f0ca6233681a441969922a7425db2", hash.Hash(treeOp.Root().Hash()).Hex())
+		require.Equal(t, "225f0ca6233681a441969922a7425db2", hash.Hash(workTree.Root().Hash()).Hex())
 
 	}
 
 	{
 		//check fs structure
-		rootDir, err := objRepo.TreeNode(ctx, treeOp.Root().Hash())
+		rootDir, err := objRepo.TreeNode(ctx, workTree.Root().Hash())
 		require.NoError(t, err)
 		require.Len(t, rootDir.SubObjects, 1)
 		require.Equal(t, "a", rootDir.SubObjects[0].Name)
@@ -104,25 +118,25 @@ func TestTreeOpTreeOp(t *testing.T) {
 
 	{
 		//check ls
-		subObjects, err := treeOp.Ls(ctx, "a")
+		subObjects, err := workTree.Ls(ctx, "a")
 		require.NoError(t, err)
 		require.Len(t, subObjects, 1)
 		require.Equal(t, "b", subObjects[0].Name)
 
-		subObjects, err = treeOp.Ls(ctx, "a/b")
+		subObjects, err = workTree.Ls(ctx, "a/b")
 		require.NoError(t, err)
 		require.Len(t, subObjects, 2)
 		require.Equal(t, "c.txt", subObjects[0].Name)
 		require.Equal(t, "d.txt", subObjects[1].Name)
 	}
 
-	err = treeOp.RemoveEntry(ctx, "a/b/c.txt")
+	err = workTree.RemoveEntry(ctx, "a/b/c.txt")
 	require.NoError(t, err)
-	require.Equal(t, "f90e2d306ad172824fa171b9e0d9e133", hash.Hash(treeOp.Root().Hash()).Hex())
+	require.Equal(t, "f90e2d306ad172824fa171b9e0d9e133", hash.Hash(workTree.Root().Hash()).Hex())
 
-	err = treeOp.RemoveEntry(ctx, "a/b/d.txt")
+	err = workTree.RemoveEntry(ctx, "a/b/d.txt")
 	require.NoError(t, err)
-	require.Equal(t, "", hash.Hash(treeOp.Root().Hash()).Hex())
+	require.Equal(t, "", hash.Hash(workTree.Root().Hash()).Hex())
 }
 
 func TestRemoveEntry(t *testing.T) {