another windows fix

[plantuner.git] / plantuner.c

diff --git a/plantuner.c b/plantuner.c
index 5a1d480..0fa907a 100644 (file)
--- a/plantuner.c
+++ b/plantuner.c
@@ -30,7 +30,9 @@
 #include <postgres.h>
 
 #include <fmgr.h>
+#include <miscadmin.h>
 #include <access/heapam.h>
+#include <access/xact.h>
 #include <catalog/namespace.h>
 #include <catalog/pg_class.h>
 #include <nodes/pg_list.h>
@@ -58,6 +60,8 @@ static char *enableIndexesOutStr = "";
 get_relation_info_hook_type    prevHook = NULL;
 static bool    fix_empty_table = false;
 
+static bool    plantuner_enable_inited = false;
+static bool    plantuner_disable_inited = false;
 
 static const char *
 indexesAssign(const char * newval, bool doit, GucSource source, bool isDisable)
@@ -74,6 +78,22 @@ indexesAssign(const char * newval, bool doit, GucSource source, bool isDisable)
        if (!SplitIdentifierString(rawname, ',', &namelist))
                goto cleanup;
 
+       /*
+        * follow work could be done only in normal processing because of
+        * accsess to system catalog
+        */
+       if (MyBackendId == InvalidBackendId || !IsUnderPostmaster ||
+               !IsTransactionState())
+       {
+               /* reset init state */
+               if (isDisable)
+                       plantuner_disable_inited = false;
+               else
+                       plantuner_enable_inited = false;
+
+               return newval;
+       }
+
        if (doit)
        {
                nOids = list_length(namelist);
@@ -83,6 +103,11 @@ indexesAssign(const char * newval, bool doit, GucSource source, bool isDisable)
                                 (int)(sizeof(Oid) * (nOids+1)));
        }
 
+       if (isDisable)
+               plantuner_disable_inited = true;
+       else
+               plantuner_enable_inited = true;
+
        foreach(l, namelist)
        {
                char    *curname = (char *) lfirst(l);
@@ -161,6 +186,15 @@ assignEnabledIndexes(const char * newval, bool doit, GucSource source)
        return indexesAssign(newval, doit, source, false);
 }
 
+static void
+lateInit()
+{
+       if (!plantuner_enable_inited)
+               indexesAssign(enableIndexesOutStr, true, PGC_S_USER, false);
+       if (!plantuner_disable_inited)
+               indexesAssign(disableIndexesOutStr, true, PGC_S_USER, true);
+}
+
 #if PG_VERSION_NUM >= 90100
 
 static bool
@@ -215,6 +249,8 @@ indexFilter(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 {
        int i;
 
+       lateInit();
+
        for(i=0;i<nDisabledIndexes;i++)
        {
                ListCell   *l;
@@ -277,6 +313,8 @@ IndexFilterShow(Oid* indexes, int nIndexes)
        int             i,
                        len;
 
+       lateInit();
+
        len = 1 /* \0 */ + nIndexes * (2 * NAMEDATALEN + 2 /* ', ' */ + 1 /* . */);
        ptr = val = palloc(len);