Skip to content
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.

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

Add space_map into PageStorage V3 #3493

Merged
merged 41 commits into from
Dec 9, 2021
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
c8f5b09
add space map into pagestorage v3
jiaqizho Nov 22, 2021
a60594b
Merge branch 'master' into bak-space-map
jiaqizho Nov 29, 2021
48ac64c
[WIP]just for read
jiaqizho Nov 29, 2021
9d3031d
Try refactor interface
JaySon-Huang Nov 29, 2021
98ec4ce
Add spacemap.cpp
JaySon-Huang Nov 29, 2021
2e03320
Merge pull request #3 from JaySon-Huang/add-space-map
jiaqizho Nov 30, 2021
04776e1
finished std map implement
jiaqizho Nov 30, 2021
93ee120
update
jiaqizho Dec 6, 2021
465b45f
update
jiaqizho Dec 6, 2021
1886435
update
jiaqizho Dec 6, 2021
fe04444
update search cluster
jiaqizho Dec 6, 2021
353130c
usless
jiaqizho Dec 6, 2021
9ac75e2
update
jiaqizho Dec 6, 2021
9c12952
update
jiaqizho Dec 7, 2021
a6c8705
Make constructor protected
JaySon-Huang Dec 7, 2021
02081ae
Refactor ut
JaySon-Huang Dec 7, 2021
0dd5f1c
Merge pull request #4 from JaySon-Huang/add-space-map
jiaqizho Dec 7, 2021
6f9d4ac
fix some bugs
jiaqizho Dec 7, 2021
f244f1e
update
jiaqizho Dec 7, 2021
3ceb78a
update
jiaqizho Dec 7, 2021
986ffc2
update
jiaqizho Dec 7, 2021
efe48bf
Fix var naming
JaySon-Huang Dec 8, 2021
59ac245
Format files
JaySon-Huang Dec 8, 2021
5b991d1
Fix misleading naming
JaySon-Huang Dec 8, 2021
9fd0e24
Merge branch 'master' into add-space-map
jiaqizho Dec 8, 2021
1329ae6
fix build
jiaqizho Dec 8, 2021
a352497
Abstract out finding less or equal from std::map
JaySon-Huang Dec 8, 2021
70c7c63
Cleanup redunt space in loggings
JaySon-Huang Dec 8, 2021
f51117c
Remove useless new/free virtual functions
JaySon-Huang Dec 8, 2021
7bbb503
Keep include header path style
JaySon-Huang Dec 8, 2021
5911eac
Cleanup interface
JaySon-Huang Dec 8, 2021
a3ed7df
Format files
JaySon-Huang Dec 8, 2021
6809c43
Merge pull request #5 from JaySon-Huang/add-space-map
jiaqizho Dec 8, 2021
d04e793
Update dbms/src/Storages/Page/V3/spacemap/SpaceMapSTDMap.h
jiaqizho Dec 8, 2021
a5e0ac8
update
jiaqizho Dec 8, 2021
9b5684e
fix some error
jiaqizho Dec 8, 2021
0ab02ca
add tests
jiaqizho Dec 9, 2021
a639b66
Update dbms/src/Storages/Page/V3/spacemap/SpaceMap.h
jiaqizho Dec 9, 2021
39ce4d8
Update dbms/src/Storages/Page/V3/spacemap/SpaceMap.h
jiaqizho Dec 9, 2021
466f5b1
Update dbms/src/Storages/Page/V3/spacemap/SpaceMap.h
jiaqizho Dec 9, 2021
00bf672
Update dbms/src/Storages/Page/V3/spacemap/SpaceMap.h
jiaqizho Dec 9, 2021
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
4 changes: 4 additions & 0 deletions dbms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ if (ENABLE_V3_PAGESTORAGE)
add_headers_and_sources(dbms src/Storages/Page/V3/LogFile)
endif()
add_headers_and_sources(dbms src/Storages/Page/)
if (ENABLE_V3_PAGESTORAGE)
add_headers_and_sources(dbms src/Storages/Page/V3)
add_headers_and_sources(dbms src/Storages/Page/V3/spacemap)
endif()
add_headers_and_sources(dbms src/TiDB)
add_headers_and_sources(dbms src/Client)
add_headers_only(dbms src/Flash/Coprocessor)
Expand Down
1 change: 1 addition & 0 deletions dbms/src/Storages/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ if (ENABLE_TESTS)
add_subdirectory (Transaction/tests EXCLUDE_FROM_ALL)
add_subdirectory (Page/V2/tests EXCLUDE_FROM_ALL)
if (ENABLE_V3_PAGESTORAGE)
add_subdirectory (Page/V3 EXCLUDE_FROM_ALL)
add_subdirectory (Page/V3/tests EXCLUDE_FROM_ALL)
endif ()
add_subdirectory (DeltaMerge/tests EXCLUDE_FROM_ALL)
Expand Down
16 changes: 16 additions & 0 deletions dbms/src/Storages/Page/V3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
add_headers_and_sources(page_storage_v3 ./)
add_headers_and_sources(page_storage_v3 ./spacemap)


list(APPEND page_storage_v3_sources
${ClickHouse_SOURCE_DIR}/dbms/src/Server/StorageConfigParser.cpp
${ClickHouse_SOURCE_DIR}/dbms/src/Storages/Page/PageUtil.cpp
${ClickHouse_SOURCE_DIR}/dbms/src/Encryption/RateLimiter.cpp
)

add_library(page_storage_v3 EXCLUDE_FROM_ALL
${page_storage_v3_headers} ${page_storage_v3_sources}
${io_base_headers} ${io_base_sources}
)
target_include_directories(page_storage_v3 PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/tiflash-proxy/raftstore-proxy/ffi/src)
target_link_libraries(page_storage_v3 clickhouse_common_io cpptoml kv_client tipb)
Loading