small fix

pingcap · Feb 2, 2023 · 2f1bf6e · 2f1bf6e
1 parent 8edbc3d
commit 2f1bf6e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/dbms/src/Storages/Page/V2/PageEntries.h b/dbms/src/Storages/Page/V2/PageEntries.h
@@ -19,7 +19,6 @@
 #include <IO/WriteHelpers.h>
 #include <Storages/Page/Config.h>
 #include <Storages/Page/Page.h>
-#include <Storages/Page/PageDefinesBase.h>
 #include <Storages/Page/V2/PageDefines.h>
 #include <common/likely.h>
 #include <common/logger_useful.h>

diff --git a/dbms/src/Storages/Page/V2/PageFile.h b/dbms/src/Storages/Page/V2/PageFile.h
@@ -18,7 +18,6 @@
 #include <IO/WriteHelpers.h>
 #include <Storages/FormatVersion.h>
 #include <Storages/Page/Page.h>
-#include <Storages/Page/PageDefinesBase.h>
 #include <Storages/Page/V2/PageEntries.h>
 #include <Storages/Page/V2/VersionSet/PageEntriesEdit.h>
 #include <Storages/Page/WriteBatch.h>

diff --git a/dbms/src/Storages/Page/V2/PageStorage.h b/dbms/src/Storages/Page/V2/PageStorage.h
@@ -17,7 +17,6 @@
 #include <Interpreters/SettingsCommon.h>
 #include <Storages/BackgroundProcessingPool.h>
 #include <Storages/Page/Page.h>
-#include <Storages/Page/PageDefinesBase.h>
 #include <Storages/Page/PageStorage.h>
 #include <Storages/Page/V2/PageDefines.h>
 #include <Storages/Page/V2/PageFile.h>

diff --git a/dbms/src/Storages/Page/V2/VersionSet/PageEntriesView.cpp b/dbms/src/Storages/Page/V2/VersionSet/PageEntriesView.cpp
@@ -99,15 +99,15 @@ PageId PageEntriesView::resolveRefId(PageId page_id) const
     return is_ref ? normal_page_id : page_id;
 }
 
-PageIdSet PageEntriesView::validPageIds() const
+std::set<PageId> PageEntriesView::validPageIds() const
 {
     std::stack<PageEntriesForDeltaPtr> link_nodes;
     for (PageEntriesForDeltaPtr node = tail; node != nullptr; node = std::atomic_load(&node->prev))
     {
         link_nodes.emplace(node);
     }
     // Get valid pages, from link-list's head to tail
-    PageIdSet valid_pages;
+    std::set<PageId> valid_pages;
     while (!link_nodes.empty())
     {
         PageEntriesForDeltaPtr node = link_nodes.top();

diff --git a/dbms/src/Storages/Page/V2/VersionSet/PageEntriesView.h b/dbms/src/Storages/Page/V2/VersionSet/PageEntriesView.h
@@ -41,7 +41,7 @@ class PageEntriesView
     std::pair<bool, PageId> isRefId(PageId page_id) const;
 
     // For iterate over all pages
-    PageIdSet validPageIds() const;
+    std::set<PageId> validPageIds() const;
 
     // For iterate over all normal pages
     std::set<PageId> validNormalPageIds() const;

diff --git a/dbms/src/Storages/Page/V3/CMakeLists.txt b/dbms/src/Storages/Page/V3/CMakeLists.txt
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 add_headers_and_sources(page_storage_v3 ./)
-add_headers_and_sources(page_storage_v3 spacemap)
+add_headers_and_sources(page_storage_v3 ./spacemap)
 
 
 list(APPEND page_storage_v3_sources

diff --git a/dbms/src/Storages/Page/V3/Universal/UniversalPageId.h b/dbms/src/Storages/Page/V3/Universal/UniversalPageId.h
@@ -16,11 +16,21 @@
 
 #include <Common/RedactHelpers.h>
 #include <Storages/Page/PageDefinesBase.h>
+#include <Storages/Page/V3/Universal/UniversalPageIdFormat.h>
 
 namespace DB
 {
 class UniversalPageId final
 {
+public:
+    static inline UniversalPageId toFullUniversalPageId(const String & prefix, PageIdU64 page_id)
+    {
+        WriteBufferFromOwnString buff;
+        writeString(prefix, buff);
+        UniversalPageIdFormat::encodeUInt64(page_id, buff);
+        return buff.releaseStr();
+    }
+
 public:
     UniversalPageId() = default;