Skip to content

fix: correct MAX_PAGE_NUM calculation #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CactiFromDesert wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: correct MAX_PAGE_NUM calculation #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cd7311
fix: correct MAX_PAGE_NUM calculation to account for buffer_pool_id
May 18, 2026
89dce96
style: apply clang-format to changed files
May 18, 2026
cbd49ad
style: apply clang-format formatting
May 18, 2026
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
2 changes: 1 addition & 1 deletion deps/3rd/jsoncpp
Open in desktop
Submodule jsoncpp updated 38 files
+1 −1 .clang-format
+20 −0 .github/workflows/clang-format.yml
+18 −0 .github/workflows/cmake.yml
+65 −0 .github/workflows/meson.yml
+0 −71 .travis.yml
+0 −130 .travis_scripts/cmake_builder.sh
+0 −83 .travis_scripts/meson_builder.sh
+0 −356 .travis_scripts/run-clang-format.py
+0 −4 .travis_scripts/run-clang-format.sh
+0 −8 .travis_scripts/travis.before_install.linux.sh
+0 −0 .travis_scripts/travis.before_install.osx.sh
+0 −5 .travis_scripts/travis.install.linux.sh
+0 −1 .travis_scripts/travis.install.osx.sh
+11 −17 CMakeLists.txt
+17 −0 SECURITY.md
+3 −3 amalgamate.py
+1 −1 example/readFromString/readFromString.cpp
+2 −2 include/PreventInSourceBuilds.cmake
+3 −1 include/json/allocator.h
+36 −5 include/json/reader.h
+33 −2 include/json/value.h
+4 −5 include/json/version.h
+5 −7 include/json/writer.h
+9 −7 jsoncpp-namespaced-targets.cmake
+1 −1 jsoncppConfig.cmake.in
+8 −0 jsoncppConfig.cmake.meson.in
+41 −4 meson.build
+5 −2 src/jsontestrunner/main.cpp
+1 −4 src/lib_json/CMakeLists.txt
+89 −77 src/lib_json/json_reader.cpp
+6 −4 src/lib_json/json_value.cpp
+10 −5 src/lib_json/json_writer.cpp
+59 −6 src/test_lib_json/main.cpp
+4 −0 test/data/fail_strict_comment_01.json
+4 −0 test/data/fail_strict_comment_02.json
+3 −0 test/data/fail_strict_comment_03.json
+1 −0 test/data/fail_test_object_02.json
+6 −3 test/runjsontests.py
2 changes: 1 addition & 1 deletion deps/3rd/libevent
Open in desktop
Submodule libevent updated 203 files
4 changes: 1 addition & 3 deletions src/observer/storage/buffer/disk_buffer_pool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ struct BPFileHeader
*/
static const int MAX_PAGE_NUM =
(BP_PAGE_DATA_SIZE - sizeof(buffer_pool_id) - sizeof(page_count) - sizeof(allocated_pages)) * 8;

string to_string() const;
};

Expand Down Expand Up @@ -352,5 +351,4 @@ class BufferPoolManager final
common::Mutex lock_;
unordered_map<string, DiskBufferPool *> buffer_pools_;
unordered_map<int32_t, DiskBufferPool *> id_to_buffer_pools_;
atomic<int32_t> next_buffer_pool_id_{1}; // 系统启动时，会打开所有的表，这样就可以知道当前系统最大的ID是多少了
};
atomic<int32_t> next_buffer_pool_id_{1}; // System startup opens all tables to know current max ID};
13 changes: 6 additions & 7 deletions src/observer/storage/buffer/page.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@ static constexpr PageNum BP_INVALID_PAGE_NUM = -1;

static constexpr PageNum BP_HEADER_PAGE = 0;

static constexpr const int BP_PAGE_SIZE = (1 << 13);
static constexpr const int BP_PAGE_DATA_SIZE = (BP_PAGE_SIZE - sizeof(LSN) - sizeof(CheckSum));

/**
* @brief 表示一个页面，可能放在内存或磁盘上
* @ingroup BufferPool
*/
static constexpr const int BP_PAGE_SIZE = (1 << 13);
static constexpr const int BP_PAGE_DATA_SIZE =
(BP_PAGE_SIZE - sizeof(LSN) - sizeof(CheckSum)); /**
* @brief 表示一个页面，可能放在内存或磁盘上
* @ingroup BufferPool
*/
struct Page
{
LSN lsn;
Expand Down
Loading