diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/explain.c | 4 | ||||
| -rw-r--r-- | src/backend/tcop/postgres.c | 14 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 12 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index d0033f43662..81f1dd0c31f 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994-5, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.177 2008/08/14 18:47:58 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.178 2008/08/19 18:30:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -169,7 +169,7 @@ ExplainOneQuery(Query *query, ExplainStmt *stmt, const char *queryString, PlannedStmt *plan; /* plan the query */ - plan = planner(query, 0, params); + plan = pg_plan_query(query, 0, params); /* run it (if needed) and produce output */ ExplainOnePlan(plan, params, stmt, tstate); diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 132d33c5a9d..8449cb4d4c1 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.555 2008/08/01 13:16:09 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.556 2008/08/19 18:30:04 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -630,13 +630,13 @@ pg_rewrite_query(Query *query) { List *querytree_list; - if (log_parser_stats) - ResetUsage(); - if (Debug_print_parse) - elog_node_display(DEBUG1, "parse tree", query, + elog_node_display(LOG, "parse tree", query, Debug_pretty_print); + if (log_parser_stats) + ResetUsage(); + if (query->commandType == CMD_UTILITY) { /* don't rewrite utilities, just dump 'em into result list */ @@ -666,7 +666,7 @@ pg_rewrite_query(Query *query) #endif if (Debug_print_rewritten) - elog_node_display(DEBUG1, "rewritten parse tree", querytree_list, + elog_node_display(LOG, "rewritten parse tree", querytree_list, Debug_pretty_print); return querytree_list; @@ -720,7 +720,7 @@ pg_plan_query(Query *querytree, int cursorOptions, ParamListInfo boundParams) * Print plan if debugging. */ if (Debug_print_plan) - elog_node_display(DEBUG1, "plan", plan, Debug_pretty_print); + elog_node_display(LOG, "plan", plan, Debug_pretty_print); TRACE_POSTGRESQL_QUERY_PLAN_DONE(); diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 6cc6dcb7e03..c9fe2693265 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.466 2008/08/15 08:37:40 mha Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.467 2008/08/19 18:30:04 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -316,7 +316,7 @@ bool log_duration = false; bool Debug_print_plan = false; bool Debug_print_parse = false; bool Debug_print_rewritten = false; -bool Debug_pretty_print = false; +bool Debug_pretty_print = true; bool log_parser_stats = false; bool log_planner_stats = false; @@ -772,7 +772,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"debug_print_parse", PGC_USERSET, LOGGING_WHAT, - gettext_noop("Prints the parse tree to the server log."), + gettext_noop("Logs each query's parse tree."), NULL }, &Debug_print_parse, @@ -780,7 +780,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"debug_print_rewritten", PGC_USERSET, LOGGING_WHAT, - gettext_noop("Prints the parse tree after rewriting to server log."), + gettext_noop("Logs each query's rewritten parse tree."), NULL }, &Debug_print_rewritten, @@ -788,7 +788,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"debug_print_plan", PGC_USERSET, LOGGING_WHAT, - gettext_noop("Prints the execution plan to server log."), + gettext_noop("Logs each query's execution plan."), NULL }, &Debug_print_plan, @@ -800,7 +800,7 @@ static struct config_bool ConfigureNamesBool[] = NULL }, &Debug_pretty_print, - false, NULL, NULL + true, NULL, NULL }, { {"log_parser_stats", PGC_SUSET, STATS_MONITORING, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 063d3ec1c4a..342be9d6c3c 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -322,7 +322,7 @@ #debug_print_parse = off #debug_print_rewritten = off #debug_print_plan = off -#debug_pretty_print = off +#debug_pretty_print = on #log_checkpoints = off #log_connections = off #log_disconnections = off |