From: Pavan Deolasee <pavan.deolasee@gmail.com>
Date: Wed, 24 Jun 2015 07:43:30 +0000 (+0530)
Subject: Do not use storm_catalog
X-Git-Tag: XL9_5_R1BETA1~228
X-Git-Url: http://git.postgresql.org/gitweb/sta%3Cscript%20data-cfasync=?a=commitdiff_plain;h=8096e3edf17b260de15472eb04567d1beec1e3e6;p=postgres-xl.git

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 78739ef5be..6b8c37ef3f 100644
--- 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 4007392baa..a67562d816 100644
--- 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();