| Revision | 6a588354120787e78cfcfaed26c3f67b6f6b9b84 (tree) |
|---|---|
| Time | 2019-03-08 13:58:52 |
| Author | Kyotaro Horiguchi <horiguchi.kyotaro@lab....> |
| Commiter | Kyotaro Horiguchi |
Silence some compilers
Some compilers seem to complain about the previous patch, that
prev_hint_str is used uninitialized. Actually it is not but move the
initialization code out of the PG_TRY() section so that such compilers
would be quiet.
pg_hint_plan.c (diff)| @@ -3082,19 +3082,19 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams) | ||
| 3082 | 3082 | } |
| 3083 | 3083 | |
| 3084 | 3084 | /* |
| 3085 | + * The planner call below may replace current_hint_str. Store and restore | |
| 3086 | + * it so that the subsequent planning in the upper level doesn't get | |
| 3087 | + * confused. | |
| 3088 | + */ | |
| 3089 | + recurse_level++; | |
| 3090 | + prev_hint_str = current_hint_str; | |
| 3091 | + | |
| 3092 | + /* | |
| 3085 | 3093 | * Use PG_TRY mechanism to recover GUC parameters and current_hint_state to |
| 3086 | 3094 | * the state when this planner started when error occurred in planner. |
| 3087 | 3095 | */ |
| 3088 | 3096 | PG_TRY(); |
| 3089 | 3097 | { |
| 3090 | - /* | |
| 3091 | - * The planner call below may replace current_hint_str. Store and | |
| 3092 | - * restore it so that the subsequent planning in the upper level | |
| 3093 | - * doesn't get confused. | |
| 3094 | - */ | |
| 3095 | - recurse_level++; | |
| 3096 | - prev_hint_str = current_hint_str; | |
| 3097 | - | |
| 3098 | 3098 | if (prev_planner) |
| 3099 | 3099 | result = (*prev_planner) (parse, cursorOptions, boundParams); |
| 3100 | 3100 | else |
Fork