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

Commit4ee76ad

Browse files
committed
reset all: command line and .conf options change defaults
on RESET ALL those are restored.show all: GUC + non-GUC.SHOW ALL, RESET ALLMarko Kreen
1 parentd927ed2 commit4ee76ad

File tree

9 files changed

+188
-38
lines changed

9 files changed

+188
-38
lines changed

‎doc/src/sgml/ref/reset.sgml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/reset.sgml,v 1.10 2000/12/25 23:15:26 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/reset.sgml,v 1.11 2001/06/07 04:50:56 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -16,6 +16,9 @@ Postgres documentation
1616
<synopsis>
1717
RESET <replaceable class="PARAMETER">variable</replaceable>
1818
</synopsis>
19+
<synopsis>
20+
RESET ALL
21+
</synopsis>
1922

2023
<refsect2 id="R2-SQL-RESET-1">
2124
<title>Inputs</title>
@@ -30,6 +33,14 @@ RESET <replaceable class="PARAMETER">variable</replaceable>
3033
</para>
3134
</listitem>
3235
</varlistentry>
36+
<varlistentry>
37+
<term>ALL</term>
38+
<listitem>
39+
<para>
40+
Resets all run-time parameters to default values.
41+
</para>
42+
</listitem>
43+
</varlistentry>
3344
</variablelist>
3445
</para>
3546
</refsect2>

‎doc/src/sgml/ref/show.sgml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/show.sgml,v 1.11 2000/12/25 23:15:26 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/show.sgml,v 1.12 2001/06/07 04:50:56 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -16,6 +16,9 @@ Postgres documentation
1616
<synopsis>
1717
SHOW <replaceable class="PARAMETER">name</replaceable>
1818
</synopsis>
19+
<synopsis>
20+
SHOW ALL
21+
</synopsis>
1922

2023
<refsect2 id="R2-SQL-SHOW-1">
2124
<title>Inputs</title>
@@ -32,6 +35,14 @@ SHOW <replaceable class="PARAMETER">name</replaceable>
3235
</para>
3336
</listitem>
3437
</varlistentry>
38+
<varlistentry>
39+
<term>ALL</term>
40+
<listitem>
41+
<para>
42+
Show all current session parameters.
43+
</para>
44+
</listitem>
45+
</varlistentry>
3546
</variablelist>
3647
</para>
3748
</refsect2>

‎src/backend/commands/variable.c

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.48 2001/05/08 21:06:42 petere Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.49 2001/06/07 04:50:56 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -39,9 +39,9 @@
3939
#endif
4040

4141

42-
staticboolshow_date(void);
43-
staticboolreset_date(void);
44-
staticboolparse_date(char*);
42+
staticboolshow_datestyle(void);
43+
staticboolreset_datestyle(void);
44+
staticboolparse_datestyle(char*);
4545
staticboolshow_timezone(void);
4646
staticboolreset_timezone(void);
4747
staticboolparse_timezone(char*);
@@ -192,15 +192,15 @@ static intDefaultDateStyle;
192192
staticboolDefaultEuroDates;
193193

194194
staticbool
195-
parse_date(char*value)
195+
parse_datestyle(char*value)
196196
{
197197
char*tok;
198198
intdcnt=0,
199199
ecnt=0;
200200

201201
if (value==NULL)
202202
{
203-
reset_date();
203+
reset_datestyle();
204204
return TRUE;
205205
}
206206

@@ -261,7 +261,7 @@ parse_date(char *value)
261261
}
262262

263263
staticbool
264-
show_date(void)
264+
show_datestyle(void)
265265
{
266266
charbuf[64];
267267

@@ -291,7 +291,7 @@ show_date(void)
291291
}
292292

293293
staticbool
294-
reset_date(void)
294+
reset_datestyle(void)
295295
{
296296
DateStyle=DefaultDateStyle;
297297
EuroDates=DefaultEuroDates;
@@ -325,7 +325,7 @@ set_default_datestyle(void)
325325
DBDate=strdup(DBDate);
326326

327327
/* Parse desired setting into DateStyle/EuroDates */
328-
parse_date(DBDate);
328+
parse_datestyle(DBDate);
329329

330330
free(DBDate);
331331

@@ -396,7 +396,7 @@ show_timezone(void)
396396

397397
tz=getenv("TZ");
398398

399-
elog(NOTICE,"Time zone is %s", ((tz!=NULL) ?tz :"unknown"));
399+
elog(NOTICE,"Time zone is %s", ((tz!=NULL) ?tz :"unset"));
400400

401401
return TRUE;
402402
}/* show_timezone() */
@@ -586,7 +586,7 @@ parse_random_seed(char *value)
586586
staticbool
587587
show_random_seed(void)
588588
{
589-
elog(NOTICE,"Seed for random number generator isnot known");
589+
elog(NOTICE,"Seed for random number generator isunavailable");
590590
return (TRUE);
591591
}
592592

@@ -708,7 +708,7 @@ SetPGVariable(const char *name, const char *value)
708708
* Special cases ought to be removed and handled separately by TCOP
709709
*/
710710
if (strcasecmp(name,"datestyle")==0)
711-
parse_date(mvalue);
711+
parse_datestyle(mvalue);
712712
elseif (strcasecmp(name,"timezone")==0)
713713
parse_timezone(mvalue);
714714
elseif (strcasecmp(name,"DefaultXactIsoLevel")==0)
@@ -724,18 +724,17 @@ SetPGVariable(const char *name, const char *value)
724724
elseif (strcasecmp(name,"session_authorization")==0)
725725
SetSessionAuthorization(value);
726726
else
727-
SetConfigOption(name,value,superuser() ?PGC_SUSET :PGC_USERSET);
727+
SetConfigOption(name,value,superuser() ?PGC_SUSET :PGC_USERSET, false);
728728

729729
if (mvalue)
730730
pfree(mvalue);
731731
}
732732

733-
734733
void
735734
GetPGVariable(constchar*name)
736735
{
737736
if (strcasecmp(name,"datestyle")==0)
738-
show_date();
737+
show_datestyle();
739738
elseif (strcasecmp(name,"timezone")==0)
740739
show_timezone();
741740
elseif (strcasecmp(name,"DefaultXactIsoLevel")==0)
@@ -748,7 +747,17 @@ GetPGVariable(const char *name)
748747
show_server_encoding();
749748
elseif (strcasecmp(name,"seed")==0)
750749
show_random_seed();
751-
else
750+
elseif (strcasecmp(name,"all")==0)
751+
{
752+
ShowAllGUCConfig();
753+
show_datestyle();
754+
show_timezone();
755+
show_DefaultXactIsoLevel();
756+
show_XactIsoLevel();
757+
show_client_encoding();
758+
show_server_encoding();
759+
show_random_seed();
760+
}else
752761
{
753762
constchar*val=GetConfigOption(name);
754763

@@ -760,7 +769,7 @@ void
760769
ResetPGVariable(constchar*name)
761770
{
762771
if (strcasecmp(name,"datestyle")==0)
763-
reset_date();
772+
reset_datestyle();
764773
elseif (strcasecmp(name,"timezone")==0)
765774
reset_timezone();
766775
elseif (strcasecmp(name,"DefaultXactIsoLevel")==0)
@@ -773,6 +782,17 @@ ResetPGVariable(const char *name)
773782
reset_server_encoding();
774783
elseif (strcasecmp(name,"seed")==0)
775784
reset_random_seed();
776-
else
777-
SetConfigOption(name,NULL,superuser() ?PGC_SUSET :PGC_USERSET);
785+
elseif (strcasecmp(name,"all")==0)
786+
{
787+
reset_DefaultXactIsoLevel();
788+
reset_XactIsoLevel();
789+
reset_random_seed();
790+
/* reset_server_encoding(); */
791+
reset_client_encoding();
792+
reset_datestyle();
793+
reset_timezone();
794+
795+
ResetAllOptions();
796+
}else
797+
SetConfigOption(name,NULL,superuser() ?PGC_SUSET :PGC_USERSET, false);
778798
}

‎src/backend/parser/gram.y

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.228 2001/06/04 23:27:23 momjian Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.229 2001/06/07 04:50:56 momjian Exp $
1515
*
1616
* HISTORY
1717
* AUTHORDATEMAJOR EVENT
@@ -860,6 +860,12 @@ VariableShowStmt: SHOW ColId
860860
n->name ="timezone";
861861
$$ = (Node *) n;
862862
}
863+
|SHOWALL
864+
{
865+
VariableShowStmt *n = makeNode(VariableShowStmt);
866+
n->name ="all";
867+
$$ = (Node *) n;
868+
}
863869
|SHOWTRANSACTIONISOLATIONLEVEL
864870
{
865871
VariableShowStmt *n = makeNode(VariableShowStmt);
@@ -886,6 +892,12 @@ VariableResetStmt:RESET ColId
886892
n->name ="XactIsoLevel";
887893
$$ = (Node *) n;
888894
}
895+
|RESETALL
896+
{
897+
VariableResetStmt *n = makeNode(VariableResetStmt);
898+
n->name ="all";
899+
$$ = (Node *) n;
900+
}
889901
;
890902

891903

‎src/backend/postmaster/postmaster.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*
2929
*
3030
* IDENTIFICATION
31-
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.216 2001/06/03 14:53:56 petere Exp $
31+
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.217 2001/06/07 04:50:57 momjian Exp $
3232
*
3333
* NOTES
3434
*
@@ -533,7 +533,7 @@ PostmasterMain(int argc, char *argv[])
533533
elog(ERROR,"-c %s requires argument",optarg);
534534
}
535535

536-
SetConfigOption(name,value,PGC_POSTMASTER);
536+
SetConfigOption(name,value,PGC_POSTMASTER, true);
537537
free(name);
538538
if (value)
539539
free(value);

‎src/backend/tcop/postgres.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.218 2001/04/14 19:11:45 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.219 2001/06/07 04:50:57 momjian Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -1462,7 +1462,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
14621462

14631463
/* all options are allowed if not under postmaster */
14641464
SetConfigOption(name,value,
1465-
(IsUnderPostmaster) ?PGC_BACKEND :PGC_POSTMASTER);
1465+
(IsUnderPostmaster) ?PGC_BACKEND :PGC_POSTMASTER, true);
14661466
free(name);
14671467
if (value)
14681468
free(value);
@@ -1709,7 +1709,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
17091709
if (!IsUnderPostmaster)
17101710
{
17111711
puts("\nPOSTGRES backend interactive interface ");
1712-
puts("$Revision: 1.218 $ $Date: 2001/04/14 19:11:45 $\n");
1712+
puts("$Revision: 1.219 $ $Date: 2001/06/07 04:50:57 $\n");
17131713
}
17141714

17151715
/*

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Copyright 2000 by PostgreSQL Global Development Group
66
*
7-
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.7 2001/06/01 20:29:43 tgl Exp $
7+
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.8 2001/06/07 04:50:57 momjian Exp $
88
*/
99

1010
%{
@@ -260,13 +260,13 @@ ProcessConfigFile(GucContext context)
260260
*/
261261
for(item = head; item; item=item->next)
262262
{
263-
if (!set_config_option(item->name, item->value, context, false))
263+
if (!set_config_option(item->name, item->value, context, false, false))
264264
goto cleanup_exit;
265265
}
266266
267267
/* If we got here all the options parsed okay. */
268268
for(item = head; item; item=item->next)
269-
set_config_option(item->name, item->value, context, true);
269+
set_config_option(item->name, item->value, context, true, true);
270270
271271
cleanup_exit:
272272
free_name_value_list(head);

0 commit comments

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