Add catalog oid reset

Author: ksaito7

src/catalog/catalog.cpp

@@ -184,6 +184,9 @@ void Catalog::BootstrapSystemCatalogs(storage::Database *database,
   system_catalogs->GetTableCatalog()->InsertTable(
       LAYOUT_CATALOG_OID, LAYOUT_CATALOG_NAME, CATALOG_SCHEMA_NAME,
       database_oid, pool_.get(), txn);
+
+  // Reset oid of each system catalog
+  system_catalogs->ResetOidForUserSpace();
 }
 
 void Catalog::Bootstrap() {
@@ -207,6 +210,11 @@ void Catalog::Bootstrap() {
 
   InitializeLanguages();
   InitializeFunctions();
+
+  // Reset oid of each catalog
+  DatabaseCatalog::GetInstance()->UpdateOid(OID_FOR_USER_OFFSET);
+  LanguageCatalog::GetInstance().UpdateOid(OID_FOR_USER_OFFSET);
+  ProcCatalog::GetInstance().UpdateOid(OID_FOR_USER_OFFSET);
 }
 
 //===----------------------------------------------------------------------===//

src/catalog/system_catalogs.cpp

@@ -108,5 +108,18 @@ void SystemCatalogs::Bootstrap(const std::string &database_name,
   }
 }
 
+/*@brief    Reset oid of each catalog to avoid collisions between catalog
+ *          values added by system and users when checkpoint recovery.
+ */
+void SystemCatalogs::ResetOidForUserSpace() {
+	pg_attribute_->UpdateOid(OID_FOR_USER_OFFSET);
+	pg_namespace_->UpdateOid(OID_FOR_USER_OFFSET);
+	pg_table_->UpdateOid(OID_FOR_USER_OFFSET);
+	pg_index_->UpdateOid(OID_FOR_USER_OFFSET);
+	// pg_layout_->UpdateOid(OID_FOR_USER_OFFSET);
+	pg_trigger_->UpdateOid(OID_FOR_USER_OFFSET);
+	// pg_proc->UpdateOid(OID_FOR_USER_OFFSET);
+}
+
 }  // namespace catalog
 }  // namespace peloton

src/include/catalog/catalog_defaults.h

@@ -36,6 +36,7 @@ namespace catalog {
 
 // Local oids from START_OID = 0 to START_OID + OID_OFFSET are reserved
 #define OID_OFFSET 100
+#define OID_FOR_USER_OFFSET 100
 #define CATALOG_TABLES_COUNT 9
 
 // Oid mask for each type

src/include/catalog/column_catalog.h

@@ -77,6 +77,8 @@ class ColumnCatalog : public AbstractCatalog {
   // No use
   inline oid_t GetNextOid() { return INVALID_OID; }
 
+  void UpdateOid(oid_t add_value) { oid_ += add_value; }
+
   //===--------------------------------------------------------------------===//
   // write Related API
   //===--------------------------------------------------------------------===//

src/include/catalog/database_catalog.h

@@ -111,6 +111,8 @@ class DatabaseCatalog : public AbstractCatalog {
 
   inline oid_t GetNextOid() { return oid_++ | DATABASE_OID_MASK; }
 
+  void UpdateOid(oid_t add_value) { oid_ += add_value; }
+
   //===--------------------------------------------------------------------===//
   // write Related API
   //===--------------------------------------------------------------------===//
@@ -128,7 +130,6 @@ class DatabaseCatalog : public AbstractCatalog {
   std::shared_ptr<DatabaseCatalogObject> GetDatabaseObject(
       const std::string &database_name, concurrency::TransactionContext *txn);
 
- private:
   DatabaseCatalog(storage::Database *pg_catalog, type::AbstractPool *pool,
                   concurrency::TransactionContext *txn);
 

src/include/catalog/index_catalog.h

@@ -80,6 +80,8 @@ class IndexCatalog : public AbstractCatalog {
 
   inline oid_t GetNextOid() { return oid_++ | INDEX_OID_MASK; }
 
+  void UpdateOid(oid_t add_value) { oid_ += add_value; }
+
   /** Write Related API */
   bool InsertIndex(oid_t index_oid, const std::string &index_name,
                    oid_t table_oid, const std::string &schema_name,

src/include/catalog/language_catalog.h

@@ -56,6 +56,10 @@ class LanguageCatalog : public AbstractCatalog {
   // Global Singleton
   static LanguageCatalog &GetInstance(concurrency::TransactionContext *txn = nullptr);
 
+  oid_t GetNextOid() { return oid_++ | LANGUAGE_OID_MASK; }
+
+  void UpdateOid(oid_t add_value) { oid_ += add_value; }
+
   //===--------------------------------------------------------------------===//
   // write Related API
   //===--------------------------------------------------------------------===//
@@ -85,8 +89,6 @@ class LanguageCatalog : public AbstractCatalog {
  private:
   LanguageCatalog(concurrency::TransactionContext *txn);
 
-  oid_t GetNextOid() { return oid_++ | LANGUAGE_OID_MASK; }
-
   enum IndexId {
     PRIMARY_KEY = 0,
     SECONDARY_KEY_0 = 1,

src/include/catalog/proc_catalog.h

@@ -82,6 +82,10 @@ class ProcCatalog : public AbstractCatalog {
   // Global Singleton
   static ProcCatalog &GetInstance(concurrency::TransactionContext *txn = nullptr);
 
+  oid_t GetNextOid() { return oid_++ | PROC_OID_MASK; }
+
+  void UpdateOid(oid_t add_value) { oid_ += add_value; }
+
   //===--------------------------------------------------------------------===//
   // write Related API
   //===--------------------------------------------------------------------===//
@@ -116,8 +120,6 @@ class ProcCatalog : public AbstractCatalog {
  private:
   ProcCatalog(concurrency::TransactionContext *txn);
 
-  oid_t GetNextOid() { return oid_++ | PROC_OID_MASK; }
-
   enum IndexId {
     PRIMARY_KEY = 0,
     SECONDARY_KEY_0 = 1,

src/include/catalog/schema_catalog.h

@@ -62,6 +62,8 @@ class SchemaCatalog : public AbstractCatalog {
 
   inline oid_t GetNextOid() { return oid_++ | SCHEMA_OID_MASK; }
 
+  void UpdateOid(oid_t add_value) { oid_ += add_value; }
+
   //===--------------------------------------------------------------------===//
   // write Related API
   //===--------------------------------------------------------------------===//

src/include/catalog/system_catalogs.h

@@ -115,6 +115,8 @@ class SystemCatalogs {
     return pg_query_metrics_;
   }
 
+  void ResetOidForUserSpace();
+
  private:
   ColumnCatalog *pg_attribute_;
   SchemaCatalog *pg_namespace_;