Refactor

Author: CodeHariK

secretary/Makefile

@@ -7,14 +7,17 @@ clean:
 one: clean
 	go test ./... -v -run $(test)
 
+mul: clean
+	go test ./... -v -run "^$(test)$$" 
+
 test: clean
-	go test -cover -coverprofile=cover.txt ./...
+	go test ./... -cover -coverprofile=cover.txt
 
 vtest: clean
-	go test -cover -coverprofile=cover.txt -v ./...
+	go test ./... -v -cover -coverprofile=cover.txt
 
 cover: clean
-	go test -cover -coverprofile=cover.txt ./...
+	go test ./... -cover -coverprofile=cover.txt
 	go tool cover -func=cover.txt
 	go tool cover -html=cover.txt
 

secretary/btree.go

@@ -70,18 +70,25 @@ func (s *Secretary) NewBTree(
 	}
 	tree.recordPagers = recordPagers
 
+	s.AddTree(tree)
+
 	return tree, nil
 }
 
 func (tree *BTree) close() error {
 	errs := []error{}
-	if err := tree.nodePager.file.Close(); err != nil {
-		errs = append(errs, err)
+
+	if tree.nodePager != nil {
+		if err := tree.nodePager.file.Close(); err != nil {
+			errs = append(errs, err)
+		}
 	}
 
 	for _, pager := range tree.recordPagers {
-		if err := pager.file.Close(); err != nil {
-			errs = append(errs, err)
+		if pager != nil {
+			if err := pager.file.Close(); err != nil {
+				errs = append(errs, err)
+			}
 		}
 	}
 
@@ -104,23 +111,7 @@ func (tree *BTree) SaveHeader() error {
 }
 
 func (tree *BTree) ReadNodeAtIndex(index uint64) (*Node, error) {
-	// offset := SECRETARY_HEADER_LENGTH + index*uint64(tree.nodeSize)
-
-	// rootBytes, err := tree.nodePager.ReadAt(int64(offset), int32(tree.nodeSize))
-	// if err != nil {
-	// 	return nil, err
-	// }
-
-	// var node Node
-	// err = binstruct.Deserialize(rootBytes, &node)
-	// if err != nil {
-	// 	return nil, err
-	// }
-
-	// return &node, nil
-
 	page, err := tree.nodePager.ReadPage(int64(index))
-
 	return page.Data, err
 }
 
@@ -133,7 +124,22 @@ func (tree *BTree) readRoot() error {
 	return nil
 }
 
-func (tree *BTree) SaveNode(node *Node) error {
+func (tree *BTree) WriteNodeAtIndex(node *Node, index uint64) error {
+	node.Index = index
+	if node.parent != nil {
+		node.ParentIndex = node.parent.Index
+	}
+	// if node.next != nil {
+	// 	node.NextIndex = node.next.Index
+	// }
+	// if node.prev != nil {
+	// 	node.PrevIndex = node.prev.Index
+	// }
+
+	return tree.nodePager.WritePage(node, int64(index))
+}
+
+func (tree *BTree) WriteNode(node *Node) error {
 	if node.Index == 0 {
 		lastFileIndex, err := tree.nodePager.NumPages()
 		if err != nil {
@@ -142,37 +148,15 @@ func (tree *BTree) SaveNode(node *Node) error {
 		if uint64(lastFileIndex) != tree.NumNodeSeq {
 			return fmt.Errorf("NumNodes dont match %d != %d", lastFileIndex, tree.NumNodeSeq)
 		}
-		tree.SaveNodeAtIndex(node, uint64(lastFileIndex))
+		tree.WriteNodeAtIndex(node, uint64(lastFileIndex))
 	} else {
-		tree.SaveNodeAtIndex(node, uint64(node.Index))
+		tree.WriteNodeAtIndex(node, uint64(node.Index))
 	}
 	return nil
 }
 
-func (tree *BTree) SaveNodeAtIndex(node *Node, index uint64) error {
-	node.Index = index
-	if node.parent != nil {
-		node.ParentIndex = node.parent.Index
-	}
-	if node.next != nil {
-		node.NextIndex = node.next.Index
-	}
-	if node.prev != nil {
-		node.PrevIndex = node.prev.Index
-	}
-
-	rootHeader, err := binstruct.Serialize(node)
-	if err != nil {
-		return err
-	}
-
-	offset := SECRETARY_HEADER_LENGTH + index*uint64(tree.nodeSize)
-
-	return tree.nodePager.WriteAt(rootHeader, int64(offset))
-}
-
-func (tree *BTree) saveRoot() error {
-	return tree.SaveNodeAtIndex(tree.root, 0)
+func (tree *BTree) writeRoot() error {
+	return tree.WriteNodeAtIndex(tree.root, 0)
 }
 
 func (s *Secretary) NewBTreeReadHeader(collectionName string) (*BTree, error) {
@@ -202,6 +186,47 @@ func (s *Secretary) NewBTreeReadHeader(collectionName string) (*BTree, error) {
 	return &deserializedTree, nil
 }
 
+// func (s *Secretary) NewBTreeReadHeader(collectionName string) (*BTree, error) {
+// 	temptree := BTree{CollectionName: collectionName}
+// 	nodePager, err := temptree.NewNodePager("index", 0)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+
+// 	headerData, err := nodePager.ReadAt(0, SECRETARY_HEADER_LENGTH)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+
+// 	data := bytes.Trim(headerData, "-")[len(SECRETARY):]
+// 	var deserializedTree BTree
+// 	err = binstruct.Deserialize(data, &deserializedTree)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+
+// 	tree, err := s.NewBTree(
+// 		collectionName,
+// 		deserializedTree.Order,
+// 		deserializedTree.NumLevel,
+// 		deserializedTree.BaseSize,
+// 		deserializedTree.Increment,
+// 		deserializedTree.CompactionBatchSize,
+// 	)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+
+// 	tree.NodeSeq = deserializedTree.NodeSeq
+// 	tree.NumNodeSeq = deserializedTree.NumNodeSeq
+
+// 	// if err := tree.readRoot(); err != nil {
+// 	// 	return nil, err
+// 	// }
+
+// 	return tree, nil
+// }
+
 func (tree *BTree) Height() int {
 	height := 0
 

secretary/btree_test.go

@@ -8,13 +8,10 @@ import (
 	"github.com/codeharik/secretary/utils/binstruct"
 )
 
-// TestBTreeSerialization tests the serialization and deserialization of BPlusTree
 func TestBTreeSerialization(t *testing.T) {
-	_, originalTree := dummyTree(t, "TestBTreeSerialization", 10)
+	s, originalTree := dummyTree(t, "TestBTreeSerialization", 10)
 
-	// Serialize the tree
 	serializedData, err := binstruct.Serialize(originalTree)
-	// serializedData, err := originalTree.Serialize()
 	if err != nil {
 		t.Fatalf("Serialization failed: %v", err)
 	}
@@ -33,6 +30,8 @@ func TestBTreeSerialization(t *testing.T) {
 	if !eq || err != nil {
 		t.Fatalf("\nShould be Equal\n")
 	}
+
+	s.PagerShutdown()
 }
 
 func TestBtreeInvalid(t *testing.T) {
@@ -67,10 +66,12 @@ func TestBtreeInvalid(t *testing.T) {
 	if invalidNameErr == nil || invalidIncrementErr == nil || invalidOrderErr == nil {
 		t.Fatal(invalidNameErr, invalidIncrementErr, invalidOrderErr)
 	}
+
+	s.PagerShutdown()
 }
 
-func TestSaveReadHeader(t *testing.T) {
-	s, tree := dummyTree(t, "TestSaveHeader", 10)
+func TestBtreeSaveReadHeader(t *testing.T) {
+	s, tree := dummyTree(t, "TestBtreeSaveReadHeader", 10)
 
 	err := tree.SaveHeader()
 	if err != nil {
@@ -92,10 +93,12 @@ func TestSaveReadHeader(t *testing.T) {
 	if dErr != nil || tErr != nil || bytes.Compare(tJson, dJson) != 0 {
 		t.Log("\n", string(tJson), "\n", string(dJson))
 	}
+
+	s.PagerShutdown()
 }
 
 func TestBTreeHeight(t *testing.T) {
-	_, tree := dummyTree(t, "TestSaveHeader", 4)
+	s, tree := dummyTree(t, "TestBTreeHeight", 4)
 
 	var keySeq uint64 = 0
 
@@ -121,12 +124,14 @@ func TestBTreeHeight(t *testing.T) {
 	if tree.Height() != 3 {
 		t.Fatalf("Expected height %d", tree.Height())
 	}
+
+	s.PagerShutdown()
 }
 
 func TestBTreeClose(t *testing.T) {
-	_, tree := dummyTree(t, "TestSaveHeader", 4)
+	s, _ := dummyTree(t, "TestBTreeClose", 4)
 
-	err := tree.close()
+	err := s.PagerShutdown()
 	if err != nil {
 		t.Fatal(err)
 	}

secretary/datalocation.go

@@ -22,13 +22,6 @@ func (nodes *Node) NewPage(index int64) *Page[*Node] {
 	}
 }
 
-func (records *Record) NewPage(index int64) *Page[*Record] {
-	return &Page[*Record]{
-		Index: index,
-		Data:  &Record{},
-	}
-}
-
 func (nodes *Node) FromBytes(data []byte) error {
 	err := binstruct.Deserialize(data, nodes)
 	if err != nil {
@@ -37,6 +30,13 @@ func (nodes *Node) FromBytes(data []byte) error {
 	return nil
 }
 
+func (records *Record) NewPage(index int64) *Page[*Record] {
+	return &Page[*Record]{
+		Index: index,
+		Data:  &Record{},
+	}
+}
+
 func (records *Record) ToBytes() ([]byte, error) {
 	return binstruct.Serialize(records)
 }

secretary/example/main.go

@@ -36,9 +36,6 @@ func main() {
 		utils.Log(userErr, imagesErr)
 	}
 
-	s.AddTree(users)
-	s.AddTree(images)
-
 	var keySeq uint64 = 0
 	var sortedRecords []*secretary.Record
 	var sortedKeys [][]byte