@@ -128,8 +128,6 @@ aqo_planner(Query *parse,
128128 bool query_is_stored = false;
129129 MemoryContext oldctx ;
130130
131- oldctx = MemoryContextSwitchTo (AQOPredictMemCtx );
132-
133131 /*
134132 * We do not work inside an parallel worker now by reason of insert into
135133 * the heap during planning. Transactions are synchronized between parallel
@@ -146,7 +144,6 @@ aqo_planner(Query *parse,
146144 * We should disable AQO for this query to remember this decision along
147145 * all execution stages.
148146 */
149- MemoryContextSwitchTo (oldctx );
150147 disable_aqo_for_query ();
151148
152149 return call_default_planner (parse ,
@@ -176,7 +173,6 @@ aqo_planner(Query *parse,
176173 * feature space, that is processing yet (disallow invalidation
177174 * recursion, as an example).
178175 */
179- MemoryContextSwitchTo (oldctx );
180176 disable_aqo_for_query ();
181177
182178 return call_default_planner (parse ,
@@ -188,11 +184,9 @@ aqo_planner(Query *parse,
188184 elog (DEBUG1 , "AQO will be used for query '%s', class " UINT64_FORMAT ,
189185 query_string ? query_string : "null string" , query_context .query_hash );
190186
191- MemoryContextSwitchTo (oldctx );
192187 oldctx = MemoryContextSwitchTo (AQOCacheMemCtx );
193188 cur_classes = lappend_uint64 (cur_classes , query_context .query_hash );
194189 MemoryContextSwitchTo (oldctx );
195- oldctx = MemoryContextSwitchTo (AQOPredictMemCtx );
196190
197191 if (aqo_mode == AQO_MODE_DISABLED )
198192 {
@@ -351,7 +345,7 @@ aqo_planner(Query *parse,
351345 INSTR_TIME_SET_CURRENT (query_context .start_planning_time );
352346 {
353347 PlannedStmt * stmt ;
354- MemoryContextSwitchTo ( oldctx );
348+
355349 stmt = call_default_planner (parse , query_string ,
356350 cursorOptions , boundParams );
357351
@@ -458,7 +452,6 @@ jointree_walker(Node *jtnode, void *context)
458452static bool
459453isQueryUsingSystemRelation_walker (Node * node , void * context )
460454{
461- MemoryContext oldctx = MemoryContextSwitchTo (AQOLearnMemCtx );
462455 AQOPreWalkerCtx * ctx = (AQOPreWalkerCtx * ) context ;
463456
464457 if (node == NULL )
@@ -500,7 +493,6 @@ isQueryUsingSystemRelation_walker(Node *node, void *context)
500493 }
501494
502495 jointree_walker ((Node * ) query -> jointree , context );
503- MemoryContextSwitchTo (oldctx );
504496
505497 /* Recursively plunge into subqueries and CTEs */
506498 return query_tree_walker (query ,
0 commit comments