Refactor

Author: CodeHariK

secretary/btree.go

@@ -10,6 +10,24 @@ import (
 	"github.com/codeharik/secretary/utils/file"
 )
 
+func calcNodeSize(order int) int {
+	node := Node{
+		Version:     1,
+		NodeID:      1,
+		Index:       1,
+		ParentIndex: 1,
+	}
+
+	node.KeyLocation = make([]uint64, order)
+	node.Keys = make([][]byte, order)
+
+	bin, err := binstruct.Serialize(&node)
+	if err != nil {
+		return -1
+	}
+	return len(bin)
+}
+
 func (s *Secretary) NewBTree(
 	collectionName string,
 	order uint8,
@@ -26,7 +44,7 @@ func (s *Secretary) NewBTree(
 		return nil, ErrorInvalidIncrement
 	}
 
-	nodeSize := uint32(order)*(KEY_SIZE+KEY_OFFSET_SIZE) + 3*POINTER_SIZE + 1
+	nodeSize := calcNodeSize(int(order))
 
 	safeCollectionName := utils.SafeCollectionString(collectionName)
 	if len(safeCollectionName) < 5 || len(safeCollectionName) > MAX_COLLECTION_NAME_LENGTH {

secretary/pager.go

@@ -5,6 +5,7 @@ import (
 	"math"
 	"os"
 
+	"github.com/codeharik/secretary/utils"
 	"github.com/dgraph-io/ristretto/v2"
 )
 
@@ -59,15 +60,15 @@ func (tree *BTree) NewRecordPager(fileType string, level uint8) (*RecordPager, e
 
 // Opens or creates a file and sets up the Pager
 func NewPager[T PageItem[T]](tree *BTree, fileType string, level uint8) (*Pager[T], error) {
-	pageSize := int64(float64(tree.BaseSize) * math.Pow(float64(tree.Increment)/100, float64(level)))
+	itemSize := int64(float64(tree.BaseSize) * math.Pow(float64(tree.Increment)/100, float64(level)))
 
 	var headerSize int64 = 0
 
-	path := fmt.Sprintf("SECRETARY/%s/%s_%d_%d.bin", tree.CollectionName, fileType, level, pageSize)
+	path := fmt.Sprintf("SECRETARY/%s/%s_%d_%d.bin", tree.CollectionName, fileType, level, itemSize)
 	if fileType == "index" {
 
 		headerSize = SECRETARY_HEADER_LENGTH
-		pageSize = 1024 * 1024
+		itemSize = int64(tree.nodeSize)
 
 		path = fmt.Sprintf("SECRETARY/%s/%s.bin", tree.CollectionName, fileType)
 	}
@@ -104,7 +105,7 @@ func NewPager[T PageItem[T]](tree *BTree, fileType string, level uint8) (*Pager[
 		file:       file,
 		level:      level,
 		headerSize: headerSize,
-		itemSize:   pageSize,
+		itemSize:   itemSize,
 		dirtyPages: map[int64]bool{},
 	}
 
@@ -226,6 +227,17 @@ func (store *Pager[T]) WriteAt(data []byte, offset int64) error {
 
 // ReadAt reads data from the specified offset in the file
 func (store *Pager[T]) ReadAt(offset int64, size int32) ([]byte, error) {
+	fileInfo, err := store.file.Stat()
+	if err != nil {
+		return nil, ErrorFileStat(err)
+	}
+	fileSize := fileInfo.Size()
+
+	if offset+int64(size) > fileSize {
+		utils.Log(store.itemSize)
+		return nil, ErrorDataExceedPageSize(int(size), store.itemSize, offset)
+	}
+
 	// Allocate a buffer to hold the data
 	data := make([]byte, size)
 

secretary/pager_test.go

@@ -104,7 +104,7 @@ func TestPagerWriteAndReadAtOffset(t *testing.T) {
 
 	{ // Test: Write data that exceed batch size, Should Fail
 		offset := int64(float64(tree.nodePager.itemSize) * 5.8)
-		data := make([]byte, int64(float64(tree.nodePager.itemSize)*0.4))
+		data := make([]byte, int64(float64(tree.nodePager.itemSize)*0.8))
 
 		err := tree.nodePager.WriteAt(data, offset)
 		if err == nil {

secretary/utils/binstruct/binary_struct.go

@@ -15,7 +15,7 @@ import (
 	"sort"
 )
 
-var BYTEORDER binary.ByteOrder = binary.LittleEndian
+var BYTEORDER binary.ByteOrder = binary.BigEndian
 
 // Serialize struct to binary []byte (Little-Endian)
 // bin : type name
@@ -720,9 +720,9 @@ func writeByteLen(buf *bytes.Buffer, numByte int, length int) error {
 	switch numByte {
 	case 2:
 		return binary.Write(buf, BYTEORDER, uint16(length))
-	case 3:
-		return binary.Write(buf, BYTEORDER, uint32(length))
 	case 4:
+		return binary.Write(buf, BYTEORDER, uint32(length))
+	case 8:
 		return binary.Write(buf, BYTEORDER, uint64(length))
 	default:
 		return binary.Write(buf, BYTEORDER, uint8(length))
@@ -737,11 +737,11 @@ func readByteLen(buf *bytes.Reader, numByte int) (int, error) {
 		var temp uint16
 		err = binary.Read(buf, BYTEORDER, &temp)
 		length = int(temp)
-	case 3:
+	case 4:
 		var temp uint32
 		err = binary.Read(buf, BYTEORDER, &temp)
 		length = int(temp)
-	case 4:
+	case 8:
 		var temp uint64
 		err = binary.Read(buf, BYTEORDER, &temp)
 		length = int(temp)