Fix debug output level control

Previously parse_messages and message_level were binded to the same
internal variable. Separate the two GUCs. On the way doing this some
mssages that did not honor the variable were fixed. Default behavior
is not changed but the the two variables works differently from the
previous version, perhaps closer to expected.

diff --git a/expected/pg_hint_plan.out b/expected/pg_hint_plan.out
index c5790c8..d9471a3 100644 (file)
--- a/expected/pg_hint_plan.out
+++ b/expected/pg_hint_plan.out
@@ -8418,3 +8418,48 @@ error hint:
 (9 rows)
 
 \! rm results/pg_hint_plan.tmpout
+-- hint error level
+set client_min_messages to 'DEBUG1';
+set pg_hint_plan.debug_level to 'verbose';
+/*+ SeqScan( */ SELECT 1;
+INFO:  pg_hint_plan: hint syntax error at or near ""
+DETAIL:  Closing parenthesis is necessary.
+ ?column? 
+----------
+        1
+(1 row)
+
+/*+ SeqScan(t1) */ SELECT * FROM t1 LIMIT 0;
+LOG:  pg_hint_plan:
+used hint:
+SeqScan(t1)
+not used hint:
+duplication hint:
+error hint:
+
+ id | val 
+----+-----
+(0 rows)
+
+set pg_hint_plan.message_level to 'DEBUG1';
+set pg_hint_plan.parse_messages to 'NOTICE';
+/*+ SeqScan( */ SELECT 1;
+NOTICE:  pg_hint_plan: hint syntax error at or near ""
+DETAIL:  Closing parenthesis is necessary.
+ ?column? 
+----------
+        1
+(1 row)
+
+/*+ SeqScan(t1) */ SELECT * FROM t1 LIMIT 0;
+DEBUG:  pg_hint_plan:
+used hint:
+SeqScan(t1)
+not used hint:
+duplication hint:
+error hint:
+
+ id | val 
+----+-----
+(0 rows)
+

diff --git a/pg_hint_plan.c b/pg_hint_plan.c
index e7179a3..19fd186 100644 (file)
--- a/pg_hint_plan.c
+++ b/pg_hint_plan.c
@@ -86,12 +86,12 @@ PG_MODULE_MAGIC;
 
 #define HINT_ARRAY_DEFAULT_INITSIZE 8
 
-#define hint_ereport(str, detail) \
+#define hint_ereport(str, detail) hint_parse_ereport(str, detail)
+#define hint_parse_ereport(str, detail) \
        do { \
-               ereport(pg_hint_plan_message_level,             \
-                       (errmsg("pg_hint_plan%s: hint syntax error at or near \"%s\"", qnostr, (str)), \
+               ereport(pg_hint_plan_parse_message_level,               \
+                       (errmsg("pg_hint_plan: hint syntax error at or near \"%s\"", (str)), \
                         errdetail detail)); \
-               msgqno = qno; \
        } while(0)
 
 #define skip_space(str) \
@@ -432,7 +432,8 @@ static void plpgsql_query_erase_callback(ResourceReleasePhase phase,
 /* GUC variables */
 static bool    pg_hint_plan_enable_hint = true;
 static int debug_level = 0;
-static int     pg_hint_plan_message_level = INFO;
+static int     pg_hint_plan_parse_message_level = INFO;
+static int     pg_hint_plan_debug_message_level = LOG;
 /* Default is off, to keep backward compatibility. */
 static bool    pg_hint_plan_enable_hint_table = false;
 
@@ -569,7 +570,7 @@ _PG_init(void)
        DefineCustomEnumVariable("pg_hint_plan.parse_messages",
                                                         "Message level of parse errors.",
                                                         NULL,
-                                                        &pg_hint_plan_message_level,
+                                                        &pg_hint_plan_parse_message_level,
                                                         INFO,
                                                         parse_messages_level_options,
                                                         PGC_USERSET,
@@ -581,8 +582,8 @@ _PG_init(void)
        DefineCustomEnumVariable("pg_hint_plan.message_level",
                                                         "Message level of debug messages.",
                                                         NULL,
-                                                        &pg_hint_plan_message_level,
-                                                        INFO,
+                                                        &pg_hint_plan_debug_message_level,
+                                                        LOG,
                                                         parse_messages_level_options,
                                                         PGC_USERSET,
                                                         0,
@@ -1097,7 +1098,7 @@ HintStateDump(HintState *hstate)
 
        if (!hstate)
        {
-               elog(LOG, "pg_hint_plan:\nno hint");
+               elog(pg_hint_plan_debug_message_level, "pg_hint_plan:\nno hint");
                return;
        }
 
@@ -1109,7 +1110,8 @@ HintStateDump(HintState *hstate)
        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);
+       ereport(pg_hint_plan_debug_message_level,
+                       (errmsg ("%s", buf.data)));
 
        pfree(buf.data);
 }
@@ -1121,7 +1123,7 @@ HintStateDump2(HintState *hstate)
 
        if (!hstate)
        {
-               elog(pg_hint_plan_message_level,
+               elog(pg_hint_plan_debug_message_level,
                         "pg_hint_plan%s: HintStateDump: no hint", qnostr);
                return;
        }
@@ -1134,7 +1136,7 @@ HintStateDump2(HintState *hstate)
        desc_hint_in_state(hstate, &buf, "}, {error hints", HINT_STATE_ERROR, true);
        appendStringInfoChar(&buf, '}');
 
-       ereport(pg_hint_plan_message_level,
+       ereport(pg_hint_plan_debug_message_level,
                        (errmsg("%s", buf.data),
                         errhidestmt(true)));
 
@@ -2353,7 +2355,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_message_level);
+                                                                                  pg_hint_plan_parse_message_level);
                if (result != 0)
                        hint->base.state = HINT_STATE_USED;
                else
@@ -2538,7 +2540,7 @@ pg_hint_plan_post_parse_analyze(ParseState *pstate, Query *query)
                        if (debug_level > 1)
                        {
                                if (current_hint_str)
-                                       ereport(pg_hint_plan_message_level,
+                                       ereport(pg_hint_plan_debug_message_level,
                                                        (errmsg("pg_hint_plan[qno=0x%x]: "
                                                                        "post_parse_analyze_hook: "
                                                                        "hints from table: \"%s\": "
@@ -2548,7 +2550,7 @@ pg_hint_plan_post_parse_analyze(ParseState *pstate, Query *query)
                                                                        normalized_query, application_name),
                                                         errhidestmt(msgqno != qno)));
                                else
-                                       ereport(pg_hint_plan_message_level,
+                                       ereport(pg_hint_plan_debug_message_level,
                                                        (errmsg("pg_hint_plan[qno=0x%x]: "
                                                                        "no match found in table:  "
                                                                        "application name = \"%s\", "
@@ -2587,12 +2589,12 @@ pg_hint_plan_post_parse_analyze(ParseState *pstate, Query *query)
        {
                if (debug_level == 1 &&
                        (stmt_name || strcmp(query_str, debug_query_string)))
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errmsg("hints in comment=\"%s\"",
                                                        current_hint_str ? current_hint_str : "(none)"),
                                         errhidestmt(msgqno != qno)));
                else
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errmsg("hints in comment=\"%s\", stmt=\"%s\", query=\"%s\", debug_query_string=\"%s\"",
                                                        current_hint_str ? current_hint_str : "(none)",
                                                        stmt_name, query_str, debug_query_string),
@@ -2619,7 +2621,7 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
        if (!pg_hint_plan_enable_hint || hint_inhibit_level > 0)
        {
                if (debug_level > 1)
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errmsg ("pg_hint_plan%s: planner: enable_hint=%d,"
                                                         " hint_inhibit_level=%d",
                                                         qnostr, pg_hint_plan_enable_hint,
@@ -2686,7 +2688,7 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 
        if (debug_level > 1)
        {
-               ereport(pg_hint_plan_message_level,
+               ereport(pg_hint_plan_debug_message_level,
                                (errhidestmt(msgqno != qno),
                                 errmsg("pg_hint_plan%s: planner", qnostr))); 
                msgqno = qno;
@@ -2733,7 +2735,7 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 standard_planner_proc:
        if (debug_level > 1)
        {
-               ereport(pg_hint_plan_message_level,
+               ereport(pg_hint_plan_debug_message_level,
                                (errhidestmt(msgqno != qno),
                                 errmsg("pg_hint_plan%s: planner: no valid hint",
                                                qnostr)));
@@ -3060,7 +3062,7 @@ delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId)
                initStringInfo(&rel_buf);
                quote_value(&rel_buf, relname);
 
-               ereport(LOG,
+               ereport(pg_hint_plan_debug_message_level,
                                (errmsg("available indexes for %s(%s):%s",
                                         hint->base.keyword,
                                         rel_buf.data,
@@ -3167,7 +3169,7 @@ pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId,
        if (!current_hint || hint_inhibit_level > 0)
        {
                if (debug_level > 1)
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errhidestmt(true),
                                         errmsg ("pg_hint_plan%s: get_relation_info"
                                                         " no hint to apply: relation=%u(%s), inhparent=%d,"
@@ -3188,7 +3190,7 @@ pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId,
        if (inhparent)
        {
                if (debug_level > 1)
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errhidestmt(true),
                                         errmsg ("pg_hint_plan%s: get_relation_info"
                                                         " skipping inh parent: relation=%u(%s), inhparent=%d,"
@@ -3289,7 +3291,7 @@ pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId,
 
                /* Scan fixation status is the same to the parent. */
                if (debug_level > 1)
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errhidestmt(true),
                                         errmsg("pg_hint_plan%s: get_relation_info:"
                                                        " index deletion by parent hint: "
@@ -3310,7 +3312,7 @@ pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId,
                delete_indexes(hint, rel, InvalidOid);
 
                if (debug_level > 1)
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errhidestmt(true),
                                         errmsg ("pg_hint_plan%s: get_relation_info"
                                                         " index deletion:"
@@ -3324,7 +3326,7 @@ pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId,
        else
        {
                if (debug_level > 1)
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errhidestmt (true),
                                         errmsg ("pg_hint_plan%s: get_relation_info"
                                                         " no hint applied:"

diff --git a/sql/pg_hint_plan.sql b/sql/pg_hint_plan.sql
index ae8aac3..3a52346 100644 (file)
--- a/sql/pg_hint_plan.sql
+++ b/sql/pg_hint_plan.sql
@@ -1022,3 +1022,14 @@ EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id) JOIN t3 ON (t3.id = t2.id);
 \o
 \! sql/maskout.sh results/pg_hint_plan.tmpout
 \! rm results/pg_hint_plan.tmpout
+
+-- hint error level
+set client_min_messages to 'DEBUG1';
+set pg_hint_plan.debug_level to 'verbose';
+/*+ SeqScan( */ SELECT 1;
+/*+ SeqScan(t1) */ SELECT * FROM t1 LIMIT 0;
+set pg_hint_plan.message_level to 'DEBUG1';
+set pg_hint_plan.parse_messages to 'NOTICE';
+/*+ SeqScan( */ SELECT 1;
+/*+ SeqScan(t1) */ SELECT * FROM t1 LIMIT 0;
+