[CBRD-25765] System Catalog refactoring for consistency

src/executables/util_sa.c

@@ -70,6 +70,7 @@
 #include "thread_manager.hpp"
 #include "log_volids.hpp"
 #include "schema_system_catalog.hpp"
+#include "schema_system_catalog_install.hpp"
 
 #if defined (SUPPRESS_STRLEN_WARNING)
 #define strlen(s1)  ((int) strlen(s1))
@@ -4313,7 +4314,7 @@ synccoll_force (void)
       return status;
     }
 
-  if (catcls_add_collations (class_mop) != NO_ERROR)
+  if (catcls_add_collation (class_mop) != NO_ERROR)
     {
       status = EXIT_FAILURE;
     }

src/object/authenticate_context.cpp

@@ -36,18 +36,6 @@
 #include "schema_system_catalog_constants.h"
 #include "locator_cl.h" /* locator_create_heap_if_needed () */
 
-/*
- * Authorization Class Names
- */
-#define AU_ROOT_CLASS_NAME      CT_ROOT_NAME
-#define AU_OLD_ROOT_CLASS_NAME  CT_AUTHORIZATIONS_NAME
-#define AU_USER_CLASS_NAME      CT_USER_NAME
-#define AU_PASSWORD_CLASS_NAME  CT_PASSWORD_NAME
-#define AU_AUTH_CLASS_NAME      CT_AUTHORIZATION_NAME
-
-#define AU_PUBLIC_USER_NAME     "PUBLIC"
-#define AU_DBA_USER_NAME        "DBA"
-
 // static functions
 static int au_add_method_check_authorization (void);
 

src/object/authenticate_owner.cpp

@@ -283,7 +283,7 @@ au_change_trigger_owner (MOP trigger_mop, MOP owner_mop)
    * so if the owner of class, serial, trigger changes, the unique_name must also change.
    */
 
-  error = obj_get (trigger_mop, TR_ATT_UNIQUE_NAME, &value);
+  error = obj_get (trigger_mop, CT_TRIGGER_ATTR_UNIQUE_NAME, &value);
   if (error != NO_ERROR)
     {
       ASSERT_ERROR ();
@@ -297,7 +297,7 @@ au_change_trigger_owner (MOP trigger_mop, MOP owner_mop)
     }
 
   /* Check if the owner to be changed is the same. */
-  error = obj_get (trigger_mop, TR_ATT_OWNER, &value);
+  error = obj_get (trigger_mop, CT_TRIGGER_ATTR_OWNER, &value);
   if (error != NO_ERROR)
     {
       ASSERT_ERROR ();
@@ -354,7 +354,7 @@ au_change_trigger_owner (MOP trigger_mop, MOP owner_mop)
 
   /* owner */
   db_make_object (&value, owner_mop);
-  error = obj_set (trigger_mop, TR_ATT_OWNER, &value);
+  error = obj_set (trigger_mop, CT_TRIGGER_ATTR_OWNER, &value);
   if (error != NO_ERROR)
     {
       ASSERT_ERROR ();

src/object/schema_system_catalog.hpp

@@ -28,20 +28,8 @@
 
 #include "porting.h"
 
-extern EXPORT_IMPORT void catcls_init (void);
-extern EXPORT_IMPORT int catcls_install (void);
-
-extern EXPORT_IMPORT bool sm_check_system_class_by_name (const std::string_view class_name);
-
-extern EXPORT_IMPORT bool sm_is_system_class (const std::string_view name);
-extern EXPORT_IMPORT bool sm_is_system_vclass (const std::string_view name);
-
-#if defined (CS_MODE) || defined (SA_MODE)
-struct db_object;
-
-extern EXPORT_IMPORT int catcls_add_data_type (struct db_object *class_mop);
-extern EXPORT_IMPORT int catcls_add_charsets (struct db_object *class_mop);
-extern EXPORT_IMPORT int catcls_add_collations (struct db_object *class_mop);
-#endif
+EXPORT_IMPORT bool sm_check_system_class_by_name (const std::string_view class_name);
+EXPORT_IMPORT bool sm_is_system_class (const std::string_view name);
+EXPORT_IMPORT bool sm_is_system_vclass (const std::string_view name);
 
 #endif /* _SCHEMA_SYSTEM_CATALOG_HPP_ */

src/object/schema_system_catalog_builder.cpp

@@ -42,10 +42,6 @@ namespace cubschema
     if (sm_is_system_class (name))
       {
 	class_mop = db_create_class (name.data ());
-	if (class_mop != nullptr)
-	  {
-	    sm_mark_system_class (class_mop, 1);
-	  }
       }
     else if (sm_is_system_vclass (name))
       {
@@ -56,6 +52,11 @@ namespace cubschema
 	assert (false);
       }
 
+    if (class_mop != nullptr)
+      {
+	sm_mark_system_class (class_mop, 1);
+      }
+
     return class_mop;
   }
 

src/object/schema_system_catalog_constants.h

@@ -92,4 +92,25 @@
 #define CT_DBCHARSET_DEFAULT_COLLATION	  "default_collation"
 #define CT_DBCHARSET_CHAR_SIZE		  "char_size"
 
+#define CT_DUAL_DUMMY                     "dummy"
+
+#define CT_TRIGGER_ATTR_UNIQUE_NAME          "unique_name"
+#define CT_TRIGGER_ATTR_OWNER                "owner"
+#define CT_TRIGGER_ATTR_NAME                 "name"
+#define CT_TRIGGER_ATTR_STATUS               "status"
+#define CT_TRIGGER_ATTR_PRIORITY             "priority"
+#define CT_TRIGGER_ATTR_EVENT                "event"
+#define CT_TRIGGER_ATTR_CLASS                "target_class"
+#define CT_TRIGGER_ATTR_ATTRIBUTE            "target_attribute"
+#define CT_TRIGGER_ATTR_CLASS_ATTRIBUTE      "target_class_attribute"
+#define CT_TRIGGER_ATTR_CONDITION_TYPE       "condition_type"
+#define CT_TRIGGER_ATTR_CONDITION            "condition"
+#define CT_TRIGGER_ATTR_CONDITION_TIME       "condition_time"
+#define CT_TRIGGER_ATTR_ACTION_TYPE          "action_type"
+#define CT_TRIGGER_ATTR_ACTION               "action_definition"
+#define CT_TRIGGER_ATTR_ACTION_TIME          "action_time"
+#define CT_TRIGGER_ATTR_ACTION_OLD           "action"
+#define CT_TRIGGER_ATTR_PROPERTIES           "properties"
+#define CT_TRIGGER_ATTR_COMMENT              "comment"
+
 #endif /* _SCHEMA_SYSTEM_CATALOG_CONSTANTS_H_ */

src/object/schema_system_catalog_definition.hpp

@@ -28,8 +28,9 @@
 #include <string_view>
 #include <vector>
 #include <optional>
+#include <functional>
 
-#include "work_space.h" // struct db_object
+#include "dbtype_def.h"
 
 namespace cubschema
 {
@@ -92,7 +93,7 @@ namespace cubschema
   {
     using attr_vec_type = std::vector <attribute>;
     using cstr_vec_type = std::vector <constraint>;
-    using row_init_type = std::function<int (struct db_object *)>;
+    using row_init_type = std::function<int (MOP)>;
 
     const std::string name;
     const attr_vec_type attributes;