database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-08 11:42:09 +03:00
Code Activity

Code cleanup for assign_XactIsoLevel.

Browse Source 
The new coding avoids a spurious debug message when a transaction
that has changed the isolation level has been rolled back.  It also
allows the property to be freely changed to the current value within
a subtransaction.

Kevin Grittner, with one small change by me.
This commit is contained in:
Robert Haas
2011-01-21 21:49:19 -05:00
parent cb38ab6d3b
commit fb4c5d2798
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/commands/variable.c
View File

@ -546,28 +546,28 @@ show_log_timezone(void)
/* /*
* SET TRANSACTION ISOLATION LEVEL * SET TRANSACTION ISOLATION LEVEL
*/ */
const char * const char *
assign_XactIsoLevel(const char *value, bool doit, GucSource source) assign_XactIsoLevel(const char *value, bool doit, GucSource source)
{
/* source == PGC_S_OVERRIDE means do it anyway, eg at xact abort */
if (source != PGC_S_OVERRIDE)
{ {
if (FirstSnapshotSet) if (FirstSnapshotSet)
{ {
ereport(GUC_complaint_elevel(source), ereport(GUC_complaint_elevel(source),
(errcode(ERRCODE_ACTIVE_SQL_TRANSACTION), (errcode(ERRCODE_ACTIVE_SQL_TRANSACTION),
errmsg("SET TRANSACTION ISOLATION LEVEL must be called before any query"))); errmsg("SET TRANSACTION ISOLATION LEVEL must be called before any query")));
/* source == PGC_S_OVERRIDE means do it anyway, eg at xact abort */
if (source != PGC_S_OVERRIDE)
return NULL; return NULL;
} }
else if (IsSubTransaction()) /* We ignore a subtransaction setting it to the existing value. */
if (IsSubTransaction() && strcmp(value, XactIsoLevel_string) != 0)
{ {
ereport(GUC_complaint_elevel(source), ereport(GUC_complaint_elevel(source),
(errcode(ERRCODE_ACTIVE_SQL_TRANSACTION), (errcode(ERRCODE_ACTIVE_SQL_TRANSACTION),
errmsg("SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"))); errmsg("SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction")));
/* source == PGC_S_OVERRIDE means do it anyway, eg at xact abort */
if (source != PGC_S_OVERRIDE)
return NULL; return NULL;
} }
}
if (strcmp(value, "serializable") == 0) if (strcmp(value, "serializable") == 0)
{ {

2
src/backend/utils/misc/guc.c
View File

@ -425,7 +425,6 @@ static int server_version_num;
static char *timezone_string; static char *timezone_string;
static char *log_timezone_string; static char *log_timezone_string;
static char *timezone_abbreviations_string; static char *timezone_abbreviations_string;
static char *XactIsoLevel_string;
static char *custom_variable_classes; static char *custom_variable_classes;
static int max_function_args; static int max_function_args;
static int max_index_keys; static int max_index_keys;
@ -440,6 +439,7 @@ static int effective_io_concurrency;
/* should be static, but commands/variable.c needs to get at these */ /* should be static, but commands/variable.c needs to get at these */
char *role_string; char *role_string;
char *session_authorization_string; char *session_authorization_string;
char *XactIsoLevel_string;
/* /*

1
src/include/utils/guc.h
View File

@ -201,6 +201,7 @@ extern char *ConfigFileName;
extern char *HbaFileName; extern char *HbaFileName;
extern char *IdentFileName; extern char *IdentFileName;
extern char *external_pid_file; extern char *external_pid_file;
extern char *XactIsoLevel_string;
extern char *application_name; extern char *application_name;