avoid use MAX_NAMESPACE_ID as kvstore's ns_id (#4839)

ref #3594
pingcap · May 7, 2022 · a1110d0 · a1110d0
1 parent 7ffb943
commit a1110d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp
@@ -1729,7 +1729,7 @@ UInt64 DeltaMergeStore::onSyncGc(Int64 limit)
                 }
             }
             if (!finish_gc_on_segment)
-                LOG_FMT_DEBUG(
+                LOG_FMT_TRACE(
                     log,
                     "GC is skipped Segment [{}] [range={}] [table={}]",
                     segment_id,

diff --git a/dbms/src/Storages/Page/PageDefines.h b/dbms/src/Storages/Page/PageDefines.h
@@ -48,6 +48,8 @@ static constexpr UInt64 MAX_PERSISTED_LOG_FILES = 4;
 
 using NamespaceId = UInt64;
 static constexpr NamespaceId MAX_NAMESPACE_ID = UINT64_MAX;
+// KVStore stores it's data individually, so the actual `ns_id` value doesn't matter(just different from `MAX_NAMESPACE_ID` is enough)
+static constexpr NamespaceId KVSTORE_NAMESPACE_ID = 1000000UL;
 // just a random namespace id for test, the value doesn't matter
 static constexpr NamespaceId TEST_NAMESPACE_ID = 1000;
 

diff --git a/dbms/src/Storages/Transaction/RegionPersister.h b/dbms/src/Storages/Transaction/RegionPersister.h
@@ -70,8 +70,7 @@ class RegionPersister final : private boost::noncopyable
     PageStoragePtr page_storage;
     std::shared_ptr<PS::V1::PageStorage> stable_page_storage;
 
-    // RegionPersister stores it's data individually, so the `ns_id` value doesn't matter
-    NamespaceId ns_id = MAX_NAMESPACE_ID;
+    NamespaceId ns_id = KVSTORE_NAMESPACE_ID;
     const RegionManager & region_manager;
     std::mutex mutex;
     Poco::Logger * log;