Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
026643a6
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,发现更多精彩内容 >>
提交
026643a6
编写于
11月 14, 2000
作者:
B
Bruce Momjian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename PortName to PortNumber.
上级
ab472547
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
19 addition
and
33 deletion
+19
-33
src/backend/libpq/pqcomm.c
src/backend/libpq/pqcomm.c
+4
-4
src/backend/postmaster/postmaster.c
src/backend/postmaster/postmaster.c
+7
-7
src/backend/utils/misc/guc.c
src/backend/utils/misc/guc.c
+3
-3
src/include/libpq/libpq.h
src/include/libpq/libpq.h
+2
-2
src/include/miscadmin.h
src/include/miscadmin.h
+2
-2
src/interfaces/libpq/fe-connect.c
src/interfaces/libpq/fe-connect.c
+1
-15
未找到文件。
src/backend/libpq/pqcomm.c
浏览文件 @
026643a6
...
...
@@ -29,7 +29,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: pqcomm.c,v 1.11
1 2000/11/13 21:31:46
momjian Exp $
* $Id: pqcomm.c,v 1.11
2 2000/11/14 01:15:00
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -175,7 +175,7 @@ StreamDoUnlink(void)
*/
int
StreamServerPort
(
int
family
,
char
*
hostName
,
unsigned
short
portN
ame
,
StreamServerPort
(
int
family
,
char
*
hostName
,
unsigned
short
portN
umber
,
char
*
unixSocketName
,
int
*
fdP
)
{
SockAddr
saddr
;
...
...
@@ -219,7 +219,7 @@ StreamServerPort(int family, char *hostName, unsigned short portName,
#ifdef HAVE_UNIX_SOCKETS
if
(
family
==
AF_UNIX
)
{
UNIXSOCK_PATH
(
saddr
.
un
,
portN
ame
,
unixSocketName
);
UNIXSOCK_PATH
(
saddr
.
un
,
portN
umber
,
unixSocketName
);
len
=
UNIXSOCK_LEN
(
saddr
.
un
);
strcpy
(
sock_path
,
saddr
.
un
.
sun_path
);
/*
...
...
@@ -265,7 +265,7 @@ StreamServerPort(int family, char *hostName, unsigned short portName,
hp
->
h_length
);
}
saddr
.
in
.
sin_port
=
htons
(
portN
ame
);
saddr
.
in
.
sin_port
=
htons
(
portN
umber
);
len
=
sizeof
(
struct
sockaddr_in
);
}
...
...
src/backend/postmaster/postmaster.c
浏览文件 @
026643a6
...
...
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.18
4 2000/11/13 23:37:52
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.18
5 2000/11/14 01:15:01
momjian Exp $
*
* NOTES
*
...
...
@@ -113,7 +113,7 @@ static Dllist *BackendList;
static
Dllist
*
PortList
;
/* The socket number we are listening for connections on */
int
PostPortN
ame
;
int
PostPortN
umber
;
char
*
UnixSocketName
;
char
*
HostName
;
...
...
@@ -511,7 +511,7 @@ PostmasterMain(int argc, char *argv[])
strcpy
(
original_extraoptions
,
optarg
);
break
;
case
'p'
:
PostPortN
ame
=
atoi
(
optarg
);
PostPortN
umber
=
atoi
(
optarg
);
break
;
case
'S'
:
...
...
@@ -616,7 +616,7 @@ PostmasterMain(int argc, char *argv[])
if
(
NetServer
)
{
status
=
StreamServerPort
(
AF_INET
,
HostName
,
(
unsigned
short
)
PostPortN
ame
,
UnixSocketName
,
(
unsigned
short
)
PostPortN
umber
,
UnixSocketName
,
&
ServerSock_INET
);
if
(
status
!=
STATUS_OK
)
{
...
...
@@ -628,7 +628,7 @@ PostmasterMain(int argc, char *argv[])
#ifdef HAVE_UNIX_SOCKETS
status
=
StreamServerPort
(
AF_UNIX
,
HostName
,
(
unsigned
short
)
PostPortN
ame
,
UnixSocketName
,
(
unsigned
short
)
PostPortN
umber
,
UnixSocketName
,
&
ServerSock_UNIX
);
if
(
status
!=
STATUS_OK
)
{
...
...
@@ -639,7 +639,7 @@ PostmasterMain(int argc, char *argv[])
#endif
/* set up shared memory and semaphores */
reset_shared
(
PostPortN
ame
);
reset_shared
(
PostPortN
umber
);
/* Init XLOG paths */
snprintf
(
XLogDir
,
MAXPGPATH
,
"%s/pg_xlog"
,
DataDir
);
...
...
@@ -1619,7 +1619,7 @@ reaper(SIGNAL_ARGS)
ctime
(
&
tnow
));
fflush
(
stderr
);
shmem_exit
(
0
);
reset_shared
(
PostPortN
ame
);
reset_shared
(
PostPortN
umber
);
StartupPID
=
StartupDataBase
();
return
;
}
...
...
src/backend/utils/misc/guc.c
浏览文件 @
026643a6
...
...
@@ -4,7 +4,7 @@
* Support for grand unified configuration scheme, including SET
* command, configuration file, and command line options.
*
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.1
8 2000/11/13 21:35:03
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.1
9 2000/11/14 01:15:02
momjian Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
...
...
@@ -245,7 +245,7 @@ ConfigureNamesInt[] =
DEF_MAXBACKENDS
,
1
,
MAXBACKENDS
},
{
"shared_buffers"
,
PGC_POSTMASTER
,
&
NBuffers
,
DEF_NBUFFERS
,
16
,
INT_MAX
},
{
"port"
,
PGC_POSTMASTER
,
&
PostPortN
ame
,
{
"port"
,
PGC_POSTMASTER
,
&
PostPortN
umber
,
DEF_PGPORT
,
1
,
65535
},
{
"sort_mem"
,
PGC_USERSET
,
&
SortMem
,
...
...
@@ -409,7 +409,7 @@ ResetAllOptions(void)
}
if
(
getenv
(
"PGPORT"
))
PostPortN
ame
=
atoi
(
getenv
(
"PGPORT"
));
PostPortN
umber
=
atoi
(
getenv
(
"PGPORT"
));
}
...
...
src/include/libpq/libpq.h
浏览文件 @
026643a6
...
...
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: libpq.h,v 1.4
0 2000/11/13 15:18:1
4 momjian Exp $
* $Id: libpq.h,v 1.4
1 2000/11/14 01:15:0
4 momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -56,7 +56,7 @@ extern char PQerrormsg[PQERRORMSG_LENGTH]; /* in libpq/util.c */
* prototypes for functions in pqcomm.c
*/
extern
int
StreamServerPort
(
int
family
,
char
*
hostName
,
unsigned
short
portN
ame
,
char
*
unixSocketName
,
int
*
fdP
);
unsigned
short
portN
umber
,
char
*
unixSocketName
,
int
*
fdP
);
extern
int
StreamConnection
(
int
server_fd
,
Port
*
port
);
extern
void
StreamClose
(
int
sock
);
extern
void
pq_init
(
void
);
...
...
src/include/miscadmin.h
浏览文件 @
026643a6
...
...
@@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: miscadmin.h,v 1.7
0 2000/11/12 20:51:52 tgl
Exp $
* $Id: miscadmin.h,v 1.7
1 2000/11/14 01:15:03 momjian
Exp $
*
* NOTES
* some of the information in this file will be moved to
...
...
@@ -110,7 +110,7 @@ extern bool EnableSSL;
extern
bool
SilentMode
;
extern
int
MaxBackends
;
extern
int
NBuffers
;
extern
int
PostPortN
ame
;
extern
int
PostPortN
umber
;
/*****************************************************************************
* pdir.h -- *
...
...
src/interfaces/libpq/fe-connect.c
浏览文件 @
026643a6
...
...
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.14
6 2000/11/13 23:37:53
momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.14
7 2000/11/14 01:15:06
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -342,13 +342,6 @@ PQconnectStart(const char *conninfo)
conn
->
pgunixsocket
=
conn
->
pghost
;
conn
->
pghost
=
NULL
;
}
if
(
conn
->
pghostaddr
&&
conn
->
pghostaddr
[
0
]
==
'/'
)
{
if
(
conn
->
pgunixsocket
)
free
(
conn
->
pgunixsocket
);
conn
->
pgunixsocket
=
conn
->
pghostaddr
;
conn
->
pghostaddr
=
NULL
;
}
/* ----------
* Connect to the database
...
...
@@ -474,13 +467,6 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions,
conn
->
pgunixsocket
=
conn
->
pghost
;
conn
->
pghost
=
NULL
;
}
if
(
conn
->
pghostaddr
&&
conn
->
pghostaddr
[
0
]
==
'/'
)
{
if
(
conn
->
pgunixsocket
)
free
(
conn
->
pgunixsocket
);
conn
->
pgunixsocket
=
conn
->
pghostaddr
;
conn
->
pghostaddr
=
NULL
;
}
if
(
pgtty
==
NULL
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录