Skip to content

Commit 97ea4db

Browse files
committed
Pager
1 parent afd1a29 commit 97ea4db

10 files changed

Lines changed: 257 additions & 325 deletions

File tree

secretary/btree.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,35 +53,35 @@ func (s *Secretary) NewBTree(
5353
minNumKeys: uint32(int(order)-1) / 2,
5454
}
5555

56-
nodeBatchStore, err := tree.NewBatchStore("index", 0)
56+
indexPager, err := tree.NewPager("index", 0)
5757
if err != nil {
5858
return nil, err
5959
}
6060

61-
tree.nodeBatchStore = nodeBatchStore
61+
tree.indexPager = indexPager
6262

63-
recordBatchStores := make([]*BatchStore, batchNumLevel)
64-
for i := range recordBatchStores {
65-
store, err := tree.NewBatchStore("record", uint8(i))
63+
recordPagers := make([]*Pager, batchNumLevel)
64+
for i := range recordPagers {
65+
pager, err := tree.NewPager("record", uint8(i))
6666
if err != nil {
6767
return nil, err
6868
}
6969

70-
recordBatchStores[i] = store
70+
recordPagers[i] = pager
7171
}
72-
tree.recordBatchStores = recordBatchStores
72+
tree.recordPagers = recordPagers
7373

7474
return tree, nil
7575
}
7676

7777
func (tree *BTree) close() error {
7878
errs := []error{}
79-
if err := tree.nodeBatchStore.file.Close(); err != nil {
79+
if err := tree.indexPager.file.Close(); err != nil {
8080
errs = append(errs, err)
8181
}
8282

83-
for _, batchStore := range tree.recordBatchStores {
84-
if err := batchStore.file.Close(); err != nil {
83+
for _, pager := range tree.recordPagers {
84+
if err := pager.file.Close(); err != nil {
8585
errs = append(errs, err)
8686
}
8787
}
@@ -111,7 +111,7 @@ func (tree *BTree) SaveHeader() error {
111111
return err
112112
}
113113

114-
return tree.nodeBatchStore.WriteAt(0, header)
114+
return tree.indexPager.WriteAt(0, header)
115115
}
116116

117117
func (s *Secretary) NewBTreeReadHeader(collectionName string) (*BTree, error) {
@@ -126,7 +126,7 @@ func (s *Secretary) NewBTreeReadHeader(collectionName string) (*BTree, error) {
126126
return nil, err
127127
}
128128

129-
diskData, err := temp.nodeBatchStore.ReadAt(0, SECRETARY_HEADER_LENGTH)
129+
diskData, err := temp.indexPager.ReadAt(0, SECRETARY_HEADER_LENGTH)
130130
if err != nil {
131131
return nil, err
132132
}

secretary/errors.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ var (
5050
ErrorFileStat = func(err error) error {
5151
return fmt.Errorf("Error file stat: %v", err)
5252
}
53-
ErrorDataExceedBatchSize = func(len int, batchSize uint32, offset int64) error {
54-
return fmt.Errorf("Error: Data size %d exceeds batch size %d at offset %d", len, batchSize, offset)
53+
ErrorDataExceedPageSize = func(len int, pageSize int64, offset int64) error {
54+
return fmt.Errorf("Error: Data size %d exceeds batch size %d at offset %d", len, pageSize, offset)
5555
}
5656

5757
// Pointer links

secretary/node.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func (tree *BTree) saveRoot() error {
179179
return err
180180
}
181181

182-
return tree.nodeBatchStore.WriteAt(SECRETARY_HEADER_LENGTH, rootHeader)
182+
return tree.indexPager.WriteAt(SECRETARY_HEADER_LENGTH, rootHeader)
183183
}
184184

185185
//------------------------------------------------------------------

secretary/node_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func TestSaveRoot(t *testing.T) {
4444
t.Fatal(err)
4545
}
4646

47-
rootBytes, err := tree.nodeBatchStore.ReadAt(SECRETARY_HEADER_LENGTH, int32(tree.nodeSize))
47+
rootBytes, err := tree.indexPager.ReadAt(SECRETARY_HEADER_LENGTH, int32(tree.nodeSize))
4848
if err != nil {
4949
t.Fatal(err)
5050
}

0 commit comments

Comments
 (0)