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

Make statement_timeout apply to entire query string, not per statement.

Browse Source
This commit is contained in:
Bruce Momjian 2002-07-30 05:13:06 +00:00
parent a89fc4e6de
commit b6440a7ece
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.273 2002/07/29 22:14:11 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.274 2002/07/30 05:13:06 momjian Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -704,6 +704,9 @@ pg_exec_query_string(StringInfo query_string, /* string to execute */
*/ */
MemoryContextSwitchTo(oldcontext); MemoryContextSwitchTo(oldcontext);
if (StatementTimeout)
enable_sig_alarm(StatementTimeout, true);
/* /*
* Inner loop handles the individual queries generated from a * Inner loop handles the individual queries generated from a
* single parsetree by analysis and rewrite. * single parsetree by analysis and rewrite.
@ -719,9 +722,6 @@ pg_exec_query_string(StringInfo query_string, /* string to execute */
xact_started = true; xact_started = true;
} }
if (StatementTimeout)
enable_sig_alarm(StatementTimeout, true);
/* /*
* If we got a cancel signal in analysis or prior command, * If we got a cancel signal in analysis or prior command,
* quit * quit
@ -796,8 +796,6 @@ pg_exec_query_string(StringInfo query_string, /* string to execute */
ShowUsage("EXECUTOR STATISTICS"); ShowUsage("EXECUTOR STATISTICS");
} }
disable_sig_alarm(true);
/* /*
* In a query block, we want to increment the command counter * In a query block, we want to increment the command counter
* between queries so that the effects of early queries are * between queries so that the effects of early queries are
@ -830,6 +828,8 @@ pg_exec_query_string(StringInfo query_string, /* string to execute */
} }
} /* end loop over queries generated from a parsetree */ } /* end loop over queries generated from a parsetree */
disable_sig_alarm(true);
/* /*
* If this is the last parsetree of the query string, close down * If this is the last parsetree of the query string, close down
* transaction statement before reporting command-complete. This is * transaction statement before reporting command-complete. This is
@ -1693,7 +1693,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.273 $ $Date: 2002/07/29 22:14:11 $\n"); puts("$Revision: 1.274 $ $Date: 2002/07/30 05:13:06 $\n");
} }
/* /*