Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b924ad1
[buffer_pool.h/cpp] Make attribute public: PAGE_SIZE
jonleeyz Apr 28, 2019
b98666f
[heap_page.h] Update attribute specifications
jonleeyz Apr 29, 2019
4ac021b
Change method signature: Page::MarkDirty
jonleeyz Apr 28, 2019
fa2b97c
[heap_page.h/cpp] Update method specifications
jonleeyz Apr 29, 2019
b966231
[heap_page.cpp] Reimplement method: get_header_size
jonleeyz Apr 28, 2019
b131fff
[heap_page.cpp] Reimplement method: get_id_of_last_dirty_transaction
jonleeyz Apr 28, 2019
3457458
[heap_page.cpp] Reimplement method: MarkDirty
jonleeyz Apr 28, 2019
81db409
[heap_page.cpp] Reimplement method: SetBeforeImage
jonleeyz Apr 29, 2019
01a9f73
[heap_page.cpp] Reimplement method: get_number_of_tuples
jonleeyz Apr 28, 2019
5a2e25e
[heap_page.h/cpp] Reimplement constructor
jonleeyz Apr 29, 2019
33efc6e
[heap_page.cpp] Reimplement method: GetBeforeImage
jonleeyz Apr 28, 2019
265feef
[heap_page.cpp] Reimplement method: IsSlotUsed
jonleeyz Apr 28, 2019
69bb2d1
[heap_page.cpp] Reimplement method: SetSlot
jonleeyz Apr 29, 2019
41c5aa9
[heap_page.cpp] Clean up include statements
jonleeyz Apr 28, 2019
8674859
[heap_page.cpp] Reimplement function: ReadInNextTuple
jonleeyz Apr 28, 2019
ecef692
Add method to Field interface specification: Serialize
jonleeyz Apr 29, 2019
e73f8f9
[heap_page.cpp] Reimplement method: CreatePageDataRepresentation
jonleeyz Apr 29, 2019
d6ee689
[heap_page.cpp] Reimplement method: CreateEmptyPageDataRepresentation
jonleeyz Apr 29, 2019
f6c1942
[heap_page.cpp] Reimplement method: DeleteTuple
jonleeyz Apr 29, 2019
dc7a99e
[heap_page.cpp] Reimplement method: InsertTuple
jonleeyz Apr 29, 2019
864f2a0
[heap_page.h/cpp] Change method visibility: ReadInNextTuple
jonleeyz Apr 29, 2019
06eba00
[heap_page.h/cpp] Change method signature: ParseIntoField
jonleeyz Apr 29, 2019
43d5ab8
[page.h] Update documentation
jonleeyz Apr 29, 2019
8ee4ebf
[heap_page.h/cpp] Rename method: ParseNextTuple
jonleeyz Apr 29, 2019
e88166f
[heap_page.h/cpp] Implement destructor
jonleeyz Apr 29, 2019
a82f7a5
[heap_page.h] Delete default constructor
jonleeyz Apr 29, 2019
7770faa
[heap_page.h/cpp] Update documentation
jonleeyz Apr 29, 2019
1d53376
Fix build errors
jonleeyz Apr 29, 2019
063772c
Fix build warnings
jonleeyz Apr 29, 2019
a9f9c1c
[heap_page.h/cpp] Rename method: ParseStreamForTuple
jonleeyz Apr 29, 2019
4337782
[heap_page.h/cpp] Remove method: ParseIntoField
jonleeyz Apr 29, 2019
5bb934d
Add method to Field interface specification: ParseStreamForField
jonleeyz Apr 29, 2019
e035475
Update method specification: Field::Serialize
jonleeyz Apr 29, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/database/buffer_pool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ BufferPool::~BufferPool() {
buffer_pool = nullptr;
}

int BufferPool::get_page_size() {
return PAGE_SIZE;
}

Page * BufferPool::get_page(TransactionId * tid,
PageId * pid,
Permissions * perm) {
Expand Down Expand Up @@ -126,7 +122,7 @@ void BufferPool::InsertTuple(TransactionId * tid, int table_id, Tuple * t) {
std::vector<Page*> page_vector =
catalog->get_db_file(table_id)->AddTuple(*tid, *t);
for (Page * page: page_vector) {
page->MarkDirty(true, *tid);
page->MarkDirty(true, tid);
}
}

Expand All @@ -136,7 +132,7 @@ void BufferPool::DeleteTuple(TransactionId * tid, Tuple * t) {

DbFile * db_file = catalog->get_db_file(table_id);

db_file->DeleteTuple(*tid, *t)->MarkDirty(true, *tid);
db_file->DeleteTuple(*tid, *t)->MarkDirty(true, tid);
}

void BufferPool::FlushAllPages() {
Expand Down
2 changes: 1 addition & 1 deletion src/database/heap_file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ TupleDesc HeapFile::get_tuple_desc() const {
}

int HeapFile::get_num_pages() {
return (int) ceil(ftell(file) / BufferPool::get_page_size());
return (int) ceil(ftell(file) / BufferPool::PAGE_SIZE);
}

Page * HeapFile::ReadPage(PageId * pid) {
Expand Down
Loading