Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
97dec77f
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,发现更多精彩内容 >>
提交
97dec77f
编写于
12月 10, 1999
作者:
B
Bruce Momjian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename several destroy* functions/tags to drop*.
上级
f6baabcd
变更
36
隐藏空白更改
内联
并排
Showing
36 changed file
with
133 addition
and
133 deletion
+133
-133
src/backend/access/gist/gist.c
src/backend/access/gist/gist.c
+2
-2
src/backend/access/hash/hash.c
src/backend/access/hash/hash.c
+2
-2
src/backend/access/nbtree/nbtree.c
src/backend/access/nbtree/nbtree.c
+2
-2
src/backend/access/rtree/rtree.c
src/backend/access/rtree/rtree.c
+2
-2
src/backend/access/transam/xact.c
src/backend/access/transam/xact.c
+3
-3
src/backend/catalog/heap.c
src/backend/catalog/heap.c
+11
-11
src/backend/catalog/index.c
src/backend/catalog/index.c
+6
-6
src/backend/commands/cluster.c
src/backend/commands/cluster.c
+2
-2
src/backend/commands/command.c
src/backend/commands/command.c
+2
-2
src/backend/commands/creatinh.c
src/backend/commands/creatinh.c
+2
-2
src/backend/commands/dbcommands.c
src/backend/commands/dbcommands.c
+8
-8
src/backend/commands/indexcmds.c
src/backend/commands/indexcmds.c
+2
-2
src/backend/commands/remove.c
src/backend/commands/remove.c
+2
-2
src/backend/commands/vacuum.c
src/backend/commands/vacuum.c
+4
-4
src/backend/commands/view.c
src/backend/commands/view.c
+2
-2
src/backend/executor/_deadcode/nodeTee.c
src/backend/executor/_deadcode/nodeTee.c
+2
-2
src/backend/executor/execMain.c
src/backend/executor/execMain.c
+2
-2
src/backend/executor/execTuples.c
src/backend/executor/execTuples.c
+5
-5
src/backend/executor/nodeHash.c
src/backend/executor/nodeHash.c
+2
-2
src/backend/executor/nodeMaterial.c
src/backend/executor/nodeMaterial.c
+2
-2
src/backend/executor/spi.c
src/backend/executor/spi.c
+2
-2
src/backend/libpq/be-fsstubs.c
src/backend/libpq/be-fsstubs.c
+3
-3
src/backend/parser/gram.y
src/backend/parser/gram.y
+12
-12
src/backend/storage/large_object/inv_api.c
src/backend/storage/large_object/inv_api.c
+3
-3
src/backend/tcop/utility.c
src/backend/tcop/utility.c
+8
-8
src/backend/utils/cache/temprel.c
src/backend/utils/cache/temprel.c
+3
-3
src/backend/utils/mmgr/portalmem.c
src/backend/utils/mmgr/portalmem.c
+6
-6
src/include/catalog/heap.h
src/include/catalog/heap.h
+4
-4
src/include/catalog/index.h
src/include/catalog/index.h
+2
-2
src/include/commands/dbcommands.h
src/include/commands/dbcommands.h
+2
-2
src/include/executor/executor.h
src/include/executor/executor.h
+2
-2
src/include/nodes/nodes.h
src/include/nodes/nodes.h
+3
-3
src/include/nodes/parsenodes.h
src/include/nodes/parsenodes.h
+6
-6
src/include/storage/large_object.h
src/include/storage/large_object.h
+2
-2
src/include/utils/portal.h
src/include/utils/portal.h
+2
-2
src/interfaces/ecpg/preproc/preproc.y
src/interfaces/ecpg/preproc/preproc.y
+8
-8
未找到文件。
src/backend/access/gist/gist.c
浏览文件 @
97dec77f
...
...
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.4
7 1999/11/07 23:07:48
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.4
8 1999/12/10 03:55:42
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -264,7 +264,7 @@ gistbuild(Relation heap,
if
(
pred
!=
NULL
||
oldPred
!=
NULL
)
{
#ifndef OMIT_PARTIAL_INDEX
ExecD
estroy
TupleTable
(
tupleTable
,
true
);
ExecD
rop
TupleTable
(
tupleTable
,
true
);
pfree
(
econtext
);
#endif
/* OMIT_PARTIAL_INDEX */
}
...
...
src/backend/access/hash/hash.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.3
2 1999/09/24 00:23:48 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.3
3 1999/12/10 03:55:43 momjian
Exp $
*
* NOTES
* This file contains only the public interface routines.
...
...
@@ -221,7 +221,7 @@ hashbuild(Relation heap,
if
(
pred
!=
NULL
||
oldPred
!=
NULL
)
{
#ifndef OMIT_PARTIAL_INDEX
ExecD
estroy
TupleTable
(
tupleTable
,
true
);
ExecD
rop
TupleTable
(
tupleTable
,
true
);
pfree
(
econtext
);
#endif
/* OMIT_PARTIAL_INDEX */
}
...
...
src/backend/access/nbtree/nbtree.c
浏览文件 @
97dec77f
...
...
@@ -11,7 +11,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.
49 1999/12/01 00:29:53
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.
50 1999/12/10 03:55:44
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -269,7 +269,7 @@ btbuild(Relation heap,
if
(
pred
!=
NULL
||
oldPred
!=
NULL
)
{
#ifndef OMIT_PARTIAL_INDEX
ExecD
estroy
TupleTable
(
tupleTable
,
true
);
ExecD
rop
TupleTable
(
tupleTable
,
true
);
pfree
(
econtext
);
#endif
/* OMIT_PARTIAL_INDEX */
}
...
...
src/backend/access/rtree/rtree.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.4
0 1999/11/15 09:59:00 ishii
Exp $
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.4
1 1999/12/10 03:55:45 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -240,7 +240,7 @@ rtbuild(Relation heap,
if
(
pred
!=
NULL
||
oldPred
!=
NULL
)
{
#ifndef OMIT_PARTIAL_INDEX
ExecD
estroy
TupleTable
(
tupleTable
,
true
);
ExecD
rop
TupleTable
(
tupleTable
,
true
);
pfree
(
econtext
);
#endif
/* OMIT_PARTIAL_INDEX */
}
...
...
src/backend/access/transam/xact.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.5
5 1999/09/29 16:05:55 wieck
Exp $
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.5
6 1999/12/10 03:55:46 momjian
Exp $
*
* NOTES
* Transaction aborts can now occur two ways:
...
...
@@ -938,7 +938,7 @@ CommitTransaction()
AtCommit_Notify
();
CloseSequences
();
D
estroy
NoNameRels
();
D
rop
NoNameRels
();
AtEOXact_portals
();
RecordTransactionCommit
();
...
...
@@ -1034,7 +1034,7 @@ AbortTransaction()
vc_abort
();
RecordTransactionAbort
();
RelationPurgeLocalRelation
(
false
);
D
estroy
NoNameRels
();
D
rop
NoNameRels
();
invalidate_temp_relations
();
AtEOXact_nbtree
();
AtAbort_Cache
();
...
...
src/backend/catalog/heap.c
浏览文件 @
97dec77f
...
...
@@ -7,13 +7,13 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.11
1 1999/11/28 02:03:04 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.11
2 1999/12/10 03:55:47 momjian
Exp $
*
*
* INTERFACE ROUTINES
* heap_create() - Create an uncataloged heap relation
* heap_create_with_catalog() - Create a cataloged relation
* heap_d
estroy
_with_catalog() - Removes named relation from catalogs
* heap_d
rop
_with_catalog() - Removes named relation from catalogs
*
* NOTES
* this code taken from access/heap/create.c, which contains
...
...
@@ -889,7 +889,7 @@ heap_create_with_catalog(char *relname,
/* ----------------------------------------------------------------
* heap_d
estroy
_with_catalog - removes all record of named relation from catalogs
* heap_d
rop
_with_catalog - removes all record of named relation from catalogs
*
* 1) open relation, check for existence, etc.
* 2) remove inheritance information
...
...
@@ -1046,7 +1046,7 @@ RelationRemoveIndexes(Relation relation)
&
entry
);
while
(
HeapTupleIsValid
(
tuple
=
heap_getnext
(
scan
,
0
)))
index_d
estroy
(((
Form_pg_index
)
GETSTRUCT
(
tuple
))
->
indexrelid
);
index_d
rop
(((
Form_pg_index
)
GETSTRUCT
(
tuple
))
->
indexrelid
);
heap_endscan
(
scan
);
heap_close
(
indexRelation
,
RowExclusiveLock
);
...
...
@@ -1441,12 +1441,12 @@ DeleteTypeTuple(Relation rel)
}
/* --------------------------------
* heap_d
estroy
_with_catalog
* heap_d
rop
_with_catalog
*
* --------------------------------
*/
void
heap_d
estroy
_with_catalog
(
char
*
relname
)
heap_d
rop
_with_catalog
(
char
*
relname
)
{
Relation
rel
;
Oid
rid
;
...
...
@@ -1575,13 +1575,13 @@ heap_destroy_with_catalog(char *relname)
}
/*
* heap_d
estroy
* heap_d
rop
* destroy and close temporary relations
*
*/
void
heap_d
estroy
(
Relation
rel
)
heap_d
rop
(
Relation
rel
)
{
ReleaseRelationBuffers
(
rel
);
if
(
!
(
rel
->
rd_isnoname
)
||
!
(
rel
->
rd_unlinked
))
...
...
@@ -1634,7 +1634,7 @@ InitNoNameRelList(void)
MODIFIES the global variable tempRels
we don't really remove it, just mark it as NULL
and D
estroy
NoNameRels will look for NULLs
and D
rop
NoNameRels will look for NULLs
*/
static
void
RemoveFromNoNameRelList
(
Relation
r
)
...
...
@@ -1679,7 +1679,7 @@ AddToNoNameRelList(Relation r)
go through the tempRels list and destroy each of the relations
*/
void
D
estroy
NoNameRels
(
void
)
D
rop
NoNameRels
(
void
)
{
int
i
;
Relation
rel
;
...
...
@@ -1692,7 +1692,7 @@ DestroyNoNameRels(void)
rel
=
tempRels
->
rels
[
i
];
/* rel may be NULL if it has been removed from the list already */
if
(
rel
)
heap_d
estroy
(
rel
);
heap_d
rop
(
rel
);
}
free
(
tempRels
->
rels
);
free
(
tempRels
);
...
...
src/backend/catalog/index.c
浏览文件 @
97dec77f
...
...
@@ -7,12 +7,12 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.9
8 1999/11/24 00:44:29
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.9
9 1999/12/10 03:55:48
momjian Exp $
*
*
* INTERFACE ROUTINES
* index_create() - Create a cataloged index relation
* index_d
estroy
() - Removes index relation from catalogs
* index_d
rop
() - Removes index relation from catalogs
*
*
*-------------------------------------------------------------------------
...
...
@@ -1103,12 +1103,12 @@ index_create(char *heapRelationName,
/* ----------------------------------------------------------------
*
* index_d
estroy
* index_d
rop
*
* ----------------------------------------------------------------
*/
void
index_d
estroy
(
Oid
indexId
)
index_d
rop
(
Oid
indexId
)
{
Relation
userHeapRelation
;
Relation
userIndexRelation
;
...
...
@@ -1213,7 +1213,7 @@ index_destroy(Oid indexId)
ReleaseRelationBuffers
(
userIndexRelation
);
if
(
smgrunlink
(
DEFAULT_SMGR
,
userIndexRelation
)
!=
SM_SUCCESS
)
elog
(
ERROR
,
"index_d
estroy
: unlink: %m"
);
elog
(
ERROR
,
"index_d
rop
: unlink: %m"
);
/*
* Close rels, but keep locks
...
...
@@ -1646,7 +1646,7 @@ DefaultBuild(Relation heapRelation,
if
(
predicate
!=
NULL
||
oldPred
!=
NULL
)
{
/* parameter was 'false', almost certainly wrong --- tgl 9/21/99 */
ExecD
estroy
TupleTable
(
tupleTable
,
true
);
ExecD
rop
TupleTable
(
tupleTable
,
true
);
}
#endif
/* OMIT_PARTIAL_INDEX */
...
...
src/backend/commands/cluster.c
浏览文件 @
97dec77f
...
...
@@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.4
7 1999/11/22 17:56:00
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.4
8 1999/12/10 03:55:49
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -151,7 +151,7 @@ cluster(char *oldrelname, char *oldindexname)
/* Destroy old heap (along with its index) and rename new. */
heap_d
estroy
_with_catalog
(
oldrelname
);
heap_d
rop
_with_catalog
(
oldrelname
);
CommitTransactionCommand
();
StartTransactionCommand
();
...
...
src/backend/commands/command.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.5
8 1999/11/24 00:44:30
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.5
9 1999/12/10 03:55:49
momjian Exp $
*
* NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated
...
...
@@ -242,7 +242,7 @@ PerformPortalClose(char *name, CommandDest dest)
* Note: PortalCleanup is called as a side-effect
* ----------------
*/
PortalD
estroy
(
&
portal
);
PortalD
rop
(
&
portal
);
}
/* ----------------
...
...
src/backend/commands/creatinh.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.5
2 1999/11/22 17:56:01
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.5
3 1999/12/10 03:55:49
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -214,7 +214,7 @@ void
RemoveRelation
(
char
*
name
)
{
AssertArg
(
name
);
heap_d
estroy
_with_catalog
(
name
);
heap_d
rop
_with_catalog
(
name
);
}
/*
...
...
src/backend/commands/dbcommands.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.4
5 1999/11/24 16:52:32
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.4
6 1999/12/10 03:55:49
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -85,7 +85,7 @@ createdb(char *dbname, char *dbpath, int encoding, CommandDest dest)
}
void
d
estroy
db
(
char
*
dbname
,
CommandDest
dest
)
d
rop
db
(
char
*
dbname
,
CommandDest
dest
)
{
int4
user_id
;
Oid
db_id
;
...
...
@@ -101,7 +101,7 @@ destroydb(char *dbname, CommandDest dest)
* If this call returns, the database exists and we're allowed to
* remove it.
*/
check_permissions
(
"d
estroy
db"
,
dbpath
,
dbname
,
&
db_id
,
&
user_id
);
check_permissions
(
"d
rop
db"
,
dbpath
,
dbname
,
&
db_id
,
&
user_id
);
/* do as much checking as we can... */
if
(
!
OidIsValid
(
db_id
))
...
...
@@ -308,13 +308,13 @@ check_permissions(char *command,
elog
(
ERROR
,
"createdb: database '%s' already exists"
,
dbname
);
}
else
if
(
!
dbfound
&&
!
strcmp
(
command
,
"d
estroy
db"
))
else
if
(
!
dbfound
&&
!
strcmp
(
command
,
"d
rop
db"
))
{
elog
(
ERROR
,
"d
estroy
db: database '%s' does not exist"
,
dbname
);
elog
(
ERROR
,
"d
rop
db: database '%s' does not exist"
,
dbname
);
}
else
if
(
dbfound
&&
!
strcmp
(
command
,
"d
estroy
db"
)
else
if
(
dbfound
&&
!
strcmp
(
command
,
"d
rop
db"
)
&&
dbowner
!=
*
userIdP
&&
use_super
==
false
)
{
...
...
@@ -322,7 +322,7 @@ check_permissions(char *command,
}
if
(
dbfound
&&
!
strcmp
(
command
,
"d
estroy
db"
))
if
(
dbfound
&&
!
strcmp
(
command
,
"d
rop
db"
))
strcpy
(
dbpath
,
path
);
}
/* check_permissions() */
...
...
@@ -331,7 +331,7 @@ check_permissions(char *command,
*
* This is currently dead code, since we don't *have* vacuum daemons.
* If you want to re-enable it, think about the interlock against deleting
* a database out from under running backends, in d
estroy
db() above.
* a database out from under running backends, in d
rop
db() above.
*/
static
void
stop_vacuum
(
char
*
dbpath
,
char
*
dbname
)
...
...
src/backend/commands/indexcmds.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.1
4 1999/11/22 17:56:01
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.1
5 1999/12/10 03:55:49
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -564,5 +564,5 @@ RemoveIndex(char *name)
((
Form_pg_class
)
GETSTRUCT
(
tuple
))
->
relkind
);
}
index_d
estroy
(
tuple
->
t_data
->
t_oid
);
index_d
rop
(
tuple
->
t_data
->
t_oid
);
}
src/backend/commands/remove.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.4
0 1999/11/22 17:56:02
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.4
1 1999/12/10 03:55:49
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -234,7 +234,7 @@ AttributeAndRelationRemove(Oid typeOid)
char
*
name
;
name
=
NameStr
(((
Form_pg_class
)
GETSTRUCT
(
tup
))
->
relname
);
heap_d
estroy
_with_catalog
(
name
);
heap_d
rop
_with_catalog
(
name
);
}
heap_endscan
(
scan
);
}
...
...
src/backend/commands/vacuum.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.1
29 1999/12/01 00:29:54
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.1
30 1999/12/10 03:55:49
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -218,7 +218,7 @@ vc_shutdown()
/*
* Release our portal for cross-transaction memory.
*/
PortalD
estroy
(
&
vc_portal
);
PortalD
rop
(
&
vc_portal
);
/* okay, we're done */
VacuumRunning
=
false
;
...
...
@@ -230,13 +230,13 @@ vc_shutdown()
void
vc_abort
()
{
/* Clear flag first, to avoid recursion if PortalD
estroy
elog's */
/* Clear flag first, to avoid recursion if PortalD
rop
elog's */
VacuumRunning
=
false
;
/*
* Release our portal for cross-transaction memory.
*/
PortalD
estroy
(
&
vc_portal
);
PortalD
rop
(
&
vc_portal
);
}
/*
...
...
src/backend/commands/view.c
浏览文件 @
97dec77f
...
...
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: view.c,v 1.
39 1999/10/07 04:23:00 tgl
Exp $
* $Id: view.c,v 1.
40 1999/12/10 03:55:50 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -305,6 +305,6 @@ RemoveView(char *viewName)
/*
* now remove the relation.
*/
heap_d
estroy
_with_catalog
(
viewName
);
heap_d
rop
_with_catalog
(
viewName
);
pfree
(
rname
);
}
src/backend/executor/_deadcode/nodeTee.c
浏览文件 @
97dec77f
...
...
@@ -14,7 +14,7 @@
* ExecInitTee
* ExecEndTee
*
* $Id: nodeTee.c,v 1.
5 1999/07/16 04:58:54
momjian Exp $
* $Id: nodeTee.c,v 1.
6 1999/12/10 03:55:52
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -470,7 +470,7 @@ ExecEndTee(Tee * node, Plan *parent)
bufferRel
=
teeState
->
tee_bufferRel
;
if
(
bufferRel
)
{
heap_d
estroy
(
bufferRel
);
heap_d
rop
(
bufferRel
);
teeState
->
tee_bufferRel
=
NULL
;
if
(
teeState
->
tee_mcxt
)
{
...
...
src/backend/executor/execMain.c
浏览文件 @
97dec77f
...
...
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.10
1 1999/11/24 00:44:3
1 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.10
2 1999/12/10 03:55:5
1 momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -778,7 +778,7 @@ EndPlan(Plan *plan, EState *estate)
{
TupleTable
tupleTable
=
(
TupleTable
)
estate
->
es_tupleTable
;
ExecD
estroy
TupleTable
(
tupleTable
,
true
);
ExecD
rop
TupleTable
(
tupleTable
,
true
);
estate
->
es_tupleTable
=
NULL
;
}
...
...
src/backend/executor/execTuples.c
浏览文件 @
97dec77f
...
...
@@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.3
2 1999/11/23 20:06
:51 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.3
3 1999/12/10 03:55
:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -23,7 +23,7 @@
*
* TABLE CREATE/DELETE
* ExecCreateTupleTable - create a new tuple table
* ExecD
estroy
TupleTable - destroy a table
* ExecD
rop
TupleTable - destroy a table
*
* SLOT RESERVERATION
* ExecAllocTableSlot - find an available slot in the table
...
...
@@ -84,7 +84,7 @@
*
* At ExecEnd()
* ----------------
* - EndPlan() calls ExecD
estroy
TupleTable() to clean up any remaining
* - EndPlan() calls ExecD
rop
TupleTable() to clean up any remaining
* tuples left over from executing the query.
*
* The important thing to watch in the executor code is how pointers
...
...
@@ -178,7 +178,7 @@ ExecCreateTupleTable(int initialSize) /* initial number of slots in
}
/* --------------------------------
* ExecD
estroy
TupleTable
* ExecD
rop
TupleTable
*
* This pfrees the storage assigned to the tuple table and
* optionally pfrees the contents of the table also.
...
...
@@ -186,7 +186,7 @@ ExecCreateTupleTable(int initialSize) /* initial number of slots in
* --------------------------------
*/
void
ExecD
estroy
TupleTable
(
TupleTable
table
,
/* tuple table */
ExecD
rop
TupleTable
(
TupleTable
table
,
/* tuple table */
bool
shouldFree
)
/* true if we should free slot
* contents */
{
...
...
src/backend/executor/nodeHash.c
浏览文件 @
97dec77f
...
...
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
*
* $Id: nodeHash.c,v 1.
39 1999/10/13 15:02:25 tgl
Exp $
* $Id: nodeHash.c,v 1.
40 1999/12/10 03:55:51 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -439,7 +439,7 @@ ExecHashTableDestroy(HashJoinTable hashtable)
/* Destroy the portal to release all working memory */
/* cast here is a kluge for circular includes... */
PortalD
estroy
((
Portal
*
)
&
hashtable
->
myPortal
);
PortalD
rop
((
Portal
*
)
&
hashtable
->
myPortal
);
/* And drop the control block */
pfree
(
hashtable
);
...
...
src/backend/executor/nodeMaterial.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.2
6 1999/09/24 00:24:23 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.2
7 1999/12/10 03:55:51 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -311,7 +311,7 @@ ExecEndMaterial(Material *node)
matstate
=
node
->
matstate
;
tempRelation
=
matstate
->
mat_TempRelation
;
heap_d
estroy
(
tempRelation
);
heap_d
rop
(
tempRelation
);
/* ----------------
* close the temp relation and shut down the scan.
...
...
src/backend/executor/spi.c
浏览文件 @
97dec77f
...
...
@@ -3,7 +3,7 @@
* spi.c
* Server Programming Interface
*
* $Id: spi.c,v 1.4
2 1999/11/22 17:56:05
momjian Exp $
* $Id: spi.c,v 1.4
3 1999/12/10 03:55:51
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -127,7 +127,7 @@ SPI_finish()
/* Restore memory context as it was before procedure call */
MemoryContextSwitchTo
(
_SPI_current
->
savedcxt
);
PortalD
estroy
(
&
(
_SPI_current
->
portal
));
PortalD
rop
(
&
(
_SPI_current
->
portal
));
SetScanCommandId
(
_SPI_current
->
savedId
);
...
...
src/backend/libpq/be-fsstubs.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.4
1 1999/07/17 20:17:01
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.4
2 1999/12/10 03:55:53
momjian Exp $
*
* NOTES
* This should be moved to a more appropriate place. It is here
...
...
@@ -269,14 +269,14 @@ int
lo_unlink
(
Oid
lobjId
)
{
/*
* inv_d
estroy
does not need a context switch, indeed it doesn't
* inv_d
rop
does not need a context switch, indeed it doesn't
* touch any LO-specific data structures at all. (Again, that's
* probably more than this module ought to be assuming.)
*
* XXX there ought to be some code to clean up any open LOs that
* reference the specified relation... as is, they remain "open".
*/
return
inv_d
estroy
(
lobjId
);
return
inv_d
rop
(
lobjId
);
}
/*****************************************************************************
...
...
src/backend/parser/gram.y
浏览文件 @
97dec77f
...
...
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.11
8 1999/12/10 03:01:05 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.11
9 1999/12/10 03:55:54 momjian
Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
...
...
@@ -116,7 +116,7 @@ static Node *doNegate(Node *n);
%type <node> stmt,
AddAttrStmt, ClosePortalStmt,
CopyStmt, CreateStmt, CreateAsStmt, CreateSeqStmt, DefineStmt, D
estroy
Stmt,
CopyStmt, CreateStmt, CreateAsStmt, CreateSeqStmt, DefineStmt, D
rop
Stmt,
TruncateStmt, CommentStmt,
ExtendStmt, FetchStmt, GrantStmt, CreateTrigStmt, DropTrigStmt,
CreatePLangStmt, DropPLangStmt,
...
...
@@ -124,7 +124,7 @@ static Node *doNegate(Node *n);
ProcedureStmt, RemoveAggrStmt, RemoveOperStmt,
RemoveFuncStmt, RemoveStmt,
RenameStmt, RevokeStmt, RuleStmt, TransactionStmt, ViewStmt, LoadStmt,
CreatedbStmt, D
estroy
dbStmt, VacuumStmt, CursorStmt, SubSelect,
CreatedbStmt, D
rop
dbStmt, VacuumStmt, CursorStmt, SubSelect,
UpdateStmt, InsertStmt, select_clause, SelectStmt, NotifyStmt, DeleteStmt,
ClusterStmt, ExplainStmt, VariableSetStmt, VariableShowStmt, VariableResetStmt,
CreateUserStmt, AlterUserStmt, DropUserStmt, RuleActionStmt,
...
...
@@ -402,7 +402,7 @@ stmt : AddAttrStmt
| CreateUserStmt
| ClusterStmt
| DefineStmt
| D
estroy
Stmt
| D
rop
Stmt
| TruncateStmt
| CommentStmt
| DropPLangStmt
...
...
@@ -429,7 +429,7 @@ stmt : AddAttrStmt
| ViewStmt
| LoadStmt
| CreatedbStmt
| D
estroy
dbStmt
| D
rop
dbStmt
| VacuumStmt
| VariableSetStmt
| VariableShowStmt
...
...
@@ -1621,20 +1621,20 @@ def_arg: ColId { $$ = (Node *)makeString($1); }
/*****************************************************************************
*
* QUERY:
* d
estroy
<relname1> [, <relname2> .. <relnameN> ]
* d
rop
<relname1> [, <relname2> .. <relnameN> ]
*
*****************************************************************************/
D
estroy
Stmt: DROP TABLE relation_name_list
D
rop
Stmt: DROP TABLE relation_name_list
{
D
estroyStmt *n = makeNode(Destroy
Stmt);
D
ropStmt *n = makeNode(Drop
Stmt);
n->relNames = $3;
n->sequence = FALSE;
$$ = (Node *)n;
}
| DROP SEQUENCE relation_name_list
{
D
estroyStmt *n = makeNode(Destroy
Stmt);
D
ropStmt *n = makeNode(Drop
Stmt);
n->relNames = $3;
n->sequence = TRUE;
$$ = (Node *)n;
...
...
@@ -2495,13 +2495,13 @@ encoding: Sconst { $$ = $1; }
/*****************************************************************************
*
* QUERY:
* d
estroy
db dbname
* d
rop
db dbname
*
*****************************************************************************/
D
estroy
dbStmt: DROP DATABASE database_name
D
rop
dbStmt: DROP DATABASE database_name
{
D
estroydbStmt *n = makeNode(Destroy
dbStmt);
D
ropdbStmt *n = makeNode(Drop
dbStmt);
n->dbname = $3;
$$ = (Node *)n;
}
...
...
src/backend/storage/large_object/inv_api.c
浏览文件 @
97dec77f
...
...
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.6
1 1999/11/07 23:08:16
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.6
2 1999/12/10 03:55:57
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -274,7 +274,7 @@ inv_close(LargeObjectDesc *obj_desc)
* returns -1 if failed
*/
int
inv_d
estroy
(
Oid
lobjId
)
inv_d
rop
(
Oid
lobjId
)
{
Relation
r
;
...
...
@@ -282,7 +282,7 @@ inv_destroy(Oid lobjId)
if
(
!
RelationIsValid
(
r
)
||
r
->
rd_rel
->
relkind
!=
RELKIND_LOBJECT
)
return
-
1
;
heap_d
estroy
_with_catalog
(
RelationGetRelationName
(
r
));
heap_d
rop
_with_catalog
(
RelationGetRelationName
(
r
));
return
1
;
}
...
...
src/backend/tcop/utility.c
浏览文件 @
97dec77f
...
...
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.7
2 1999/11/21 04:16:16 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.7
3 1999/12/10 03:55:59 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -162,9 +162,9 @@ ProcessUtility(Node *parsetree,
DefineRelation
((
CreateStmt
*
)
parsetree
,
RELKIND_RELATION
);
break
;
case
T_D
estroy
Stmt
:
case
T_D
rop
Stmt
:
{
D
estroyStmt
*
stmt
=
(
Destroy
Stmt
*
)
parsetree
;
D
ropStmt
*
stmt
=
(
Drop
Stmt
*
)
parsetree
;
List
*
args
=
stmt
->
relNames
;
List
*
arg
;
...
...
@@ -592,19 +592,19 @@ ProcessUtility(Node *parsetree,
{
CreatedbStmt
*
stmt
=
(
CreatedbStmt
*
)
parsetree
;
PS_SET_STATUS
(
commandTag
=
"CREATE
DB
"
);
PS_SET_STATUS
(
commandTag
=
"CREATE
DATABASE
"
);
CHECK_IF_ABORTED
();
createdb
(
stmt
->
dbname
,
stmt
->
dbpath
,
stmt
->
encoding
,
dest
);
}
break
;
case
T_D
estroy
dbStmt
:
case
T_D
rop
dbStmt
:
{
D
estroydbStmt
*
stmt
=
(
Destroy
dbStmt
*
)
parsetree
;
D
ropdbStmt
*
stmt
=
(
Drop
dbStmt
*
)
parsetree
;
PS_SET_STATUS
(
commandTag
=
"D
ESTROYDB
"
);
PS_SET_STATUS
(
commandTag
=
"D
ROP DATABASE
"
);
CHECK_IF_ABORTED
();
d
estroy
db
(
stmt
->
dbname
,
dest
);
d
rop
db
(
stmt
->
dbname
,
dest
);
}
break
;
...
...
src/backend/utils/cache/temprel.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.1
7 1999/11/16 16:55:28
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.1
8 1999/12/10 03:56:00
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -98,10 +98,10 @@ remove_all_temp_relations(void)
/* safe from deallocation */
strcpy
(
relname
,
temp_rel
->
user_relname
);
heap_d
estroy
_with_catalog
(
relname
);
heap_d
rop
_with_catalog
(
relname
);
}
else
index_d
estroy
(
temp_rel
->
relid
);
index_d
rop
(
temp_rel
->
relid
);
l
=
next
;
}
...
...
src/backend/utils/mmgr/portalmem.c
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.3
0 1999/09/23 17:02:58
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.3
1 1999/12/10 03:56:03
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -438,7 +438,7 @@ CollectNamedPortals(Portal *portalP, int destroy)
int
i
;
for
(
i
=
0
;
i
<
listIndex
;
i
++
)
PortalD
estroy
(
&
portalList
[
i
]);
PortalD
rop
(
&
portalList
[
i
]);
listIndex
=
0
;
}
else
...
...
@@ -546,7 +546,7 @@ EnablePortalManager(bool on)
{
/* cleanup */
if
(
PortalIsValid
(
BlankPortal
))
{
PortalD
estroy
(
&
BlankPortal
);
PortalD
rop
(
&
BlankPortal
);
MemoryContextFree
((
MemoryContext
)
PortalMemory
,
(
Pointer
)
BlankPortal
);
BlankPortal
=
NULL
;
...
...
@@ -555,7 +555,7 @@ EnablePortalManager(bool on)
/*
* Each portal must free its non-memory resources specially.
*/
HashTableWalk
(
PortalHashTable
,
PortalD
estroy
,
0
);
HashTableWalk
(
PortalHashTable
,
PortalD
rop
,
0
);
hash_destroy
(
PortalHashTable
);
PortalHashTable
=
NULL
;
...
...
@@ -774,7 +774,7 @@ CreatePortal(char *name) /* XXX PortalName */
}
/*
* PortalD
estroy
* PortalD
rop
* Destroys portal.
*
* Exceptions:
...
...
@@ -782,7 +782,7 @@ CreatePortal(char *name) /* XXX PortalName */
* BadArg if portal is invalid.
*/
void
PortalD
estroy
(
Portal
*
portalP
)
PortalD
rop
(
Portal
*
portalP
)
{
Portal
portal
=
*
portalP
;
...
...
src/include/catalog/heap.h
浏览文件 @
97dec77f
...
...
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: heap.h,v 1.2
5 1999/11/04 08:01:04 inoue
Exp $
* $Id: heap.h,v 1.2
6 1999/12/10 03:56:05 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -29,15 +29,15 @@ extern bool heap_storage_create(Relation rel);
extern
Oid
heap_create_with_catalog
(
char
*
relname
,
TupleDesc
tupdesc
,
char
relkind
,
bool
istemp
);
extern
void
heap_d
estroy
_with_catalog
(
char
*
relname
);
extern
void
heap_d
rop
_with_catalog
(
char
*
relname
);
extern
void
heap_truncate
(
char
*
relname
);
extern
void
heap_d
estroy
(
Relation
rel
);
extern
void
heap_d
rop
(
Relation
rel
);
extern
void
AddRelationRawConstraints
(
Relation
rel
,
List
*
rawColDefaults
,
List
*
rawConstraints
);
extern
void
InitNoNameRelList
(
void
);
extern
void
D
estroy
NoNameRels
(
void
);
extern
void
D
rop
NoNameRels
(
void
);
#endif
/* HEAP_H */
src/include/catalog/index.h
浏览文件 @
97dec77f
...
...
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: index.h,v 1.
19 1999/07/16 17:07:29
momjian Exp $
* $Id: index.h,v 1.
20 1999/12/10 03:56:05
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -39,7 +39,7 @@ extern void index_create(char *heapRelationName,
bool
unique
,
bool
primary
);
extern
void
index_d
estroy
(
Oid
indexId
);
extern
void
index_d
rop
(
Oid
indexId
);
extern
void
FormIndexDatum
(
int
numberOfAttributes
,
AttrNumber
*
attributeNumber
,
HeapTuple
heapTuple
,
...
...
src/include/commands/dbcommands.h
浏览文件 @
97dec77f
...
...
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: dbcommands.h,v 1.1
0 1999/07/15 15:21:01
momjian Exp $
* $Id: dbcommands.h,v 1.1
1 1999/12/10 03:56:06
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -23,6 +23,6 @@
#define SIGKILLDAEMON1 SIGTERM
extern
void
createdb
(
char
*
dbname
,
char
*
dbpath
,
int
encoding
,
CommandDest
);
extern
void
d
estroy
db
(
char
*
dbname
,
CommandDest
);
extern
void
d
rop
db
(
char
*
dbname
,
CommandDest
);
#endif
/* DBCOMMANDS_H */
src/include/executor/executor.h
浏览文件 @
97dec77f
...
...
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: executor.h,v 1.
39 1999/10/30 23:13:30 tgl
Exp $
* $Id: executor.h,v 1.
40 1999/12/10 03:56:08 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -107,7 +107,7 @@ extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ());
* prototypes from functions in execTuples.c
*/
extern
TupleTable
ExecCreateTupleTable
(
int
initialSize
);
extern
void
ExecD
estroy
TupleTable
(
TupleTable
table
,
bool
shouldFree
);
extern
void
ExecD
rop
TupleTable
(
TupleTable
table
,
bool
shouldFree
);
extern
TupleTableSlot
*
ExecAllocTableSlot
(
TupleTable
table
);
extern
TupleTableSlot
*
ExecStoreTuple
(
HeapTuple
tuple
,
TupleTableSlot
*
slot
,
...
...
src/include/nodes/nodes.h
浏览文件 @
97dec77f
...
...
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: nodes.h,v 1.5
7 1999/12/06 18:02:46 wieck
Exp $
* $Id: nodes.h,v 1.5
8 1999/12/10 03:56:09 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -153,7 +153,7 @@ typedef enum NodeTag
T_CreateStmt
,
T_VersionStmt
,
T_DefineStmt
,
T_D
estroy
Stmt
,
T_D
rop
Stmt
,
T_TruncateStmt
,
T_CommentStmt
,
T_ExtendStmt
,
...
...
@@ -173,7 +173,7 @@ typedef enum NodeTag
T_ViewStmt
,
T_LoadStmt
,
T_CreatedbStmt
,
T_D
estroy
dbStmt
,
T_D
rop
dbStmt
,
T_VacuumStmt
,
T_ExplainStmt
,
T_CreateSeqStmt
,
...
...
src/include/nodes/parsenodes.h
浏览文件 @
97dec77f
...
...
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: parsenodes.h,v 1.8
8 1999/12/06 18:02:47 wieck
Exp $
* $Id: parsenodes.h,v 1.8
9 1999/12/10 03:56:09 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -325,12 +325,12 @@ typedef struct DefineStmt
* Drop Table Statement
* ----------------------
*/
typedef
struct
D
estroy
Stmt
typedef
struct
D
rop
Stmt
{
NodeTag
type
;
List
*
relNames
;
/* relations to be dropped */
bool
sequence
;
}
D
estroy
Stmt
;
}
D
rop
Stmt
;
/* ----------------------
* Truncate Table Statement
...
...
@@ -577,14 +577,14 @@ typedef struct CreatedbStmt
}
CreatedbStmt
;
/* ----------------------
* D
estroy
db Statement
* D
rop
db Statement
* ----------------------
*/
typedef
struct
D
estroy
dbStmt
typedef
struct
D
rop
dbStmt
{
NodeTag
type
;
char
*
dbname
;
/* database to drop */
}
D
estroy
dbStmt
;
}
D
rop
dbStmt
;
/* ----------------------
* Cluster Statement (support pbrown's cluster index implementation)
...
...
src/include/storage/large_object.h
浏览文件 @
97dec77f
...
...
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: large_object.h,v 1.1
1 1999/07/15 23:04:11
momjian Exp $
* $Id: large_object.h,v 1.1
2 1999/12/10 03:56:10
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -48,7 +48,7 @@ typedef struct LargeObjectDesc
extern
LargeObjectDesc
*
inv_create
(
int
flags
);
extern
LargeObjectDesc
*
inv_open
(
Oid
lobjId
,
int
flags
);
extern
void
inv_close
(
LargeObjectDesc
*
obj_desc
);
extern
int
inv_d
estroy
(
Oid
lobjId
);
extern
int
inv_d
rop
(
Oid
lobjId
);
extern
int
inv_seek
(
LargeObjectDesc
*
obj_desc
,
int
offset
,
int
whence
);
extern
int
inv_tell
(
LargeObjectDesc
*
obj_desc
);
extern
int
inv_read
(
LargeObjectDesc
*
obj_desc
,
char
*
buf
,
int
nbytes
);
...
...
src/include/utils/portal.h
浏览文件 @
97dec77f
...
...
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: portal.h,v 1.
19 1999/09/23 17:03:33
momjian Exp $
* $Id: portal.h,v 1.
20 1999/12/10 03:56:12
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -73,7 +73,7 @@ extern void PortalSetQuery(Portal portal, QueryDesc *queryDesc,
extern
QueryDesc
*
PortalGetQueryDesc
(
Portal
portal
);
extern
EState
*
PortalGetState
(
Portal
portal
);
extern
Portal
CreatePortal
(
char
*
name
);
extern
void
PortalD
estroy
(
Portal
*
portalP
);
extern
void
PortalD
rop
(
Portal
*
portalP
);
extern
void
StartPortalAllocMode
(
AllocMode
mode
,
Size
limit
);
extern
void
EndPortalAllocMode
(
void
);
extern
void
PortalResetHeapMemory
(
Portal
portal
);
...
...
src/interfaces/ecpg/preproc/preproc.y
浏览文件 @
97dec77f
...
...
@@ -828,7 +828,7 @@ adjust_array(enum ECPGttype type_enum, int *dimension, int *length, int type_dim
%type <str> NotifyStmt columnElem copy_dirn UnlistenStmt
%type <str> copy_delimiter ListenStmt CopyStmt copy_file_name opt_binary
%type <str> opt_with_copy FetchStmt opt_direction fetch_how_many opt_portal_name
%type <str> ClosePortalStmt D
estroy
Stmt VacuumStmt opt_verbose
%type <str> ClosePortalStmt D
rop
Stmt VacuumStmt opt_verbose
%type <str> opt_analyze opt_va_list va_list ExplainStmt index_params
%type <str> index_list func_index index_elem opt_type opt_class access_method_clause
%type <str> index_opt_unique IndexStmt set_opt func_return def_rest
...
...
@@ -850,7 +850,7 @@ adjust_array(enum ECPGttype type_enum, int *dimension, int *length, int type_dim
%type <str> TriggerActionTime CreateTrigStmt DropPLangStmt PLangTrusted
%type <str> CreatePLangStmt IntegerOnly TriggerFuncArgs TriggerFuncArg
%type <str> ViewStmt LoadStmt CreatedbStmt opt_database1 opt_database2 location
%type <str> D
estroy
dbStmt ClusterStmt grantee RevokeStmt encoding
%type <str> D
rop
dbStmt ClusterStmt grantee RevokeStmt encoding
%type <str> GrantStmt privileges operation_commalist operation
%type <str> opt_cursor opt_lmode ConstraintsSetStmt comment_tg
%type <str> case_expr when_clause_list case_default case_arg when_clause
...
...
@@ -918,7 +918,7 @@ stmt: AddAttrStmt { output_statement($1, 0); }
| CreateUserStmt { output_statement($1, 0); }
| ClusterStmt { output_statement($1, 0); }
| DefineStmt { output_statement($1, 0); }
| D
estroy
Stmt { output_statement($1, 0); }
| D
rop
Stmt { output_statement($1, 0); }
| TruncateStmt { output_statement($1, 0); }
| DropPLangStmt { output_statement($1, 0); }
| DropTrigStmt { output_statement($1, 0); }
...
...
@@ -953,7 +953,7 @@ stmt: AddAttrStmt { output_statement($1, 0); }
| ViewStmt { output_statement($1, 0); }
| LoadStmt { output_statement($1, 0); }
| CreatedbStmt { output_statement($1, 0); }
| D
estroy
dbStmt { output_statement($1, 0); }
| D
rop
dbStmt { output_statement($1, 0); }
| VacuumStmt { output_statement($1, 0); }
| VariableSetStmt { output_statement($1, 0); }
| VariableShowStmt { output_statement($1, 0); }
...
...
@@ -1904,11 +1904,11 @@ def_arg: ColId { $$ = $1; }
/*****************************************************************************
*
* QUERY:
* d
estroy
<relname1> [, <relname2> .. <relnameN> ]
* d
rop
<relname1> [, <relname2> .. <relnameN> ]
*
*****************************************************************************/
D
estroy
Stmt: DROP TABLE relation_name_list
D
rop
Stmt: DROP TABLE relation_name_list
{
$$ = cat2_str(make1_str("drop table"), $3);
}
...
...
@@ -2552,11 +2552,11 @@ encoding: Sconst { $$ = $1; }
/*****************************************************************************
*
* QUERY:
* d
estroy
db dbname
* d
rop
db dbname
*
*****************************************************************************/
D
estroy
dbStmt: DROP DATABASE database_name
D
rop
dbStmt: DROP DATABASE database_name
{
$$ = cat2_str(make1_str("drop database"), $3);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录