Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
ef5bea51
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,发现更多精彩内容 >>
提交
ef5bea51
编写于
7月 03, 2000
作者:
P
Peter Eisentraut
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move global internal files to PGDATA/global.
上级
e2d3932e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
31 addition
and
30 deletion
+31
-30
src/backend/bootstrap/bootstrap.c
src/backend/bootstrap/bootstrap.c
+3
-5
src/backend/catalog/catalog.c
src/backend/catalog/catalog.c
+7
-7
src/backend/libpq/crypt.c
src/backend/libpq/crypt.c
+3
-3
src/backend/tcop/postgres.c
src/backend/tcop/postgres.c
+4
-6
src/backend/utils/misc/database.c
src/backend/utils/misc/database.c
+3
-3
src/bin/initdb/initdb.sh
src/bin/initdb/initdb.sh
+11
-6
未找到文件。
src/backend/bootstrap/bootstrap.c
浏览文件 @
ef5bea51
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
* Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.8
8 2000/06/28 03:31:09 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.8
9 2000/07/03 20:48:27 petere
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -347,10 +347,8 @@ BootstrapMain(int argc, char *argv[])
...
@@ -347,10 +347,8 @@ BootstrapMain(int argc, char *argv[])
*/
*/
if
(
IsUnderPostmaster
||
xloginit
)
if
(
IsUnderPostmaster
||
xloginit
)
{
{
snprintf
(
XLogDir
,
MAXPGPATH
,
"%s%cpg_xlog"
,
snprintf
(
XLogDir
,
MAXPGPATH
,
"%s/pg_xlog"
,
DataDir
);
DataDir
,
SEP_CHAR
);
snprintf
(
ControlFilePath
,
MAXPGPATH
,
"%s/global/pg_control"
,
DataDir
);
snprintf
(
ControlFilePath
,
MAXPGPATH
,
"%s%cpg_control"
,
DataDir
,
SEP_CHAR
);
}
}
if
(
IsUnderPostmaster
&&
xloginit
)
if
(
IsUnderPostmaster
&&
xloginit
)
...
...
src/backend/catalog/catalog.c
浏览文件 @
ef5bea51
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.3
2 2000/04/12 17:14:55 momjian
Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.3
3 2000/07/03 20:48:28 petere
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -37,11 +37,11 @@ relpath(const char *relname)
...
@@ -37,11 +37,11 @@ relpath(const char *relname)
if
(
IsSharedSystemRelationName
(
relname
))
if
(
IsSharedSystemRelationName
(
relname
))
{
{
/* Shared system relations live in
DataDir
*/
/* Shared system relations live in
{datadir}/global
*/
size_t
bufsize
=
strlen
(
DataDir
)
+
sizeof
(
NameData
)
+
2
;
size_t
bufsize
=
strlen
(
DataDir
)
+
8
+
sizeof
(
NameData
)
+
1
;
path
=
(
char
*
)
palloc
(
bufsize
);
path
=
(
char
*
)
palloc
(
bufsize
);
snprintf
(
path
,
bufsize
,
"%s
%c%s"
,
DataDir
,
SEP_CHAR
,
relname
);
snprintf
(
path
,
bufsize
,
"%s
/global/%s"
,
DataDir
,
relname
);
return
path
;
return
path
;
}
}
...
@@ -71,9 +71,9 @@ relpath_blind(const char *dbname, const char *relname,
...
@@ -71,9 +71,9 @@ relpath_blind(const char *dbname, const char *relname,
if
(
dbid
==
(
Oid
)
0
)
if
(
dbid
==
(
Oid
)
0
)
{
{
/* Shared system relations live in
DataDir
*/
/* Shared system relations live in
{datadir}/global
*/
path
=
(
char
*
)
palloc
(
strlen
(
DataDir
)
+
sizeof
(
NameData
)
+
2
);
path
=
(
char
*
)
palloc
(
strlen
(
DataDir
)
+
8
+
sizeof
(
NameData
)
+
1
);
sprintf
(
path
,
"%s
%c%s"
,
DataDir
,
SEP_CHAR
,
relname
);
sprintf
(
path
,
"%s
/global/%s"
,
DataDir
,
relname
);
}
}
else
if
(
dbid
==
MyDatabaseId
)
else
if
(
dbid
==
MyDatabaseId
)
{
{
...
...
src/backend/libpq/crypt.c
浏览文件 @
ef5bea51
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
* Dec 17, 1997 - Todd A. Brandys
* Dec 17, 1997 - Todd A. Brandys
* Orignal Version Completed.
* Orignal Version Completed.
*
*
* $Id: crypt.c,v 1.2
5 2000/06/09 01:11:06 tgl
Exp $
* $Id: crypt.c,v 1.2
6 2000/07/03 20:48:30 petere
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -38,9 +38,9 @@ crypt_getpwdfilename()
...
@@ -38,9 +38,9 @@ crypt_getpwdfilename()
static
char
*
pfnam
=
NULL
;
static
char
*
pfnam
=
NULL
;
int
bufsize
;
int
bufsize
;
bufsize
=
strlen
(
DataDir
)
+
strlen
(
CRYPT_PWD_FILE
)
+
2
;
bufsize
=
strlen
(
DataDir
)
+
8
+
strlen
(
CRYPT_PWD_FILE
)
+
1
;
pfnam
=
(
char
*
)
palloc
(
bufsize
);
pfnam
=
(
char
*
)
palloc
(
bufsize
);
snprintf
(
pfnam
,
bufsize
,
"%s/%s"
,
DataDir
,
CRYPT_PWD_FILE
);
snprintf
(
pfnam
,
bufsize
,
"%s/
global/
%s"
,
DataDir
,
CRYPT_PWD_FILE
);
return
pfnam
;
return
pfnam
;
}
}
...
...
src/backend/tcop/postgres.c
浏览文件 @
ef5bea51
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.16
4 2000/07/03 20:46:00
petere Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.16
5 2000/07/03 20:48:37
petere Exp $
*
*
* NOTES
* NOTES
* this is the "main" module of the postgres backend and
* this is the "main" module of the postgres backend and
...
@@ -1294,10 +1294,8 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
...
@@ -1294,10 +1294,8 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
on_proc_exit
(
UnlinkPidFile
,
NULL
);
on_proc_exit
(
UnlinkPidFile
,
NULL
);
BaseInit
();
BaseInit
();
snprintf
(
XLogDir
,
MAXPGPATH
,
"%s%cpg_xlog"
,
snprintf
(
XLogDir
,
MAXPGPATH
,
"%s/pg_xlog"
,
DataDir
);
DataDir
,
SEP_CHAR
);
snprintf
(
ControlFilePath
,
MAXPGPATH
,
"%s/global/pg_control"
,
DataDir
);
snprintf
(
ControlFilePath
,
MAXPGPATH
,
"%s%cpg_control"
,
DataDir
,
SEP_CHAR
);
StartupXLOG
();
StartupXLOG
();
}
}
...
@@ -1406,7 +1404,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
...
@@ -1406,7 +1404,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if
(
!
IsUnderPostmaster
)
if
(
!
IsUnderPostmaster
)
{
{
puts
(
"
\n
POSTGRES backend interactive interface "
);
puts
(
"
\n
POSTGRES backend interactive interface "
);
puts
(
"$Revision: 1.16
4 $ $Date: 2000/07/03 20:46:00
$
\n
"
);
puts
(
"$Revision: 1.16
5 $ $Date: 2000/07/03 20:48:37
$
\n
"
);
}
}
/*
/*
...
...
src/backend/utils/misc/database.c
浏览文件 @
ef5bea51
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.3
8 2000/06/02 15:57:34 momjian
Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.3
9 2000/07/03 20:48:42 petere
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -143,8 +143,8 @@ GetRawDatabaseInfo(const char *name, Oid *db_id, char *path)
...
@@ -143,8 +143,8 @@ GetRawDatabaseInfo(const char *name, Oid *db_id, char *path)
char
*
dbfname
;
char
*
dbfname
;
Form_pg_database
tup_db
;
Form_pg_database
tup_db
;
dbfname
=
(
char
*
)
palloc
(
strlen
(
DataDir
)
+
strlen
(
DatabaseRelationName
)
+
2
);
dbfname
=
(
char
*
)
palloc
(
strlen
(
DataDir
)
+
8
+
strlen
(
DatabaseRelationName
)
+
2
);
sprintf
(
dbfname
,
"%s
%c%s"
,
DataDir
,
SEP_CHAR
,
DatabaseRelationName
);
sprintf
(
dbfname
,
"%s
/global/%s"
,
DataDir
,
DatabaseRelationName
);
if
((
dbfd
=
open
(
dbfname
,
O_RDONLY
|
PG_BINARY
,
0
))
<
0
)
if
((
dbfd
=
open
(
dbfname
,
O_RDONLY
|
PG_BINARY
,
0
))
<
0
)
elog
(
FATAL
,
"cannot open %s: %s"
,
dbfname
,
strerror
(
errno
));
elog
(
FATAL
,
"cannot open %s: %s"
,
dbfname
,
strerror
(
errno
));
...
...
src/bin/initdb/initdb.sh
浏览文件 @
ef5bea51
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#
#
#
#
# IDENTIFICATION
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.9
8 2000/07/02 15:21:00
petere Exp $
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.9
9 2000/07/03 20:48:46
petere Exp $
#
#
#-------------------------------------------------------------------------
#-------------------------------------------------------------------------
...
@@ -406,21 +406,26 @@ then
...
@@ -406,21 +406,26 @@ then
else
else
if
[
!
-d
"
$PGDATA
"
]
if
[
!
-d
"
$PGDATA
"
]
then
then
echo
"Creating d
atabase system d
irectory
$PGDATA
"
echo
"Creating directory
$PGDATA
"
mkdir
"
$PGDATA
"
||
exit_nicely
mkdir
"
$PGDATA
"
||
exit_nicely
else
else
echo
"Fixing permissions on
pre-existing data
directory
$PGDATA
"
echo
"Fixing permissions on
existing
directory
$PGDATA
"
chmod
go-rwx
"
$PGDATA
"
||
exit_nicely
chmod
go-rwx
"
$PGDATA
"
||
exit_nicely
fi
fi
if
[
!
-d
"
$PGDATA
"
/base
]
if
[
!
-d
"
$PGDATA
"
/base
]
then
then
echo
"Creating d
atabase system d
irectory
$PGDATA
/base"
echo
"Creating directory
$PGDATA
/base"
mkdir
"
$PGDATA
"
/base
||
exit_nicely
mkdir
"
$PGDATA
"
/base
||
exit_nicely
fi
fi
if
[
!
-d
"
$PGDATA
"
/global
]
then
echo
"Creating directory
$PGDATA
/global"
mkdir
"
$PGDATA
"
/global
||
exit_nicely
fi
if
[
!
-d
"
$PGDATA
"
/pg_xlog
]
if
[
!
-d
"
$PGDATA
"
/pg_xlog
]
then
then
echo
"Creating d
atabase XLOG d
irectory
$PGDATA
/pg_xlog"
echo
"Creating directory
$PGDATA
/pg_xlog"
mkdir
"
$PGDATA
"
/pg_xlog
||
exit_nicely
mkdir
"
$PGDATA
"
/pg_xlog
||
exit_nicely
fi
fi
fi
fi
...
@@ -458,7 +463,7 @@ echo $short_version > "$PGDATA"/base/template1/PG_VERSION || exit_nicely
...
@@ -458,7 +463,7 @@ echo $short_version > "$PGDATA"/base/template1/PG_VERSION || exit_nicely
if
[
"
$template_only
"
-eq
0
]
if
[
"
$template_only
"
-eq
0
]
then
then
echo
"Creating global relations in
$PGDATA
/
base
"
echo
"Creating global relations in
$PGDATA
/
global
"
[
"
$debug
"
-ne
0
]
&&
echo
"Running:
$PGPATH
/postgres
$BACKENDARGS
template1"
[
"
$debug
"
-ne
0
]
&&
echo
"Running:
$PGPATH
/postgres
$BACKENDARGS
template1"
cat
"
$GLOBAL
"
\
cat
"
$GLOBAL
"
\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录