diff options
Diffstat (limited to 'src/backend/tcop')
| -rw-r--r-- | src/backend/tcop/postgres.c | 32 | ||||
| -rw-r--r-- | src/backend/tcop/pquery.c | 15 |
2 files changed, 18 insertions, 29 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 51b6df54f4c..f1633f9de39 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -974,6 +974,10 @@ exec_simple_query(const char *query_string) plantree_list = pg_plan_queries(querytree_list, 0, NULL); + /* Done with the snapshot used for parsing/planning */ + if (snapshot_set) + PopActiveSnapshot(); + /* If we got a cancel signal in analysis or planning, quit */ CHECK_FOR_INTERRUPTS(); @@ -998,19 +1002,9 @@ exec_simple_query(const char *query_string) NULL); /* - * Start the portal. - * - * If we took a snapshot for parsing/planning, the portal may be able - * to reuse it for the execution phase. Currently, this will only - * happen in PORTAL_ONE_SELECT mode. But even if PortalStart doesn't - * end up being able to do this, keeping the parse/plan snapshot - * around until after we start the portal doesn't cost much. + * Start the portal. No parameters here. */ - PortalStart(portal, NULL, 0, snapshot_set); - - /* Done with the snapshot used for parsing/planning */ - if (snapshot_set) - PopActiveSnapshot(); + PortalStart(portal, NULL, 0, InvalidSnapshot); /* * Select the appropriate output format: text unless we are doing a @@ -1733,20 +1727,16 @@ exec_bind_message(StringInfo input_message) cplan->stmt_list, cplan); - /* - * And we're ready to start portal execution. - * - * If we took a snapshot for parsing/planning, we'll try to reuse it for - * query execution (currently, reuse will only occur if PORTAL_ONE_SELECT - * mode is chosen). - */ - PortalStart(portal, params, 0, snapshot_set); - /* Done with the snapshot used for parameter I/O and parsing/planning */ if (snapshot_set) PopActiveSnapshot(); /* + * And we're ready to start portal execution. + */ + PortalStart(portal, params, 0, InvalidSnapshot); + + /* * Apply the result format requests to the portal. */ PortalSetResultFormat(portal, numRFormats, rformats); diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index d0db7ad62c2..ce5e5e29ddb 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -447,18 +447,17 @@ FetchStatementTargetList(Node *stmt) * currently only honored for PORTAL_ONE_SELECT portals). Most callers * should simply pass zero. * - * The use_active_snapshot parameter is currently used only for - * PORTAL_ONE_SELECT portals. If it is true, the active snapshot will - * be used when starting up the executor; if false, a new snapshot will - * be taken. This is used both for cursors and to avoid taking an entirely - * new snapshot when it isn't necessary. + * The caller can optionally pass a snapshot to be used; pass InvalidSnapshot + * for the normal behavior of setting a new snapshot. This parameter is + * presently ignored for non-PORTAL_ONE_SELECT portals (it's only intended + * to be used for cursors). * * On return, portal is ready to accept PortalRun() calls, and the result * tupdesc (if any) is known. */ void PortalStart(Portal portal, ParamListInfo params, - int eflags, bool use_active_snapshot) + int eflags, Snapshot snapshot) { Portal saveActivePortal; ResourceOwner saveResourceOwner; @@ -500,8 +499,8 @@ PortalStart(Portal portal, ParamListInfo params, case PORTAL_ONE_SELECT: /* Must set snapshot before starting executor. */ - if (use_active_snapshot) - PushActiveSnapshot(GetActiveSnapshot()); + if (snapshot) + PushActiveSnapshot(snapshot); else PushActiveSnapshot(GetTransactionSnapshot()); |