Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit41e461d

Browse files
committed
Improve define_custom_variable's handling of pre-existing settings.
Arrange for any problems with pre-existing settings to be reported asWARNING not ERROR, so that we don't undesirably abort the loading of theincoming add-on module. The bad setting is just discarded, as though ithad never been applied at all. (This requires a change in the API ofset_config_option. After some thought I decided the most potentiallyuseful addition was to allow callers to just pass in a desired elevel.)Arrange to restore the complete stacked state of the variable, rather thancheesily reinstalling only the active value. This ensures that custom GUCswill behave unsurprisingly even when the module loading operation occurswithin nested subtransactions that have changed the active value. Since amodule load could occur as a result of, eg, a PL function call, this is notan unlikely scenario.
1 parentfa56a0c commit41e461d

File tree

6 files changed

+173
-67
lines changed

6 files changed

+173
-67
lines changed

‎contrib/tsearch2/tsearch2.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,8 @@ tsa_set_curcfg(PG_FUNCTION_ARGS)
253253
name=DatumGetCString(DirectFunctionCall1(regconfigout,
254254
ObjectIdGetDatum(arg0)));
255255

256-
set_config_option("default_text_search_config",name,
257-
PGC_USERSET,
258-
PGC_S_SESSION,
259-
GUC_ACTION_SET,
260-
true);
256+
SetConfigOption("default_text_search_config",name,
257+
PGC_USERSET,PGC_S_SESSION);
261258

262259
PG_RETURN_VOID();
263260
}
@@ -271,11 +268,8 @@ tsa_set_curcfg_byname(PG_FUNCTION_ARGS)
271268

272269
name=text_to_cstring(arg0);
273270

274-
set_config_option("default_text_search_config",name,
275-
PGC_USERSET,
276-
PGC_S_SESSION,
277-
GUC_ACTION_SET,
278-
true);
271+
SetConfigOption("default_text_search_config",name,
272+
PGC_USERSET,PGC_S_SESSION);
279273

280274
PG_RETURN_VOID();
281275
}

‎src/backend/commands/extension.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -816,14 +816,14 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
816816
if (client_min_messages<WARNING)
817817
(void)set_config_option("client_min_messages","warning",
818818
PGC_USERSET,PGC_S_SESSION,
819-
GUC_ACTION_LOCAL, true);
819+
GUC_ACTION_LOCAL, true,0);
820820

821821
save_log_min_messages=
822822
pstrdup(GetConfigOption("log_min_messages", false, false));
823823
if (log_min_messages<WARNING)
824824
(void)set_config_option("log_min_messages","warning",
825825
PGC_SUSET,PGC_S_SESSION,
826-
GUC_ACTION_LOCAL, true);
826+
GUC_ACTION_LOCAL, true,0);
827827

828828
/*
829829
* Set up the search path to contain the target schema, then the schemas
@@ -849,7 +849,7 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
849849

850850
(void)set_config_option("search_path",pathbuf.data,
851851
PGC_USERSET,PGC_S_SESSION,
852-
GUC_ACTION_LOCAL, true);
852+
GUC_ACTION_LOCAL, true,0);
853853

854854
/*
855855
* Set creating_extension and related variables so that
@@ -915,13 +915,13 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
915915
*/
916916
(void)set_config_option("search_path",save_search_path,
917917
PGC_USERSET,PGC_S_SESSION,
918-
GUC_ACTION_LOCAL, true);
918+
GUC_ACTION_LOCAL, true,0);
919919
(void)set_config_option("client_min_messages",save_client_min_messages,
920920
PGC_USERSET,PGC_S_SESSION,
921-
GUC_ACTION_LOCAL, true);
921+
GUC_ACTION_LOCAL, true,0);
922922
(void)set_config_option("log_min_messages",save_log_min_messages,
923923
PGC_SUSET,PGC_S_SESSION,
924-
GUC_ACTION_LOCAL, true);
924+
GUC_ACTION_LOCAL, true,0);
925925
}
926926

927927
/*

‎src/backend/utils/adt/ri_triggers.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2779,7 +2779,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
27792779
snprintf(workmembuf,sizeof(workmembuf),"%d",maintenance_work_mem);
27802780
(void)set_config_option("work_mem",workmembuf,
27812781
PGC_USERSET,PGC_S_SESSION,
2782-
GUC_ACTION_LOCAL, true);
2782+
GUC_ACTION_LOCAL, true,0);
27832783

27842784
if (SPI_connect()!=SPI_OK_CONNECT)
27852785
elog(ERROR,"SPI_connect failed");
@@ -2868,7 +2868,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
28682868
snprintf(workmembuf,sizeof(workmembuf),"%d",old_work_mem);
28692869
(void)set_config_option("work_mem",workmembuf,
28702870
PGC_USERSET,PGC_S_SESSION,
2871-
GUC_ACTION_LOCAL, true);
2871+
GUC_ACTION_LOCAL, true,0);
28722872

28732873
return true;
28742874
}

‎src/backend/utils/misc/guc-file.l

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ ProcessConfigFile(GucContext context)
238238
/* Now we can re-apply the wired-in default (i.e., the boot_val) */
239239
if (set_config_option(gconf->name,NULL,
240240
context, PGC_S_DEFAULT,
241-
GUC_ACTION_SET,true) >0)
241+
GUC_ACTION_SET,true,0) >0)
242242
{
243243
/* Log the change if appropriate */
244244
if (context == PGC_SIGHUP)
@@ -293,7 +293,7 @@ ProcessConfigFile(GucContext context)
293293

294294
scres =set_config_option(item->name, item->value,
295295
context, PGC_S_FILE,
296-
GUC_ACTION_SET,true);
296+
GUC_ACTION_SET,true,0);
297297
if (scres >0)
298298
{
299299
/* variable was updated, so log the change if appropriate */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp