Do not use storm_catalog

Based on available information, it seems this was added to support multi-tenant
feature of StormDB. This is no longer relevant in XL's context. So just #ifdef
out that code for now.

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 78739ef5bea0b376dbb11c777f43961d18a3d51b..6b8c37ef3f7c50edffd9160451167af67a73cf30 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -3446,7 +3446,11 @@ static struct config_string ConfigureNamesString[] =
                        GUC_LIST_INPUT | GUC_LIST_QUOTE | GUC_SUPERUSER_ONLY
                },
                &storm_catalog_remap_string,
+#ifdef NOT_USED
                "pg_roles, pg_shdescription, pg_database, pg_db_role_setting, pg_tablespace, pg_auth_members, pg_shdepend, pg_stat_database, pg_stat_database_conflicts, pg_stat_activity, pg_locks, pg_prepared_xacts, pg_settings, pg_user, pg_group, pg_shadow, pg_user_mappings, pg_database_size, pg_show_all_settings, pg_stat_get_activity, pg_lock_status",
+#else
+               "",
+#endif
                check_storm_catalog_remap_string, NULL, NULL
        },
 #endif

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 4007392baa02841588d5586b1d72b1daca0a5bbe..a67562d816782f52b75c469ac6f30cf30f10b369 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -3530,7 +3530,9 @@ initialize_data_directory(void)
        load_plpgsql();
 
 #ifdef XCP
+#ifdef NOT_USED
        setup_storm();
+#endif
 #endif
 
        vacuum_db();