database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-21 12:05:57 +03:00
Code

Actually, that still wasn't quite right. If we skip a query because of

Browse Source 
xact abort state in pg_exec_query_dest, we should continue scanning the
querytree list, on the off chance that one of the later queries in the
string is COMMIT or ROLLBACK.
This commit is contained in:
Tom Lane 2000-04-04 23:52:50 +00:00
parent 708f82f191
commit 5240c76729
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.149 2000/04/04 21:44:39 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.150 2000/04/04 23:52:50 tgl Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -150,19 +150,6 @@ int UseNewLine = 0; /* Use EOF as query delimiters */
*/ */
int XfuncMode = 0; int XfuncMode = 0;
/*
* ----------------
* Note: _exec_repeat_ defaults to 1 but may be changed
* by a DEBUG command. If you set this to a large
* number N, run a single query, and then set it
* back to 1 and run N queries, you can get an idea
* of how much time is being spent in the parser and
* planner b/c in the first case this overhead only
* happens once. -cim 6/9/91
* ----------------
*/
int _exec_repeat_ = 1;
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* decls for routines only used in this file * decls for routines only used in this file
* ---------------------------------------------------------------- * ----------------------------------------------------------------
@ -634,9 +621,8 @@ pg_exec_query_dest(char *query_string, /* string to execute */
else else
{ {
Plan *plan; Plan *plan;
int j;
/* If aborted transaction, quit now */ /* If aborted transaction, skip planning and execution */
if (IsAbortedTransactionBlockState()) if (IsAbortedTransactionBlockState())
{ {
/* ---------------- /* ----------------
@ -651,7 +637,11 @@ pg_exec_query_dest(char *query_string, /* string to execute */
EndCommand(tag, dest); EndCommand(tag, dest);
break; /* We continue in the loop, on the off chance that there
* is a COMMIT or ROLLBACK utility command later in the
* query string.
*/
continue;
} }
plan = pg_plan_query(querytree); plan = pg_plan_query(querytree);
@ -669,12 +659,9 @@ pg_exec_query_dest(char *query_string, /* string to execute */
if (ShowExecutorStats) if (ShowExecutorStats)
ResetUsage(); ResetUsage();
for (j = 0; j < _exec_repeat_; j++) if (Verbose)
{ TPRINTF(TRACE_VERBOSE, "ProcessQuery");
if (Verbose) ProcessQuery(querytree, plan, dest);
TPRINTF(TRACE_VERBOSE, "ProcessQuery");
ProcessQuery(querytree, plan, dest);
}
if (ShowExecutorStats) if (ShowExecutorStats)
{ {
@ -1462,7 +1449,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.149 $ $Date: 2000/04/04 21:44:39 $\n"); puts("$Revision: 1.150 $ $Date: 2000/04/04 23:52:50 $\n");
} }
/* /*