OSDN Git Service

Prepare for 1.1.3.
[pghintplan/pg_hint_plan.git] / pg_hint_plan.c
index e8231cd..1b43ce0 100644 (file)
@@ -32,6 +32,7 @@
 #include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/syscache.h"
+#include "utils/resowner.h"
 
 #include "catalog/pg_class.h"
 
@@ -90,8 +91,9 @@ PG_MODULE_MAGIC;
 #define HINT_ARRAY_DEFAULT_INITSIZE 8
 
 #define hint_ereport(str, detail) \
-       ereport(pg_hint_plan_parse_messages, \
-                       (errmsg("hint syntax error at or near \"%s\"", (str)), \
+       ereport(pg_hint_plan_message_level, \
+                       (errhidestmt(hidestmt), \
+                        errmsg("pg_hint_plan%s: hint syntax error at or near \"%s\"", qnostr, (str)), \
                         errdetail detail))
 
 #define skip_space(str) \
@@ -156,7 +158,7 @@ typedef Hint *(*HintCreateFunction) (const char *hint_str,
                                                                         const char *keyword,
                                                                         HintKeyword hint_keyword);
 typedef void (*HintDeleteFunction) (Hint *hint);
-typedef void (*HintDescFunction) (Hint *hint, StringInfo buf);
+typedef void (*HintDescFunction) (Hint *hint, StringInfo buf, bool nolf);
 typedef int (*HintCmpFunction) (const Hint *a, const Hint *b);
 typedef const char *(*HintParseFunction) (Hint *hint, HintState *hstate,
                                                                                  Query *parse, const char *str);
@@ -193,6 +195,9 @@ typedef enum HintStatus
 #define hint_state_enabled(hint) ((hint)->base.state == HINT_STATE_NOTUSED || \
                                                                  (hint)->base.state == HINT_STATE_USED)
 
+static unsigned int qno = 0;
+static char qnostr[32];
+
 /* common data for all hints. */
 struct Hint
 {
@@ -357,35 +362,35 @@ static RelOptInfo *pg_hint_plan_join_search(PlannerInfo *root,
 static Hint *ScanMethodHintCreate(const char *hint_str, const char *keyword,
                                                                  HintKeyword hint_keyword);
 static void ScanMethodHintDelete(ScanMethodHint *hint);
-static void ScanMethodHintDesc(ScanMethodHint *hint, StringInfo buf);
+static void ScanMethodHintDesc(ScanMethodHint *hint, StringInfo buf, bool nolf);
 static int ScanMethodHintCmp(const ScanMethodHint *a, const ScanMethodHint *b);
 static const char *ScanMethodHintParse(ScanMethodHint *hint, HintState *hstate,
                                                                           Query *parse, const char *str);
 static Hint *JoinMethodHintCreate(const char *hint_str, const char *keyword,
                                                                  HintKeyword hint_keyword);
 static void JoinMethodHintDelete(JoinMethodHint *hint);
-static void JoinMethodHintDesc(JoinMethodHint *hint, StringInfo buf);
+static void JoinMethodHintDesc(JoinMethodHint *hint, StringInfo buf, bool nolf);
 static int JoinMethodHintCmp(const JoinMethodHint *a, const JoinMethodHint *b);
 static const char *JoinMethodHintParse(JoinMethodHint *hint, HintState *hstate,
                                                                           Query *parse, const char *str);
 static Hint *LeadingHintCreate(const char *hint_str, const char *keyword,
                                                           HintKeyword hint_keyword);
 static void LeadingHintDelete(LeadingHint *hint);
-static void LeadingHintDesc(LeadingHint *hint, StringInfo buf);
+static void LeadingHintDesc(LeadingHint *hint, StringInfo buf, bool nolf);
 static int LeadingHintCmp(const LeadingHint *a, const LeadingHint *b);
 static const char *LeadingHintParse(LeadingHint *hint, HintState *hstate,
                                                                        Query *parse, const char *str);
 static Hint *SetHintCreate(const char *hint_str, const char *keyword,
                                                   HintKeyword hint_keyword);
 static void SetHintDelete(SetHint *hint);
-static void SetHintDesc(SetHint *hint, StringInfo buf);
+static void SetHintDesc(SetHint *hint, StringInfo buf, bool nolf);
 static int SetHintCmp(const SetHint *a, const SetHint *b);
 static const char *SetHintParse(SetHint *hint, HintState *hstate, Query *parse,
                                                                const char *str);
 static Hint *RowsHintCreate(const char *hint_str, const char *keyword,
                                                        HintKeyword hint_keyword);
 static void RowsHintDelete(RowsHint *hint);
-static void RowsHintDesc(RowsHint *hint, StringInfo buf);
+static void RowsHintDesc(RowsHint *hint, StringInfo buf, bool nolf);
 static int RowsHintCmp(const RowsHint *a, const RowsHint *b);
 static const char *RowsHintParse(RowsHint *hint, HintState *hstate,
                                                                 Query *parse, const char *str);
@@ -423,14 +428,25 @@ static void pg_hint_plan_plpgsql_stmt_beg(PLpgSQL_execstate *estate,
                                                                                  PLpgSQL_stmt *stmt);
 static void pg_hint_plan_plpgsql_stmt_end(PLpgSQL_execstate *estate,
                                                                                  PLpgSQL_stmt *stmt);
+static void plpgsql_query_erase_callback(ResourceReleasePhase phase,
+                                                                                bool isCommit,
+                                                                                bool isTopLevel,
+                                                                                void *arg);
 
 /* GUC variables */
 static bool    pg_hint_plan_enable_hint = true;
-static bool    pg_hint_plan_debug_print = false;
-static int     pg_hint_plan_parse_messages = INFO;
+static int debug_level = 0;
+static int     pg_hint_plan_message_level = INFO;
 /* Default is off, to keep backward compatibility. */
 static bool    pg_hint_plan_enable_hint_table = false;
 
+/* Internal static variables. */
+static bool    hidestmt = false;                               /* Allow or inhibit STATEMENT: output */
+
+static int plpgsql_recurse_level = 0;          /* PLpgSQL recursion level            */
+static int hint_inhibit_level = 0;                     /* Inhibit hinting if this is above 0 */
+                                                                                       /* (This could not be above 1)        */
+
 static const struct config_enum_entry parse_messages_level_options[] = {
        {"debug", DEBUG2, true},
        {"debug5", DEBUG5, false},
@@ -450,6 +466,22 @@ static const struct config_enum_entry parse_messages_level_options[] = {
        {NULL, 0, false}
 };
 
+static const struct config_enum_entry parse_debug_level_options[] = {
+       {"off", 0, false},
+       {"on", 1, false},
+       {"detailed", 2, false},
+       {"verbose", 3, false},
+       {"0", 0, true},
+       {"1", 1, true},
+       {"2", 2, true},
+       {"3", 3, true},
+       {"no", 0, true},
+       {"yes", 1, true},
+       {"false", 0, true},
+       {"true", 1, true},
+       {NULL, 0, false}
+};
+
 /* Saved hook values in case of unload */
 static ProcessUtility_hook_type prev_ProcessUtility = NULL;
 static planner_hook_type prev_planner = NULL;
@@ -499,11 +531,6 @@ static const HintParser parsers[] = {
        {NULL, NULL, HINT_KEYWORD_UNRECOGNIZED}
 };
 
-/*
- * PL/pgSQL plugin for retrieving string representation of each query during
- * function execution.
- */
-const char *plpgsql_query_string = NULL;
 PLpgSQL_plugin  plugin_funcs = {
        NULL,
        NULL,
@@ -514,9 +541,6 @@ PLpgSQL_plugin  plugin_funcs = {
        NULL,
 };
 
-/* Current nesting depth of SPI calls, used to prevent recursive calls */
-static int     nested_level = 0;
-
 /*
  * Module load callbacks
  */
@@ -537,12 +561,13 @@ _PG_init(void)
                                                         NULL,
                                                         NULL);
 
-       DefineCustomBoolVariable("pg_hint_plan.debug_print",
+       DefineCustomEnumVariable("pg_hint_plan.debug_print",
                                                         "Logs results of hint parsing.",
                                                         NULL,
-                                                        &pg_hint_plan_debug_print,
-                                                        false,
-                                                        PGC_USERSET,
+                                                        &debug_level,
+                                                        0,
+                                                    parse_debug_level_options,
+                                                    PGC_USERSET,
                                                         0,
                                                         NULL,
                                                         NULL,
@@ -551,7 +576,19 @@ _PG_init(void)
        DefineCustomEnumVariable("pg_hint_plan.parse_messages",
                                                         "Message level of parse errors.",
                                                         NULL,
-                                                        &pg_hint_plan_parse_messages,
+                                                        &pg_hint_plan_message_level,
+                                                        INFO,
+                                                        parse_messages_level_options,
+                                                        PGC_USERSET,
+                                                        0,
+                                                        NULL,
+                                                        NULL,
+                                                        NULL);
+
+       DefineCustomEnumVariable("pg_hint_plan.message_level",
+                                                        "Message level of debug messages.",
+                                                        NULL,
+                                                        &pg_hint_plan_message_level,
                                                         INFO,
                                                         parse_messages_level_options,
                                                         PGC_USERSET,
@@ -584,6 +621,8 @@ _PG_init(void)
        /* setup PL/pgSQL plugin hook */
        var_ptr = (PLpgSQL_plugin **) find_rendezvous_variable("PLpgSQL_plugin");
        *var_ptr = &plugin_funcs;
+
+       RegisterResourceReleaseCallback(plpgsql_query_erase_callback, NULL);
 }
 
 /*
@@ -890,7 +929,7 @@ quote_value(StringInfo buf, const char *value)
 }
 
 static void
-ScanMethodHintDesc(ScanMethodHint *hint, StringInfo buf)
+ScanMethodHintDesc(ScanMethodHint *hint, StringInfo buf, bool nolf)
 {
        ListCell   *l;
 
@@ -904,11 +943,13 @@ ScanMethodHintDesc(ScanMethodHint *hint, StringInfo buf)
                        quote_value(buf, (char *) lfirst(l));
                }
        }
-       appendStringInfoString(buf, ")\n");
+       appendStringInfoString(buf, ")");
+       if (!nolf)
+               appendStringInfoChar(buf, '\n');
 }
 
 static void
-JoinMethodHintDesc(JoinMethodHint *hint, StringInfo buf)
+JoinMethodHintDesc(JoinMethodHint *hint, StringInfo buf, bool nolf)
 {
        int     i;
 
@@ -922,7 +963,9 @@ JoinMethodHintDesc(JoinMethodHint *hint, StringInfo buf)
                        quote_value(buf, hint->relnames[i]);
                }
        }
-       appendStringInfoString(buf, ")\n");
+       appendStringInfoString(buf, ")");
+       if (!nolf)
+               appendStringInfoChar(buf, '\n');
 
 }
 
@@ -954,7 +997,7 @@ OuterInnerDesc(OuterInnerRels *outer_inner, StringInfo buf)
 }
 
 static void
-LeadingHintDesc(LeadingHint *hint, StringInfo buf)
+LeadingHintDesc(LeadingHint *hint, StringInfo buf, bool nolf)
 {
        appendStringInfo(buf, "%s(", HINT_LEADING);
        if (hint->outer_inner == NULL)
@@ -977,11 +1020,13 @@ LeadingHintDesc(LeadingHint *hint, StringInfo buf)
        else
                OuterInnerDesc(hint->outer_inner, buf);
 
-       appendStringInfoString(buf, ")\n");
+       appendStringInfoString(buf, ")");
+       if (!nolf)
+               appendStringInfoChar(buf, '\n');
 }
 
 static void
-SetHintDesc(SetHint *hint, StringInfo buf)
+SetHintDesc(SetHint *hint, StringInfo buf, bool nolf)
 {
        bool            is_first = true;
        ListCell   *l;
@@ -996,11 +1041,13 @@ SetHintDesc(SetHint *hint, StringInfo buf)
 
                quote_value(buf, (char *) lfirst(l));
        }
-       appendStringInfo(buf, ")\n");
+       appendStringInfo(buf, ")");
+       if (!nolf)
+               appendStringInfoChar(buf, '\n');
 }
 
 static void
-RowsHintDesc(RowsHint *hint, StringInfo buf)
+RowsHintDesc(RowsHint *hint, StringInfo buf, bool nolf)
 {
        int     i;
 
@@ -1015,8 +1062,9 @@ RowsHintDesc(RowsHint *hint, StringInfo buf)
                }
        }
        appendStringInfo(buf, " %s", hint->rows_str);
-       appendStringInfoString(buf, ")\n");
-
+       appendStringInfoString(buf, ")");
+       if (!nolf)
+               appendStringInfoChar(buf, '\n');
 }
 
 /*
@@ -1025,18 +1073,26 @@ RowsHintDesc(RowsHint *hint, StringInfo buf)
  */
 static void
 desc_hint_in_state(HintState *hstate, StringInfo buf, const char *title,
-                                       HintStatus state)
+                                  HintStatus state, bool nolf)
 {
-       int     i;
+       int     i, nshown;
+
+       appendStringInfo(buf, "%s:", title);
+       if (!nolf)
+               appendStringInfoChar(buf, '\n');
 
-       appendStringInfo(buf, "%s:\n", title);
+       nshown = 0;
        for (i = 0; i < hstate->nall_hints; i++)
        {
                if (hstate->all_hints[i]->state != state)
                        continue;
 
-               hstate->all_hints[i]->desc_func(hstate->all_hints[i], buf);
+               hstate->all_hints[i]->desc_func(hstate->all_hints[i], buf, nolf);
+               nshown++;
        }
+
+       if (nolf && nshown == 0)
+               appendStringInfoString(buf, "(none)");
 }
 
 /*
@@ -1056,16 +1112,43 @@ HintStateDump(HintState *hstate)
        initStringInfo(&buf);
 
        appendStringInfoString(&buf, "pg_hint_plan:\n");
-       desc_hint_in_state(hstate, &buf, "used hint", HINT_STATE_USED);
-       desc_hint_in_state(hstate, &buf, "not used hint", HINT_STATE_NOTUSED);
-       desc_hint_in_state(hstate, &buf, "duplication hint", HINT_STATE_DUPLICATION);
-       desc_hint_in_state(hstate, &buf, "error hint", HINT_STATE_ERROR);
+       desc_hint_in_state(hstate, &buf, "used hint", HINT_STATE_USED, false);
+       desc_hint_in_state(hstate, &buf, "not used hint", HINT_STATE_NOTUSED, false);
+       desc_hint_in_state(hstate, &buf, "duplication hint", HINT_STATE_DUPLICATION, false);
+       desc_hint_in_state(hstate, &buf, "error hint", HINT_STATE_ERROR, false);
 
        elog(LOG, "%s", buf.data);
 
        pfree(buf.data);
 }
 
+static void
+HintStateDump2(HintState *hstate)
+{
+       StringInfoData  buf;
+
+       if (!hstate)
+       {
+               elog(pg_hint_plan_message_level,
+                        "pg_hint_plan%s: HintStateDump:\nno hint", qnostr);
+               return;
+       }
+
+       initStringInfo(&buf);
+       appendStringInfo(&buf, "pg_hint_plan%s: HintStateDump: ", qnostr);
+       desc_hint_in_state(hstate, &buf, "{used hints", HINT_STATE_USED, true);
+       desc_hint_in_state(hstate, &buf, "}, {not used hints", HINT_STATE_NOTUSED, true);
+       desc_hint_in_state(hstate, &buf, "}, {duplicate hints", HINT_STATE_DUPLICATION, true);
+       desc_hint_in_state(hstate, &buf, "}, {error hints", HINT_STATE_ERROR, true);
+       appendStringInfoChar(&buf, '}');
+
+       ereport(pg_hint_plan_message_level,
+                       (errhidestmt(true),
+                        errmsg("%s", buf.data)));
+
+       pfree(buf.data);
+}
+
 /*
  * compare functions
  */
@@ -1510,7 +1593,7 @@ get_hints_from_table(const char *client_query, const char *client_application)
 
        PG_TRY();
        {
-               ++nested_level;
+               hint_inhibit_level++;
        
                SPI_connect();
        
@@ -1548,11 +1631,11 @@ get_hints_from_table(const char *client_query, const char *client_application)
        
                SPI_finish();
        
-               --nested_level;
+               hint_inhibit_level--;
        }
        PG_CATCH();
        {
-               --nested_level;
+               hint_inhibit_level--;
                PG_RE_THROW();
        }
        PG_END_TRY();
@@ -1568,15 +1651,21 @@ get_query_string(void)
 {
        const char *p;
 
-       if (stmt_name)
+       if (plpgsql_recurse_level > 0)
+       {
+               /*
+                * This is quite ugly but this is the only point I could find where
+                * we can get the query string.
+                */
+               p = (char*)error_context_stack->arg;
+       }
+       else if (stmt_name)
        {
                PreparedStatement  *entry;
 
                entry = FetchPreparedStatement(stmt_name, true);
                p = entry->plansource->query_string;
        }
-       else if (plpgsql_query_string)
-               p = plpgsql_query_string;
        else
                p = debug_query_string;
 
@@ -2142,10 +2231,12 @@ set_config_option_wrapper(const char *name, const char *value,
                errdata = CopyErrorData();
                FlushErrorState();
 
-               ereport(elevel, (errcode(errdata->sqlerrcode),
-                               errmsg("%s", errdata->message),
-                               errdata->detail ? errdetail("%s", errdata->detail) : 0,
-                               errdata->hint ? errhint("%s", errdata->hint) : 0));
+               ereport(elevel,
+                               (errcode(errdata->sqlerrcode),
+                                errhidestmt(hidestmt),
+                                errmsg("%s", errdata->message),
+                                errdata->detail ? errdetail("%s", errdata->detail) : 0,
+                                errdata->hint ? errhint("%s", errdata->hint) : 0));
                FreeErrorData(errdata);
        }
        PG_END_TRY();
@@ -2171,7 +2262,7 @@ set_config_options(SetHint **options, int noptions, GucContext context)
 
                result = set_config_option_wrapper(hint->name, hint->value, context,
                                                                                   PGC_S_SESSION, GUC_ACTION_SAVE, true,
-                                                                                  pg_hint_plan_parse_messages);
+                                                                                  pg_hint_plan_message_level);
                if (result != 0)
                        hint->base.state = HINT_STATE_USED;
                else
@@ -2237,8 +2328,12 @@ pg_hint_plan_ProcessUtility(Node *parsetree, const char *queryString,
         * Use standard planner if pg_hint_plan is disabled or current nesting 
         * depth is nesting depth of SPI calls. 
         */
-       if (!pg_hint_plan_enable_hint || nested_level > 0)
+       if (!pg_hint_plan_enable_hint || hint_inhibit_level > 0)
        {
+               if (debug_level > 1)
+                       ereport(pg_hint_plan_message_level,
+                                       (errmsg ("pg_hint_plan: ProcessUtility:"
+                                                        " pg_hint_plan.enable_hint = off")));
                if (prev_ProcessUtility)
                        (*prev_ProcessUtility) (parsetree, queryString, params,
                                                                        isTopLevel, dest, completionTag);
@@ -2303,6 +2398,11 @@ pg_hint_plan_ProcessUtility(Node *parsetree, const char *queryString,
 
        if (stmt_name)
        {
+               if (debug_level > 1)
+                       ereport(pg_hint_plan_message_level,
+                                       (errmsg ("pg_hint_plan: ProcessUtility:"
+                                                        " stmt_name = \"%s\", statement=\"%s\"",
+                                                        stmt_name, queryString)));
                PG_TRY();
                {
                        if (prev_ProcessUtility)
@@ -2377,14 +2477,30 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
        int                             save_nestlevel;
        PlannedStmt        *result;
        HintState          *hstate;
+       char                    msgstr[1024];
+
+       qnostr[0] = 0;
+       strcpy(msgstr, "");
+       if (debug_level > 1)
+               snprintf(qnostr, sizeof(qnostr), "[qno=0x%x]", qno++);
+       hidestmt = false;
 
        /*
         * Use standard planner if pg_hint_plan is disabled or current nesting 
         * depth is nesting depth of SPI calls. Other hook functions try to change
         * plan with current_hint if any, so set it to NULL.
         */
-       if (!pg_hint_plan_enable_hint || nested_level > 0)
+       if (!pg_hint_plan_enable_hint || hint_inhibit_level > 0)
+       {
+               if (debug_level > 1)
+                       elog(pg_hint_plan_message_level,
+                                "pg_hint_plan%s: planner: enable_hint=%d,"
+                                " hint_inhibit_level=%d",
+                                qnostr, pg_hint_plan_enable_hint, hint_inhibit_level);
+               hidestmt = true;
+
                goto standard_planner_proc;
+       }
 
        /* Create hint struct from client-supplied query string. */
        query = get_query_string();
@@ -2429,12 +2545,41 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
                                                                                           &query_len,
                                                                                           GetDatabaseEncoding());
                hints = get_hints_from_table(norm_query, application_name);
-               elog(DEBUG1,
-                        "pg_hint_plan: get_hints_from_table [%s][%s]=>[%s]",
-                        norm_query, application_name, hints ? hints : "(none)");
+               if (debug_level > 1)
+               {
+                       if (hints)
+                               snprintf(msgstr, 1024, "hints from table: \"%s\":"
+                                                " normalzed_query=\"%s\", application name =\"%s\"",
+                                                hints, norm_query, application_name);
+                       else
+                       {
+                               ereport(pg_hint_plan_message_level,
+                                               (errhidestmt(hidestmt),
+                                                errmsg("pg_hint_plan%s:"
+                                                               " no match found in table:"
+                                                               "  application name = \"%s\","
+                                                               " normalzed_query=\"%s\"",
+                                                               qnostr, application_name, norm_query)));
+                               hidestmt = true;
+                       }
+               }
        }
        if (hints == NULL)
+       {
                hints = get_hints_from_comment(query);
+
+               if (debug_level > 1)
+               {
+                 snprintf(msgstr, 1024, "hints in comment=\"%s\"",
+                                  hints ? hints : "(none)");
+                 if (debug_level > 2 || 
+                         stmt_name || strcmp(query, debug_query_string))
+                       snprintf(msgstr + strlen(msgstr), 1024- strlen(msgstr), 
+                                        ", stmt=\"%s\", query=\"%s\", debug_query_string=\"%s\"",
+                                        stmt_name, query, debug_query_string);
+               }
+       }
+
        hstate = create_hintstate(parse, hints);
 
        /*
@@ -2472,6 +2617,14 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
        if (enable_hashjoin)
                current_hint->init_join_mask |= ENABLE_HASHJOIN;
 
+       if (debug_level > 1)
+       {
+               ereport(pg_hint_plan_message_level,
+                               (errhidestmt(hidestmt),
+                                errmsg("pg_hint_plan%s: planner: %s",
+                                               qnostr, msgstr))); 
+               hidestmt = true;
+       }
        /*
         * Use PG_TRY mechanism to recover GUC parameters and current_hint to the
         * state when this planner started when error occurred in planner.
@@ -2496,8 +2649,10 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
        PG_END_TRY();
 
        /* Print hint in debug mode. */
-       if (pg_hint_plan_debug_print)
+       if (debug_level == 1)
                HintStateDump(current_hint);
+       else if (debug_level == 2)
+               HintStateDump2(current_hint);
 
        /*
         * Rollback changes of GUC parameters, and pop current hint context from
@@ -2509,6 +2664,14 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
        return result;
 
 standard_planner_proc:
+       if (debug_level > 1)
+       {
+               ereport(pg_hint_plan_message_level,
+                               (errhidestmt(hidestmt),
+                                errmsg("pg_hint_plan%s: planner: no valid hint (%s)",
+                                               qnostr, msgstr)));
+               hidestmt = true;
+       }
        current_hint = NULL;
        if (prev_planner)
                return (*prev_planner) (parse, cursorOptions, boundParams);
@@ -2520,7 +2683,7 @@ standard_planner_proc:
  * Return scan method hint which matches given aliasname.
  */
 static ScanMethodHint *
-find_scan_hint(PlannerInfo *root, RelOptInfo *rel)
+find_scan_hint(PlannerInfo *root, Index relid, RelOptInfo *rel)
 {
        RangeTblEntry  *rte;
        int                             i;
@@ -2530,10 +2693,10 @@ find_scan_hint(PlannerInfo *root, RelOptInfo *rel)
         *   - not a base relation
         *   - not an ordinary relation (such as join and subquery)
         */
-       if (rel->reloptkind != RELOPT_BASEREL || rel->rtekind != RTE_RELATION)
+       if (rel && (rel->reloptkind != RELOPT_BASEREL || rel->rtekind != RTE_RELATION))
                return NULL;
 
-       rte = root->simple_rte_array[rel->relid];
+       rte = root->simple_rte_array[relid];
 
        /* We can't force scan method of foreign tables */
        if (rte->relkind == RELKIND_FOREIGN_TABLE)
@@ -2615,7 +2778,7 @@ delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId)
         * other than it.
         */
        prev = NULL;
-       if (pg_hint_plan_debug_print)
+       if (debug_level > 0)
                initStringInfo(&buf);
 
        for (cell = list_head(rel->indexlist); cell; cell = next)
@@ -2640,7 +2803,7 @@ delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId)
                        if (result)
                        {
                                use_index = true;
-                               if (pg_hint_plan_debug_print)
+                               if (debug_level > 0)
                                {
                                        appendStringInfoCharMacro(&buf, ' ');
                                        quote_value(&buf, indexname);
@@ -2799,7 +2962,7 @@ delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId)
                                use_index = true;
 
                                /* to log the candidate of index */
-                               if (pg_hint_plan_debug_print)
+                               if (debug_level > 0)
                                {
                                        appendStringInfoCharMacro(&buf, ' ');
                                        quote_value(&buf, indexname);
@@ -2817,7 +2980,7 @@ delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId)
                pfree(indexname);
        }
 
-       if (pg_hint_plan_debug_print)
+       if (debug_level == 1)
        {
                char   *relname;
                StringInfoData  rel_buf;
@@ -2923,105 +3086,191 @@ static void
 pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId,
                                                           bool inhparent, RelOptInfo *rel)
 {
-       ScanMethodHint *hint;
+       ScanMethodHint *hint = NULL;
+       ListCell *l;
+       Index new_parent_relid = 0;
 
        if (prev_get_relation_info)
                (*prev_get_relation_info) (root, relationObjectId, inhparent, rel);
 
        /* 
-        * Do nothing if we don't have valid hint in this context or current 
-        * nesting depth is nesting depth of SPI calls.
+        * Do nothing if we don't have a valid hint in this context or current
+        * nesting depth is at SPI calls.
         */
-       if (!current_hint || nested_level > 0)
+       if (!current_hint || hint_inhibit_level > 0)
+       {
+               if (debug_level > 1)
+                       ereport(pg_hint_plan_message_level,
+                                       (errhidestmt(true),
+                                        errmsg ("pg_hint_plan%s: get_relation_info"
+                                                        " no hint to apply: relation=%u(%s), inhparent=%d,"
+                                                        " current_hint=%p, hint_inhibit_level=%d",
+                                                        qnostr, relationObjectId,
+                                                        get_rel_name(relationObjectId),
+                                                        inhparent, current_hint, hint_inhibit_level)));
                return;
+       }
 
+       /*
+        * We could register the parent relation of the following children here
+        * when inhparent == true but inheritnce planner doesn't request
+        * information for inheritance parents. We also cannot distinguish the
+        * caller so we should always find the parents without this function being
+        * called for them.
+        */
        if (inhparent)
        {
-               /* store does relids of parent table. */
-               current_hint->parent_relid = rel->relid;
+               if (debug_level > 1)
+                       ereport(pg_hint_plan_message_level,
+                                       (errhidestmt(true),
+                                        errmsg ("pg_hint_plan%s: get_relation_info"
+                                                        " skipping inh parent: relation=%u(%s), inhparent=%d,"
+                                                        " current_hint=%p, hint_inhibit_level=%d",
+                                                        qnostr, relationObjectId,
+                                                        get_rel_name(relationObjectId),
+                                                        inhparent, current_hint, hint_inhibit_level)));
+               return;
        }
-       else if (current_hint->parent_relid != 0)
+
+       /* Find the parent for this relation */
+       foreach (l, root->append_rel_list)
        {
-               /*
-                * We use the same GUC parameter if this table is the child table of a
-                * table called pg_hint_plan_get_relation_info just before that.
-                */
-               ListCell   *l;
+               AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);
 
-               /* append_rel_list contains all append rels; ignore others */
-               foreach(l, root->append_rel_list)
+               if (appinfo->child_relid == rel->relid)
                {
-                       AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);
-
-                       /* This rel is child table. */
-                       if (appinfo->parent_relid == current_hint->parent_relid &&
-                               appinfo->child_relid == rel->relid)
-                       {
-                               if (current_hint->parent_hint)
-                                       delete_indexes(current_hint->parent_hint, rel,
-                                                                  relationObjectId);
-
-                               return;
-                       }
+                       if (current_hint->parent_relid != appinfo->parent_relid)
+                               new_parent_relid = appinfo->parent_relid;
+                       break;
                }
-
-               /* This rel is not inherit table. */
-               current_hint->parent_relid = 0;
-               current_hint->parent_hint = NULL;
        }
 
-       /*
-        * If scan method hint was given, reset GUC parameters which control
-        * planner behavior about choosing scan methods.
-        */
-       if ((hint = find_scan_hint(root, rel)) == NULL)
+       if (!l)
        {
-               set_scan_config_options(current_hint->init_scan_mask,
-                                                               current_hint->context);
-               return;
+               /* This relation doesn't have a parent. Cancel current_hint. */
+               current_hint->parent_relid = 0;
+               current_hint->parent_hint = NULL;
        }
-       set_scan_config_options(hint->enforce_mask, current_hint->context);
-       hint->base.state = HINT_STATE_USED;
 
-       if (inhparent)
+       if (new_parent_relid > 0)
        {
-               Relation    relation;
-               List       *indexoidlist;
-               ListCell   *l;
-
-               current_hint->parent_hint = hint;
+               /*
+                * Here we found a parent relation different from the remembered one.
+                * Remember it, apply the scan mask of it and then resolve the index
+                * restriction in order to be used by its children.
+                */
+               int scanmask = current_hint->init_scan_mask;
+               ScanMethodHint *parent_hint;
 
-               relation = heap_open(relationObjectId, NoLock);
-               indexoidlist = RelationGetIndexList(relation);
+               current_hint->parent_relid = new_parent_relid;
+                               
+               /*
+                * Get and apply the hint for the new parent relation. It should be an
+                * ordinary relation so calling find_scan_hint with rel == NULL is
+                * safe.
+                */
+               current_hint->parent_hint = parent_hint = 
+                       find_scan_hint(root, current_hint->parent_relid, NULL);
 
-               foreach(l, indexoidlist)
+               if (parent_hint)
                {
-                       Oid         indexoid = lfirst_oid(l);
-                       char       *indexname = get_rel_name(indexoid);
-                       bool        use_index = false;
-                       ListCell   *lc;
-                       ParentIndexInfo *parent_index_info;
+                       scanmask = current_hint->parent_hint->enforce_mask;
+                       parent_hint->base.state = HINT_STATE_USED;
 
-                       foreach(lc, hint->indexnames)
+                       /* Resolve index name mask (if any) using the parent. */
+                       if (parent_hint->indexnames)
                        {
-                               if (RelnameCmp(&indexname, &lfirst(lc)) == 0)
+                               Oid                     parentrel_oid;
+                               Relation        parent_rel;
+
+                               parentrel_oid =
+                                       root->simple_rte_array[current_hint->parent_relid]->relid;
+                               parent_rel = heap_open(parentrel_oid, NoLock);
+
+                               /* Search the parent relation for indexes match the hint spec */
+                               foreach(l, RelationGetIndexList(parent_rel))
                                {
-                                       use_index = true;
-                                       break;
+                                       Oid         indexoid = lfirst_oid(l);
+                                       char       *indexname = get_rel_name(indexoid);
+                                       ListCell   *lc;
+                                       ParentIndexInfo *parent_index_info;
+
+                                       foreach(lc, parent_hint->indexnames)
+                                       {
+                                               if (RelnameCmp(&indexname, &lfirst(lc)) == 0)
+                                                       break;
+                                       }
+                                       if (!lc)
+                                               continue;
+
+                                       parent_index_info =
+                                               get_parent_index_info(indexoid, parentrel_oid);
+                                       current_hint->parent_index_infos =
+                                               lappend(current_hint->parent_index_infos, parent_index_info);
                                }
+                               heap_close(parent_rel, NoLock);
                        }
-                       if (!use_index)
-                               continue;
-
-                       parent_index_info = get_parent_index_info(indexoid,
-                                                                                                         relationObjectId);
-                       current_hint->parent_index_infos =
-                               lappend(current_hint->parent_index_infos, parent_index_info);
                }
-               heap_close(relation, NoLock);
+                       
+               set_scan_config_options(scanmask, current_hint->context);
+       }
+
+       if (current_hint->parent_hint != 0)
+       {
+               delete_indexes(current_hint->parent_hint, rel,
+                                          relationObjectId);
+
+               /* Scan fixation status is the same to the parent. */
+               if (debug_level > 1)
+                       ereport(pg_hint_plan_message_level,
+                                       (errhidestmt(true),
+                                        errmsg("pg_hint_plan%s: get_relation_info:"
+                                                       " index deletion by parent hint: "
+                                                       "relation=%u(%s), inhparent=%d, current_hint=%p,"
+                                                       " hint_inhibit_level=%d",
+                                                       qnostr, relationObjectId,
+                                                       get_rel_name(relationObjectId),
+                                                       inhparent, current_hint, hint_inhibit_level)));
+               return;
        }
-       else
+
+       /* This table doesn't have a parent hint. Apply its own hint if any. */
+       if ((hint = find_scan_hint(root, rel->relid, rel)) != NULL)
+       {
+               set_scan_config_options(hint->enforce_mask, current_hint->context);
+               hint->base.state = HINT_STATE_USED;
+
                delete_indexes(hint, rel, InvalidOid);
+
+               if (debug_level > 1)
+                       ereport(pg_hint_plan_message_level,
+                                       (errhidestmt(true),
+                                        errmsg ("pg_hint_plan%s: get_relation_info"
+                                                        " index deletion:"
+                                                        " relation=%u(%s), inhparent=%d, current_hint=%p,"
+                                                        " hint_inhibit_level=%d, scanmask=0x%x",
+                                                        qnostr, relationObjectId,
+                                                        get_rel_name(relationObjectId),
+                                                        inhparent, current_hint, hint_inhibit_level,
+                                                        hint->enforce_mask)));
+       }
+       else
+       {
+               if (debug_level > 1)
+                       ereport(pg_hint_plan_message_level,
+                                       (errhidestmt (true),
+                                        errmsg ("pg_hint_plan%s: get_relation_info"
+                                                        " no hint applied:"
+                                                        " relation=%u(%s), inhparent=%d, current_hint=%p,"
+                                                        " hint_inhibit_level=%d, scanmask=0x%x",
+                                                        qnostr, relationObjectId,
+                                                        get_rel_name(relationObjectId),
+                                                        inhparent, current_hint, hint_inhibit_level,
+                                                        current_hint->init_scan_mask)));
+               set_scan_config_options(current_hint->init_scan_mask,
+                                                               current_hint->context);
+       }
+       return;
 }
 
 /*
@@ -3515,7 +3764,7 @@ rebuild_scan_path(HintState *hstate, PlannerInfo *root, int level,
                 * planner if scan method hint is not specified, otherwise use
                 * specified hints and mark the hint as used.
                 */
-               if ((hint = find_scan_hint(root, rel)) == NULL)
+               if ((hint = find_scan_hint(root, rel->relid, rel)) == NULL)
                        set_scan_config_options(hstate->init_scan_mask,
                                                                        hstate->context);
                else
@@ -3601,7 +3850,7 @@ add_paths_to_joinrel_wrapper(PlannerInfo *root,
        JoinMethodHint *join_hint;
        int                             save_nestlevel;
 
-       if ((scan_hint = find_scan_hint(root, innerrel)) != NULL)
+       if ((scan_hint = find_scan_hint(root, innerrel->relid, innerrel)) != NULL)
        {
                set_scan_config_options(scan_hint->enforce_mask, current_hint->context);
                scan_hint->base.state = HINT_STATE_USED;
@@ -3686,7 +3935,7 @@ pg_hint_plan_join_search(PlannerInfo *root, int levels_needed,
         * valid hint is supplied or current nesting depth is nesting depth of SPI
         * calls.
         */
-       if (!current_hint || nested_level > 0)
+       if (!current_hint || hint_inhibit_level > 0)
        {
                if (prev_join_search)
                        return (*prev_join_search) (root, levels_needed, initial_rels);
@@ -3782,45 +4031,7 @@ set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 static void
 pg_hint_plan_plpgsql_stmt_beg(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt)
 {
-       PLpgSQL_expr *expr = NULL;
-
-       switch ((enum PLpgSQL_stmt_types) stmt->cmd_type)
-       {
-               case PLPGSQL_STMT_FORS:
-                       expr = ((PLpgSQL_stmt_fors *) stmt)->query;
-                       break;
-               case PLPGSQL_STMT_FORC:
-                               expr = ((PLpgSQL_var *) (estate->datums[((PLpgSQL_stmt_forc *)stmt)->curvar]))->cursor_explicit_expr;
-                       break;
-               case PLPGSQL_STMT_RETURN_QUERY:
-                       if (((PLpgSQL_stmt_return_query *) stmt)->query != NULL)
-                               expr = ((PLpgSQL_stmt_return_query *) stmt)->query;
-                       else
-                               expr = ((PLpgSQL_stmt_return_query *) stmt)->dynquery;
-                       break;
-               case PLPGSQL_STMT_EXECSQL:
-                       expr = ((PLpgSQL_stmt_execsql *) stmt)->sqlstmt;
-                       break;
-               case PLPGSQL_STMT_DYNEXECUTE:
-                       expr = ((PLpgSQL_stmt_dynexecute *) stmt)->query;
-                       break;
-               case PLPGSQL_STMT_DYNFORS:
-                       expr = ((PLpgSQL_stmt_dynfors *) stmt)->query;
-                       break;
-               case PLPGSQL_STMT_OPEN:
-                       if (((PLpgSQL_stmt_open *) stmt)->query != NULL)
-                               expr = ((PLpgSQL_stmt_open *) stmt)->query;
-                       else if (((PLpgSQL_stmt_open *) stmt)->dynquery != NULL)
-                               expr = ((PLpgSQL_stmt_open *) stmt)->dynquery;
-                       else
-                               expr = ((PLpgSQL_var *) (estate->datums[((PLpgSQL_stmt_open *)stmt)->curvar]))->cursor_explicit_expr;
-                       break;
-               default:
-                       break;
-       }
-
-       if (expr)
-               plpgsql_query_string = expr->query;
+       plpgsql_recurse_level++;
 }
 
 /*
@@ -3831,8 +4042,18 @@ pg_hint_plan_plpgsql_stmt_beg(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt)
 static void
 pg_hint_plan_plpgsql_stmt_end(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt)
 {
-       if ((enum PLpgSQL_stmt_types) stmt->cmd_type == PLPGSQL_STMT_EXECSQL)
-               plpgsql_query_string = NULL;
+       plpgsql_recurse_level--;
+}
+
+void plpgsql_query_erase_callback(ResourceReleasePhase phase,
+                                                                 bool isCommit,
+                                                                 bool isTopLevel,
+                                                                 void *arg)
+{
+       if (phase != RESOURCE_RELEASE_AFTER_LOCKS)
+               return;
+       /* Cancel plpgsql nest level*/
+       plpgsql_recurse_level = 0;
 }
 
 #define standard_join_search pg_hint_plan_standard_join_search