firtst release
Revision | b8f3e8a5d7d1ca17d2b478c194c9a9fe78d01c6a (tree) |
---|---|
Time | 2019-03-08 14:05:11 |
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.
@@ -3087,19 +3087,19 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams) | ||
3087 | 3087 | } |
3088 | 3088 | |
3089 | 3089 | /* |
3090 | + * The planner call below may replace current_hint_str. Store and restore | |
3091 | + * it so that the subsequent planning in the upper level doesn't get | |
3092 | + * confused. | |
3093 | + */ | |
3094 | + recurse_level++; | |
3095 | + prev_hint_str = current_hint_str; | |
3096 | + | |
3097 | + /* | |
3090 | 3098 | * Use PG_TRY mechanism to recover GUC parameters and current_hint_state to |
3091 | 3099 | * the state when this planner started when error occurred in planner. |
3092 | 3100 | */ |
3093 | 3101 | PG_TRY(); |
3094 | 3102 | { |
3095 | - /* | |
3096 | - * The planner call below may replace current_hint_str. Store and | |
3097 | - * restore it so that the subsequent planning in the upper level | |
3098 | - * doesn't get confused. | |
3099 | - */ | |
3100 | - recurse_level++; | |
3101 | - prev_hint_str = current_hint_str; | |
3102 | - | |
3103 | 3103 | if (prev_planner) |
3104 | 3104 | result = (*prev_planner) (parse, cursorOptions, boundParams); |
3105 | 3105 | else |