Skip to content

Commit 826e81c

Browse files
authored
fix: remove page id / parent id (#514)
* fix: remove page id / parent id Signed-off-by: Alex Chi <[email protected]> * fix page size Signed-off-by: Alex Chi <[email protected]> --------- Signed-off-by: Alex Chi <[email protected]>
1 parent faa5fc6 commit 826e81c

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

src/include/storage/page/b_plus_tree_internal_page.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
namespace bustub {
1818

1919
#define B_PLUS_TREE_INTERNAL_PAGE_TYPE BPlusTreeInternalPage<KeyType, ValueType, KeyComparator>
20-
#define INTERNAL_PAGE_HEADER_SIZE 24
20+
#define INTERNAL_PAGE_HEADER_SIZE 12
2121
#define INTERNAL_PAGE_SIZE ((BUSTUB_PAGE_SIZE - INTERNAL_PAGE_HEADER_SIZE) / (sizeof(MappingType)))
2222
/**
2323
* Store n indexed keys and n+1 child pointers (page_id) within internal page.

src/include/storage/page/b_plus_tree_leaf_page.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
namespace bustub {
1919

2020
#define B_PLUS_TREE_LEAF_PAGE_TYPE BPlusTreeLeafPage<KeyType, ValueType, KeyComparator>
21-
#define LEAF_PAGE_HEADER_SIZE 28
21+
#define LEAF_PAGE_HEADER_SIZE 16
2222
#define LEAF_PAGE_SIZE ((BUSTUB_PAGE_SIZE - LEAF_PAGE_HEADER_SIZE) / sizeof(MappingType))
2323

2424
/**
@@ -31,12 +31,12 @@ namespace bustub {
3131
* | HEADER | KEY(1) + RID(1) | KEY(2) + RID(2) | ... | KEY(n) + RID(n)
3232
* ----------------------------------------------------------------------
3333
*
34-
* Header format (size in byte, 28 bytes in total):
34+
* Header format (size in byte, 16 bytes in total):
3535
* ---------------------------------------------------------------------
36-
* | PageType (4) | LSN (4) | CurrentSize (4) | MaxSize (4) |
36+
* | PageType (4) | CurrentSize (4) | MaxSize (4) |
3737
* ---------------------------------------------------------------------
3838
* -----------------------------------------------
39-
* | ParentPageId (4) | PageId (4) | NextPageId (4)
39+
* | NextPageId (4)
4040
* -----------------------------------------------
4141
*/
4242
INDEX_TEMPLATE_ARGUMENTS

src/storage/page/b_plus_tree_internal_page.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ namespace bustub {
2121
*****************************************************************************/
2222
/*
2323
* Init method after creating a new internal page
24-
* Including set page type, set current size, set page id, set parent id and set
25-
* max page size
24+
* Including set page type, set current size, and set max page size
2625
*/
2726
INDEX_TEMPLATE_ARGUMENTS
2827
void B_PLUS_TREE_INTERNAL_PAGE_TYPE::Init(int max_size) {}

src/storage/page/b_plus_tree_leaf_page.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ namespace bustub {
2323

2424
/**
2525
* Init method after creating a new leaf page
26-
* Including set page type, set current size to zero, set page id/parent id, set
27-
* next page id and set max size
26+
* Including set page type, set current size to zero, set next page id and set max size
2827
*/
2928
INDEX_TEMPLATE_ARGUMENTS
3029
void B_PLUS_TREE_LEAF_PAGE_TYPE::Init(int max_size) {}

0 commit comments

Comments
 (0)