Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
2e67a677
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2e67a677
编写于
6月 25, 2001
作者:
T
Tom Lane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix a couple remaining places where GUC variables were assigned to
directly, rather than through SetConfigOption().
上级
4d58a7ca
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
17 deletion
+15
-17
src/backend/postmaster/postmaster.c
src/backend/postmaster/postmaster.c
+2
-4
src/backend/tcop/postgres.c
src/backend/tcop/postgres.c
+13
-13
未找到文件。
src/backend/postmaster/postmaster.c
浏览文件 @
2e67a677
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.22
7 2001/06/23 22:23:49 momjian
Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.22
8 2001/06/25 22:56:05 tgl
Exp $
*
*
* NOTES
* NOTES
*
*
...
@@ -371,7 +371,7 @@ PostmasterMain(int argc, char *argv[])
...
@@ -371,7 +371,7 @@ PostmasterMain(int argc, char *argv[])
/* PGPORT environment variable, if set, overrides GUC setting */
/* PGPORT environment variable, if set, overrides GUC setting */
if
(
getenv
(
"PGPORT"
))
if
(
getenv
(
"PGPORT"
))
PostPortNumber
=
atoi
(
getenv
(
"PGPORT"
)
);
SetConfigOption
(
"port"
,
getenv
(
"PGPORT"
),
PGC_POSTMASTER
,
true
);
potential_DataDir
=
getenv
(
"PGDATA"
);
/* default value */
potential_DataDir
=
getenv
(
"PGDATA"
);
/* default value */
...
@@ -447,7 +447,6 @@ PostmasterMain(int argc, char *argv[])
...
@@ -447,7 +447,6 @@ PostmasterMain(int argc, char *argv[])
/* already done above */
/* already done above */
break
;
break
;
case
'd'
:
case
'd'
:
/*
/*
* Turn on debugging for the postmaster and the backend
* Turn on debugging for the postmaster and the backend
* servers descended from it.
* servers descended from it.
...
@@ -561,7 +560,6 @@ PostmasterMain(int argc, char *argv[])
...
@@ -561,7 +560,6 @@ PostmasterMain(int argc, char *argv[])
*/
*/
if
(
NBuffers
<
2
*
MaxBackends
||
NBuffers
<
16
)
if
(
NBuffers
<
2
*
MaxBackends
||
NBuffers
<
16
)
{
{
/*
/*
* Do not accept -B so small that backends are likely to starve
* Do not accept -B so small that backends are likely to starve
* for lack of buffers. The specific choices here are somewhat
* for lack of buffers. The specific choices here are somewhat
...
...
src/backend/tcop/postgres.c
浏览文件 @
2e67a677
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.22
5 2001/06/23 22:23:49 momjian
Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.22
6 2001/06/25 22:56:04 tgl
Exp $
*
*
* NOTES
* NOTES
* this is the "main" module of the postgres backend and
* this is the "main" module of the postgres backend and
...
@@ -1108,7 +1108,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
...
@@ -1108,7 +1108,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
int
flag
;
int
flag
;
const
char
*
DBName
=
NULL
;
const
char
*
DBName
=
NULL
;
bool
secure
=
true
;
bool
secure
;
int
errs
=
0
;
int
errs
=
0
;
GucContext
ctx
;
GucContext
ctx
;
char
*
tmp
;
char
*
tmp
;
...
@@ -1120,9 +1120,6 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
...
@@ -1120,9 +1120,6 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
unsigned
short
remote_port
;
unsigned
short
remote_port
;
char
*
potential_DataDir
=
NULL
;
char
*
potential_DataDir
=
NULL
;
/* all options are allowed until '-p' */
ctx
=
PGC_POSTMASTER
;
/*
/*
* Catch standard options before doing much else. This even works on
* Catch standard options before doing much else. This even works on
...
@@ -1190,6 +1187,10 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
...
@@ -1190,6 +1187,10 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
* ----------------
* ----------------
*/
*/
/* all options are allowed until '-p' */
secure
=
true
;
ctx
=
PGC_POSTMASTER
;
optind
=
1
;
/* reset after postmaster's usage */
optind
=
1
;
/* reset after postmaster's usage */
while
((
flag
=
getopt
(
argc
,
argv
,
"A:B:c:CD:d:Eef:FiLNOPo:p:S:st:v:W:x:-:"
))
!=
EOF
)
while
((
flag
=
getopt
(
argc
,
argv
,
"A:B:c:CD:d:Eef:FiLNOPo:p:S:st:v:W:x:-:"
))
!=
EOF
)
...
@@ -1225,18 +1226,17 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
...
@@ -1225,18 +1226,17 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
break
;
break
;
case
'd'
:
/* debug level */
case
'd'
:
/* debug level */
tmp
=
"true"
;
SetConfigOption
(
"debug_level"
,
optarg
,
ctx
,
true
);
SetConfigOption
(
"debug_level"
,
optarg
,
ctx
,
true
);
if
(
DebugLvl
>=
1
)
if
(
DebugLvl
>=
1
)
SetConfigOption
(
"log_connections"
,
tmp
,
ctx
,
true
);
SetConfigOption
(
"log_connections"
,
"true"
,
ctx
,
true
);
if
(
DebugLvl
>=
2
)
if
(
DebugLvl
>=
2
)
SetConfigOption
(
"debug_print_query"
,
tmp
,
ctx
,
true
);
SetConfigOption
(
"debug_print_query"
,
"true"
,
ctx
,
true
);
if
(
DebugLvl
>=
3
)
if
(
DebugLvl
>=
3
)
SetConfigOption
(
"debug_print_parse"
,
tmp
,
ctx
,
true
);
SetConfigOption
(
"debug_print_parse"
,
"true"
,
ctx
,
true
);
if
(
DebugLvl
>=
4
)
if
(
DebugLvl
>=
4
)
SetConfigOption
(
"debug_print_plan"
,
tmp
,
ctx
,
true
);
SetConfigOption
(
"debug_print_plan"
,
"true"
,
ctx
,
true
);
if
(
DebugLvl
>=
5
)
if
(
DebugLvl
>=
5
)
SetConfigOption
(
"debug_print_rewritten"
,
tmp
,
ctx
,
true
);
SetConfigOption
(
"debug_print_rewritten"
,
"true"
,
ctx
,
true
);
break
;
break
;
case
'E'
:
case
'E'
:
...
@@ -1491,7 +1491,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
...
@@ -1491,7 +1491,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
(
Show_parser_stats
||
Show_planner_stats
||
Show_executor_stats
))
(
Show_parser_stats
||
Show_planner_stats
||
Show_executor_stats
))
{
{
fprintf
(
stderr
,
"Query statistics are disabled because parser, planner, or executor statistics are on.
\n
"
);
fprintf
(
stderr
,
"Query statistics are disabled because parser, planner, or executor statistics are on.
\n
"
);
S
how_query_stats
=
false
;
S
etConfigOption
(
"show_query_stats"
,
"false"
,
ctx
,
true
)
;
}
}
if
(
!
IsUnderPostmaster
)
if
(
!
IsUnderPostmaster
)
...
@@ -1714,7 +1714,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
...
@@ -1714,7 +1714,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
if
(
!
IsUnderPostmaster
)
if
(
!
IsUnderPostmaster
)
{
{
puts
(
"
\n
POSTGRES backend interactive interface "
);
puts
(
"
\n
POSTGRES backend interactive interface "
);
puts
(
"$Revision: 1.22
5 $ $Date: 2001/06/23 22:23:49
$
\n
"
);
puts
(
"$Revision: 1.22
6 $ $Date: 2001/06/25 22:56:04
$
\n
"
);
}
}
/*
/*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录