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

Commit13dbd02

Browse files
committed
Final(?) GUC clean-up. Update psql tab completion.
1 parent65b362f commit13dbd02

File tree

3 files changed

+43
-23
lines changed

3 files changed

+43
-23
lines changed

‎doc/src/sgml/runtime.sgml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.40 2000/11/30 23:20:50 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.41 2000/12/03 14:36:45 petere Exp $
33
-->
44

55
<Chapter Id="runtime">
@@ -638,7 +638,7 @@ env PGOPTIONS='-c geqo=off' psql
638638
</varlistentry>
639639

640640
<varlistentry>
641-
<term>GEQO_RELS (<type>integer</type>)</term>
641+
<term>GEQO_THRESHOLD (<type>integer</type>)</term>
642642
<listitem>
643643
<para>
644644
Only use genetic query optimization for queries with at least
@@ -751,7 +751,7 @@ env PGOPTIONS='-c geqo=off' psql
751751
</varlistentry>
752752

753753
<varlistentry>
754-
<term>HOSTLOOKUP (<type>boolean</type>)</term>
754+
<term>HOSTNAME_LOOKUP (<type>boolean</type>)</term>
755755
<listitem>
756756
<para>
757757
By default, connection logs only show the IP address of the
@@ -811,14 +811,14 @@ env PGOPTIONS='-c geqo=off' psql
811811
</varlistentry>
812812

813813
<varlistentry>
814-
<term>SHOWPORTNUMBER (<type>boolean</type>)</term>
814+
<term>SHOW_SOURCE_PORT (<type>boolean</type>)</term>
815815
<listitem>
816816
<para>
817-
Shows the port number of the connecting host in the connection
818-
log messages. You could trace back the port number to find out
819-
what user initiated the connection. Other than that it's
820-
pretty useless and therefore off by default. This option can
821-
only be set at server start.
817+
Shows theoutgoingport number of the connecting host in the
818+
connectionlog messages. You could trace back the port number
819+
to find outwhat user initiated the connection. Other than
820+
that it'spretty useless and therefore off by default. This
821+
option canonly be set at server start.
822822
</para>
823823
</listitem>
824824
</varlistentry>
@@ -1015,12 +1015,12 @@ env PGOPTIONS='-c geqo=off' psql
10151015
<term>SILENT_MODE (<type>bool</type>)</term>
10161016
<listitem>
10171017
<para>
1018-
Runs postmaster silently. If this option is set,postmaser
1018+
Runs postmaster silently. If this option is set,postmaster
10191019
will automatically run in background and any controlling ttys
1020-
are disassociated, thus nomessage is put to stdout or
1021-
stderr(same effect as postmaster's -S option). Unless some
1022-
loggingsystems such as syslog is enabled, using this option
1023-
isdiscouraged since it makesdifficulttofind error
1020+
are disassociated, thus nomessages are written to stdout or
1021+
stderr(same effect as postmaster's -S option). Unless some
1022+
loggingsystem such as syslog is enabled, using this option is
1023+
discouraged since it makesit impossibletosee error
10241024
messages.
10251025
</para>
10261026
</listitem>

‎src/backend/utils/misc/guc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Support for grand unified configuration scheme, including SET
55
* command, configuration file, and command line options.
66
*
7-
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.25 2000/11/30 01:47:32 vadim Exp $
7+
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.26 2000/12/03 14:36:46 petere Exp $
88
*
99
* Copyright 2000 by PostgreSQL Global Development Group
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -207,8 +207,8 @@ ConfigureNamesBool[] =
207207
{"debug_deadlocks",PGC_SUSET,&Debug_deadlocks, false},
208208
#endif
209209

210-
{"hostlookup",PGC_SIGHUP,&HostnameLookup, false},
211-
{"showportnumber",PGC_SIGHUP,&ShowPortNumber, false},
210+
{"hostname_lookup",PGC_SIGHUP,&HostnameLookup, false},
211+
{"show_source_port",PGC_SIGHUP,&ShowPortNumber, false},
212212

213213
{"sql_inheritance",PGC_USERSET,&SQL_inheritance, true},
214214

@@ -219,7 +219,7 @@ ConfigureNamesBool[] =
219219
staticstructconfig_int
220220
ConfigureNamesInt[]=
221221
{
222-
{"geqo_rels",PGC_USERSET,&geqo_rels,
222+
{"geqo_threshold",PGC_USERSET,&geqo_rels,
223223
DEFAULT_GEQO_RELS,2,INT_MAX},
224224
{"geqo_pool_size",PGC_USERSET,&Geqo_pool_size,
225225
DEFAULT_GEQO_POOL_SIZE,0,MAX_GEQO_POOL_SIZE},

‎src/bin/psql/tab-complete.c

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.22 2000/10/25 20:36:52 tgl Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.23 2000/12/03 14:36:47 petere Exp $
77
*/
88

99
/*----------------------------------------------------------------------
@@ -201,16 +201,15 @@ psql_completion(char *text, int start, int end)
201201
/* these SET arguments are known in gram.y */
202202
"CONSTRAINTS",
203203
"NAMES",
204+
"SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL",
204205
"TRANSACTION ISOLATION LEVEL",
205206
/* these are treated in backend/commands/variable.c */
206207
"DateStyle",
207208
"TimeZone",
208209
"client_encoding",
209210
"server_encoding",
210211
"random_seed",
211-
/* the rest should match USERSET and SUSET entries in
212-
* backend/utils/misc/guc.c, but feel free to leave out the
213-
* esoteric or debug settings */
212+
/* the rest should match USERSET entries in backend/utils/misc/guc.c */
214213
"enable_seqscan",
215214
"enable_indexscan",
216215
"enable_tidscan",
@@ -220,15 +219,36 @@ psql_completion(char *text, int start, int end)
220219
"enable_hashjoin",
221220
"geqo",
222221
"ksqo",
222+
"fsync",
223+
"debug_assertions",
224+
"debug_print_query",
225+
"debug_print_parse",
226+
"debug_print_rewritten",
227+
"debug_print_plan",
228+
"debug_pretty_print",
229+
"show_parser_stats",
230+
"show_planner_stats",
231+
"show_executor_stats",
232+
"show_query_stats",
233+
"trace_notify",
223234
"sql_inheritance",
235+
236+
"geqo_threshold",
237+
"geqo_pool_size",
238+
"geqo_effort",
239+
"geqo_generations",
240+
"geqo_random_seed",
224241
"sort_mem",
225242
"debug_level",
226243
"max_expr_depth",
244+
"commit_delay",
245+
227246
"effective_cache_size",
228247
"random_page_cost",
229248
"cpu_tuple_cost",
230249
"cpu_index_tuple_cost",
231250
"cpu_operator_cost",
251+
"geqo_selection_bias",
232252
NULL
233253
};
234254

@@ -592,7 +612,7 @@ psql_completion(char *text, int start, int end)
592612
strcasecmp(prev2_wd,"TRANSACTION")==0&&
593613
strcasecmp(prev_wd,"ISOLATION")==0)
594614
COMPLETE_WITH_CONST("LEVEL");
595-
elseif (strcasecmp(prev4_wd,"SET")==0&&
615+
elseif ((strcasecmp(prev4_wd,"SET")==0||strcasecmp(prev4_wd,"AS")==0)&&
596616
strcasecmp(prev3_wd,"TRANSACTION")==0&&
597617
strcasecmp(prev2_wd,"ISOLATION")==0&&
598618
strcasecmp(prev_wd,"LEVEL")==0)

0 commit comments

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