Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9cbaf72

Browse files
tglsfdctglsfdc
committed
In the continuing saga of FE/BE protocol revisions, add reporting of
initial values and runtime changes in selected parameters. This gets rid of the need for an initial 'select pg_client_encoding()' query in libpq, bringing us back to one message transmitted in each direction for a standard connection startup. To allow server version to be sent using the same GUC mechanism that handles other parameters, invent the concept of a never-settable GUC parameter: you can 'show server_version' but it's not settable by any GUC input source. Create 'lc_collate' and 'lc_ctype' never-settable parameters so that people can find out these settings without need for pg_controldata. (These side ideas were all discussed some time ago in pgsql-hackers, but not yet implemented.)
1 parent a2190c9 commit 9cbaf72

File tree

13 files changed

+412
-478
lines changed

13 files changed

+412
-478
lines changed

‎doc/src/sgml/protocol.sgml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/protocol.sgml,v 1.30 2003/04/24 21:16:42 tgl Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/protocol.sgml,v 1.31 2003/04/25 19:45:08 tgl Exp $ -->
22

33
<chapter id="protocol">
44
<title>Frontend/Backend Protocol</title>
@@ -328,7 +328,7 @@
328328
is being started, and the frontend is just an interested bystander.
329329
It is still possible for the startup attempt
330330
to fail (ErrorResponse), but in the normal case the backend will send
331-
BackendKeyData, some ParameterStatus messages, and finally ReadyForQuery.
331+
some ParameterStatus messages, BackendKeyData, and finally ReadyForQuery.
332332
</para>
333333

334334
<para>
@@ -900,9 +900,9 @@
900900
<para>
901901
At present there is a hard-wired set of parameters for which
902902
ParameterStatus will be generated: they are
903-
<literal>version</> (backend version,
904-
a pseudo-parameter that cannot change after startup);
905-
<literal>database_encoding</> (also not presently changeable after start);
903+
<literal>server_version</> (a pseudo-parameter that cannot change after
904+
startup);
905+
<literal>server_encoding</> (also not presently changeable after start);
906906
<literal>client_encoding</>, and
907907
<literal>DateStyle</>.
908908
This set might change in the future, or even become configurable.
@@ -3881,6 +3881,13 @@ The CopyInResponse and CopyOutResponse messages carry a field indicating
38813881
whether the COPY operation is text or binary.
38823882
</para>
38833883

3884+
<para>
3885+
The backend sends ParameterStatus ('<literal>S</>') messages during connection
3886+
startup for all parameters it considers interesting to the client library.
3887+
Subsequently, a ParameterStatus message is sent whenever the active value
3888+
changes for any of these parameters.
3889+
</para>
3890+
38843891
<para>
38853892
The CursorResponse ('<literal>P</>') message is no longer generated by
38863893
the backend.

‎doc/src/sgml/ref/set.sgml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.73 2003/03/25 16:15:44 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.74 2003/04/25 19:45:08 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -52,7 +52,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
5252
<term><replaceable class="PARAMETER">variable</replaceable></term>
5353
<listitem>
5454
<para>
55-
A settable run-time parameter.
55+
Name of a settable run-time parameter.
5656
</para>
5757
</listitem>
5858
</varlistentry>
@@ -79,8 +79,9 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
7979

8080
<para>
8181
The <command>SET</command> command changes run-time configuration
82-
parameters. Many of the run-time parameters listed in the
83-
<xref linkend="runtime-config"> can be changed on-the-fly with <command>SET</command>.
82+
parameters. Many of the run-time parameters listed in
83+
<xref linkend="runtime-config"> can be changed on-the-fly with
84+
<command>SET</command>.
8485
(But some require superuser privileges to change, and others cannot
8586
be changed after server or session start.) Note that
8687
<command>SET</command> only affects the value used by the current
@@ -123,7 +124,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
123124
<listitem>
124125
<para>
125126
Choose the date/time representation style. Two separate
126-
settings are involved: the default date/time output and the
127+
settings are involved: the default date/time output format and the
127128
interpretation of ambiguous input.
128129
</para>
129130

@@ -147,7 +148,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
147148
<para>
148149
Use Oracle/Ingres-style dates and times. Note that this
149150
style has nothing to do with SQL (which mandates ISO 8601
150-
style), the naming of this option is a historical accident.
151+
style); the naming of this option is a historical accident.
151152
</para>
152153
</listitem>
153154
</varlistentry>
@@ -283,17 +284,6 @@ SELECT setseed(<replaceable>value</replaceable>);
283284
</listitem>
284285
</varlistentry>
285286

286-
<varlistentry>
287-
<term>SERVER_ENCODING</term>
288-
<listitem>
289-
<para>
290-
Shows the server-side multibyte encoding. (At present, this
291-
parameter can be shown but not set, because the encoding is
292-
determined at <application>initdb</> time.)
293-
</para>
294-
</listitem>
295-
</varlistentry>
296-
297287
<varlistentry>
298288
<term>TIME ZONE</term>
299289
<term>TIMEZONE</term>
@@ -410,7 +400,7 @@ SELECT setseed(<replaceable>value</replaceable>);
410400
</varlistentry>
411401

412402
<varlistentry>
413-
<term><computeroutput>ERROR: '<replaceable>name</replaceable> is not a
403+
<term><computeroutput>ERROR: '<replaceable>name</replaceable>' is not a
414404
valid option name</computeroutput></term>
415405
<listitem>
416406
<para>
@@ -447,7 +437,7 @@ SELECT setseed(<replaceable>value</replaceable>);
447437
<title>Notes</title>
448438

449439
<para>
450-
The function <function>set_config</function> provides the equivalent
440+
The function <function>set_config</function> provides equivalent
451441
capability. See <xref linkend="functions-misc">.
452442
</para>
453443
</refsect1>
@@ -517,6 +507,8 @@ SELECT CURRENT_TIMESTAMP AS today;
517507
<title>See Also</title>
518508

519509
<simpara>
510+
<xref linkend="SQL-SHOW" endterm="SQL-SHOW-title">,
511+
<xref linkend="SQL-RESET" endterm="SQL-RESET-title">,
520512
<xref linkend="sql-set-constraints" endterm="sql-set-constraints-title">,
521513
<xref linkend="sql-set-session-authorization" endterm="sql-set-session-authorization-title">,
522514
<xref linkend="sql-set-transaction" endterm="sql-set-transaction-title">

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

Lines changed: 66 additions & 7 deletions
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.24 2003/03/25 16:15:44 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/show.sgml,v 1.25 2003/04/25 19:45:08 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -52,12 +52,13 @@ SHOW ALL
5252
<refsect1 id="R1-SQL-SHOW-1">
5353
<title>Description</title>
5454
<para>
55-
<command>SHOW</command> will display the current setting of a
56-
run-time parameter. These variables can be set using the
55+
<command>SHOW</command> will display the current setting of
56+
run-time parameters. These variables can be set using the
5757
<command>SET</command> statement, by editing the
58-
<filename>postgresql.conf</filename>, through the
59-
<envar>PGOPTIONS</envar> environmental variable, or through a
60-
command-line flag when starting the
58+
<filename>postgresql.conf</filename> configuration file, through the
59+
<envar>PGOPTIONS</envar> environmental variable (when using libpq
60+
or a libpq-based application), or through
61+
command-line flags when starting the
6162
<application>postmaster</application>.
6263
</para>
6364

@@ -66,6 +67,64 @@ SHOW ALL
6667
does not start a new transaction block. See the
6768
<varname>autocommit</> section in <xref linkend="runtime-config"> for details.
6869
</para>
70+
71+
<para>
72+
Available parameters are documented in
73+
<xref linkend="runtime-config"> and on the
74+
<xref linkend="SQL-SET" endterm="SQL-SET-title"> reference page.
75+
In addition, there are a few parameters that can be shown but not set:
76+
77+
<variablelist>
78+
79+
<varlistentry>
80+
<term>SERVER_VERSION</term>
81+
<listitem>
82+
<para>
83+
Shows the server's version number.
84+
</para>
85+
</listitem>
86+
</varlistentry>
87+
88+
<varlistentry>
89+
<term>SERVER_ENCODING</term>
90+
<listitem>
91+
<para>
92+
Shows the server-side multibyte encoding. At present, this
93+
parameter can be shown but not set, because the encoding is
94+
determined at database creation time.
95+
</para>
96+
</listitem>
97+
</varlistentry>
98+
99+
<varlistentry>
100+
<term>LC_COLLATE</term>
101+
<listitem>
102+
<para>
103+
Shows the database's locale setting for collation (text ordering).
104+
At present, this parameter can be shown but not set, because the
105+
setting is determined at <application>initdb</> time.
106+
</para>
107+
</listitem>
108+
</varlistentry>
109+
110+
<varlistentry>
111+
<term>LC_CTYPE</term>
112+
<listitem>
113+
<para>
114+
Shows the database's locale setting for character set considerations.
115+
At present, this parameter can be shown but not set, because the
116+
setting is determined at <application>initdb</> time.
117+
</para>
118+
</listitem>
119+
</varlistentry>
120+
121+
</variablelist>
122+
</para>
123+
124+
<para>
125+
Use <xref linkend="SQL-SET" endterm="SQL-SET-title"> to set the value
126+
of settable parameters.
127+
</para>
69128
</refsect1>
70129

71130
<refsect1>
@@ -79,7 +138,7 @@ SHOW ALL
79138
<listitem>
80139
<para>
81140
Message returned if <replaceable>name</replaceable> does
82-
not stand for an existing parameter.
141+
not stand for a known parameter.
83142
</para>
84143
</listitem>
85144
</varlistentry>

‎src/backend/access/transam/xlog.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.113 2003/04/18 01:03:41 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.114 2003/04/25 19:45:08 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -36,6 +36,7 @@
3636
#include "storage/sinval.h"
3737
#include "storage/spin.h"
3838
#include "utils/builtins.h"
39+
#include "utils/guc.h"
3940
#include "utils/relcache.h"
4041
#include "miscadmin.h"
4142

@@ -2260,6 +2261,12 @@ ReadControlFile(void)
22602261
"\twhich is not recognized by setlocale().\n"
22612262
"\tIt looks like you need to initdb.",
22622263
ControlFile->lc_ctype);
2264+
2265+
/* Make the fixed locale settings visible as GUC variables, too */
2266+
SetConfigOption("lc_collate", ControlFile->lc_collate,
2267+
PGC_INTERNAL, PGC_S_OVERRIDE);
2268+
SetConfigOption("lc_ctype", ControlFile->lc_ctype,
2269+
PGC_INTERNAL, PGC_S_OVERRIDE);
22632270
}
22642271

22652272
void

‎src/backend/commands/variable.c

Lines changed: 1 addition & 17 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.73 2003/02/01 18:31:28 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.74 2003/04/25 19:45:08 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -500,22 +500,6 @@ assign_client_encoding(const char *value, bool doit, bool interactive)
500500
}
501501

502502

503-
const char *
504-
assign_server_encoding(const char *value, bool doit, bool interactive)
505-
{
506-
if (interactive)
507-
elog(ERROR, "SET SERVER_ENCODING is not supported");
508-
/* Pretend never to fail in noninteractive case */
509-
return value;
510-
}
511-
512-
const char *
513-
show_server_encoding(void)
514-
{
515-
return GetDatabaseEncodingName();
516-
}
517-
518-
519503
/*
520504
* SET SESSION AUTHORIZATION
521505
*

‎src/backend/utils/init/postinit.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.119 2003/02/19 14:31:26 ishii Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.120 2003/04/25 19:45:08 tgl Exp $
1212
*
1313
*
1414
*-------------------------------------------------------------------------
@@ -128,6 +128,9 @@ ReverifyMyDatabase(const char *name)
128128
* info out of the pg_database tuple.
129129
*/
130130
SetDatabaseEncoding(dbform->encoding);
131+
/* Record it as a GUC internal option, too */
132+
SetConfigOption("server_encoding", GetDatabaseEncodingName(),
133+
PGC_INTERNAL, PGC_S_OVERRIDE);
131134
/* If we have no other source of client_encoding, use server encoding */
132135
SetConfigOption("client_encoding", GetDatabaseEncodingName(),
133136
PGC_BACKEND, PGC_S_DEFAULT);
@@ -400,6 +403,12 @@ InitPostgres(const char *dbname, const char *username)
400403
/* initialize client encoding */
401404
InitializeClientEncoding();
402405

406+
/*
407+
* Now all default states are fully set up. Report them to client
408+
* if appropriate.
409+
*/
410+
BeginReportingGUCOptions();
411+
403412
/*
404413
* Set up process-exit callback to do pre-shutdown cleanup. This
405414
* should be last because we want shmem_exit to call this routine

0 commit comments

Comments
 (0)