open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename heap_create to heap_create_and_catatlog, rename heap_creatr to heap_create().

Browse Source
REL6_4
Bruce Momjian 28 years ago
parent a8926e0461
commit c445ba331b
11 changed files with 52 additions and 50 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      src/backend/bootstrap/bootparse.y
  2. 39
      src/backend/catalog/heap.c
  3. 4
      src/backend/catalog/index.c
  4. 8
      src/backend/commands/cluster.c
  5. 4
      src/backend/commands/creatinh.c
  6. 9
      src/backend/commands/recipe.c
  7. 6
      src/backend/executor/execAmi.c
  8. 4
      src/backend/executor/execMain.c
  9. 10
      src/backend/executor/nodeTee.c
  10. 4
      src/backend/storage/large_object/inv_api.c
  11. 6
      src/include/catalog/heap.h

8
src/backend/bootstrap/bootparse.y
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.7 1997/11/24 05:07:54 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.8 1997/11/28 04:39:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -170,7 +170,7 @@ CreateStmt:
if (DebugMode)
puts("creating bootstrap relation");
tupdesc = CreateTupleDesc(numattr,attrtypes);
reldesc = heap_creatr(LexIDStr($3), tupdesc);
reldesc = heap_create(LexIDStr($3), tupdesc);
if (DebugMode)
puts("bootstrap relation created ok");
}
@ -178,10 +178,10 @@ CreateStmt:
{
Oid id;
TupleDesc tupdesc;
/* extern Oid heap_create();*/
/* extern Oid heap_create_and_catalog();*/
tupdesc = CreateTupleDesc(numattr,attrtypes);
id = heap_create(LexIDStr($3), tupdesc);
id = heap_create_and_catalog(LexIDStr($3), tupdesc);
if (!Quiet)
printf("CREATED relation %s with OID %d\n",
LexIDStr($3), id);

39
src/backend/catalog/heap.c
Unescape View File

@ -7,17 +7,18 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.37 1997/11/26 04:50:19 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.38 1997/11/28 04:39:34 momjian Exp $
*
* INTERFACE ROUTINES
* heap_creatr() - Create an uncataloged heap relation
* heap_create() - Create a cataloged relation
* heap_create() - Create an uncataloged heap relation
* heap_create_and_catalog() - Create a cataloged relation
* heap_destroy() - Removes named relation from catalogs
*
* NOTES
* this code taken from access/heap/create.c, which contains
* the old heap_creater, amcreate, and amdestroy. those routines
* will soon call these routines using the function manager,
* the old heap_create_and_catalogr, amcreate, and amdestroy.
* those routines will soon call these routines using the function
* manager,
* just like the poorly named "NewXXX" routines do. The
* "New" routines are all going to die soon, once and for all!
* -cim 1/13/91
@ -148,7 +149,7 @@ static TempRelList *tempRels = NULL;
/* ----------------------------------------------------------------
* heap_creatr - Create an uncataloged heap relation
* heap_create - Create an uncataloged heap relation
*
* Fields relpages, reltuples, reltuples, relkeys, relhistory,
* relisindexed, and relkind of rdesc->rd_rel are initialized
@ -160,12 +161,12 @@ static TempRelList *tempRels = NULL;
* into the transaction context block.
*
*
* if heap_creatr is called with "" as the name, then heap_creatr will create a
* temporary name "temp_$RELOID" for the relation
* if heap_create is called with "" as the name, then heap_create will create
* a temporary name "temp_$RELOID" for the relation
* ----------------------------------------------------------------
*/
Relation
heap_creatr(char *name,
heap_create(char *name,
TupleDesc tupDesc)
{
register unsigned i;
@ -331,7 +332,7 @@ heap_creatr(char *name,
/* ----------------------------------------------------------------
* heap_create - Create a cataloged relation
* heap_create_and_catalog - Create a cataloged relation
*
* this is done in 6 steps:
*
@ -342,8 +343,8 @@ heap_creatr(char *name,
* preforms a scan to ensure that no relation with the
* same name already exists.
*
* 3) heap_creater() is called to create the new relation on
* disk.
* 3) heap_create_and_catalogr() is called to create the new relation
* on disk.
*
* 4) TypeDefine() is called to define a new type corresponding
* to the new relation.
@ -375,8 +376,8 @@ heap_creatr(char *name,
* create new relation
* insert new relation into attribute catalog
*
* Should coordinate with heap_creater(). Either it should
* not be called or there should be a way to prevent
* Should coordinate with heap_create_and_catalogr(). Either
* it should not be called or there should be a way to prevent
* the relation from being removed at the end of the
* transaction if it is successful ('u'/'r' may be enough).
* Also, if the transaction does not commit, then the
@ -738,14 +739,14 @@ addNewRelationType(char *typeName, Oid new_rel_oid)
}
/* --------------------------------
* heap_create
* heap_create_and_catalog
*
* creates a new cataloged relation. see comments above.
* --------------------------------
*/
Oid
heap_create(char relname[],
TupleDesc tupdesc)
heap_create_and_catalog(char relname[],
TupleDesc tupdesc)
{
Relation pg_class_desc;
Relation new_rel_desc;
@ -782,11 +783,11 @@ heap_create(char relname[],
* create an uncataloged relation and pull its relation oid
* from the newly formed relation descriptor.
*
* Note: The call to heap_creatr() does all the "real" work
* Note: The call to heap_create() does all the "real" work
* of creating the disk file for the relation.
* ----------------
*/
new_rel_desc = heap_creatr(relname, tupdesc);
new_rel_desc = heap_create(relname, tupdesc);
new_rel_oid = new_rel_desc->rd_att->attrs[0]->attrelid;
/* ----------------

4
src/backend/catalog/index.c
Unescape View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.30 1997/11/25 21:58:43 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.31 1997/11/28 04:39:38 momjian Exp $
*
*
* INTERFACE ROUTINES
@ -1120,7 +1120,7 @@ index_create(char *heapRelationName,
* create the index relation
* ----------------
*/
indexRelation = heap_creatr(indexRelationName,
indexRelation = heap_create(indexRelationName,
indexTupDesc);
/* ----------------

8
src/backend/commands/cluster.c
Unescape View File

@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.17 1997/11/21 18:09:46 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.18 1997/11/28 04:39:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -209,13 +209,13 @@ copy_heap(Oid OIDOldHeap)
OldHeapDesc = RelationGetTupleDescriptor(OldHeap);
/*
* Need to make a copy of the tuple descriptor, heap_create modifies
* it.
* Need to make a copy of the tuple descriptor, heap_create_and_catalog
* modifies it.
*/
tupdesc = CreateTupleDescCopy(OldHeapDesc);
OIDNewHeap = heap_create(NewName, tupdesc);
OIDNewHeap = heap_create_and_catalog(NewName, tupdesc);
if (!OidIsValid(OIDNewHeap))
elog(WARN, "clusterheap: cannot create temporary heap relation\n");

4
src/backend/commands/creatinh.c
Unescape View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.19 1997/11/21 18:09:49 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.20 1997/11/28 04:39:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -137,7 +137,7 @@ DefineRelation(CreateStmt *stmt)
}
}
relationId = heap_create(relname, descriptor);
relationId = heap_create_and_catalog(relname, descriptor);
StoreCatalogInheritance(relationId, inheritList);
}

9
src/backend/commands/recipe.c
Unescape View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.13 1997/11/25 21:59:00 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.14 1997/11/28 04:39:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -1047,7 +1047,8 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
len = length(q->qtrees[0]->targetList);
tupdesc = rel->rd_att;
relid = heap_create(child->nodeElem->outTypes->val[0], tupdesc);
relid = heap_create_and_catalog(
child->nodeElem->outTypes->val[0], tupdesc);
}
else
{
@ -1071,8 +1072,8 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo)
}
else
{
relid = heap_create(child->nodeElem->outTypes->val[0],
tupdesc);
relid = heap_create_and_catalog(
child->nodeElem->outTypes->val[0], tupdesc);
}
}
}

6
src/backend/executor/execAmi.c
Unescape View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.11 1997/11/27 02:23:01 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.12 1997/11/28 04:40:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -443,10 +443,10 @@ ExecCreatR(TupleDesc tupType,
*/
/*
* heap_creatr creates a name if the argument to heap_creatr is
* heap_create creates a name if the argument to heap_create is
* '\0 '
*/
relDesc = heap_creatr("", tupType);
relDesc = heap_create("", tupType);
}
else
{

4
src/backend/executor/execMain.c
Unescape View File

@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.33 1997/11/24 05:08:20 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.34 1997/11/28 04:40:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -572,7 +572,7 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
/* fixup to prevent zero-length columns in create */
setVarAttrLenForCreateTable(tupdesc, targetList, rangeTable);
intoRelationId = heap_create(intoName, tupdesc);
intoRelationId = heap_create_and_catalog(intoName, tupdesc);
#ifdef NOT_USED /* it's copy ... */
resetVarAttrLenForCreateTable(tupdesc);
#endif

10
src/backend/executor/nodeTee.c
Unescape View File

@ -15,7 +15,7 @@
* ExecEndTee
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.11 1997/11/21 18:10:08 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.12 1997/11/28 04:40:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -167,8 +167,8 @@ ExecInitTee(Tee *node, EState *currentEstate, Plan *parent)
if (RelationIsValid(r))
bufferRel = heap_openr(teeState->tee_bufferRelname);
else
bufferRel = heap_open(heap_create(teeState->tee_bufferRelname,
tupType));
bufferRel = heap_open(
heap_create_and_catalog(teeState->tee_bufferRelname, tupType));
}
else
{
@ -176,8 +176,8 @@ ExecInitTee(Tee *node, EState *currentEstate, Plan *parent)
"ttemp_%d", /* 'ttemp' for 'tee' temporary */
newoid());
/* bufferRel = ExecCreatR(len, tupType, _TEMP_RELATION_ID); */
bufferRel = heap_open(heap_create(teeState->tee_bufferRelname,
tupType));
bufferRel = heap_open(
heap_create_and_catalog(teeState->tee_bufferRelname, tupType));
}
teeState->tee_bufferRel = bufferRel;

4
src/backend/storage/large_object/inv_api.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.22 1997/11/21 19:02:37 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.23 1997/11/28 04:40:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -139,7 +139,7 @@ inv_create(int flags)
* be located on whatever storage manager the user requested.
*/
heap_create(objname, tupdesc);
heap_create_and_catalog(objname, tupdesc);
/* make the relation visible in this transaction */
CommandCounterIncrement();

6
src/include/catalog/heap.h
Unescape View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: heap.h,v 1.8 1997/11/21 18:11:56 momjian Exp $
* $Id: heap.h,v 1.9 1997/11/28 04:40:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -15,10 +15,10 @@
#include <utils/rel.h>
extern Relation heap_creatr(char *relname, TupleDesc att);
extern Relation heap_create(char *relname, TupleDesc att);
extern Oid
heap_create(char relname[], TupleDesc tupdesc);
heap_create_and_catalog(char relname[], TupleDesc tupdesc);
extern void heap_destroy(char relname[]);
extern void heap_destroyr(Relation r);

Write Preview
Loading…
Cancel
Save