Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0889dcd

Browse files
bmomjianbmomjian
committed
Remove archive stuff.
1 parent e9e1ff2 commit 0889dcd

File tree

5 files changed

+15
-39
lines changed

5 files changed

+15
-39
lines changed

‎src/backend/access/heap/heapam.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.22 1997/11/20 23:19:57 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.23 1997/11/21 18:03:55 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -650,7 +650,7 @@ heap_beginscan(Relation relation,
650650
*/
651651
sdesc = (HeapScanDesc) palloc(sizeof(HeapScanDescData));
652652

653-
relation->rd_nblocks = smgrnblocks(relation->rd_rel->relsmgr, relation);
653+
relation->rd_nblocks = smgrnblocks(DEFAULT_SMGR, relation);
654654
sdesc->rs_rd = relation;
655655

656656
if (nkeys)

‎src/backend/bootstrap/bootparse.y

+3-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.5 1997/09/08 03:19:50 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.6 1997/11/21 18:04:03 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -171,9 +171,7 @@ CreateStmt:
171171
if (DebugMode)
172172
puts("creating bootstrap relation");
173173
tupdesc = CreateTupleDesc(numattr,attrtypes);
174-
reldesc = heap_creatr(LexIDStr($3),
175-
DEFAULT_SMGR,
176-
tupdesc);
174+
reldesc = heap_creatr(LexIDStr($3), tupdesc);
177175
if (DebugMode)
178176
puts("bootstrap relation created ok");
179177
}
@@ -184,11 +182,7 @@ CreateStmt:
184182
/* extern Oid heap_create();*/
185183

186184
tupdesc = CreateTupleDesc(numattr,attrtypes);
187-
id = heap_create(LexIDStr($3),
188-
NULL,
189-
'n',
190-
DEFAULT_SMGR,
191-
tupdesc);
185+
id = heap_create(LexIDStr($3), tupdesc);
192186
if (!Quiet)
193187
printf("CREATED relation %s with OID %d\n",
194188
LexIDStr($3), id);

‎src/backend/catalog/heap.c

+7-21
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.31 1997/11/20 23:20:38 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.32 1997/11/21 18:04:11 momjian Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
* heap_creatr() - Create an uncataloged heap relation
@@ -58,9 +58,8 @@
5858
#include <string.h>
5959
#endif
6060

61-
static void
62-
AddPgRelationTuple(Relation pg_class_desc,
63-
Relation new_rel_desc, Oid new_rel_oid, int arch, unsigned natts);
61+
static void AddPgRelationTuple(Relation pg_class_desc,
62+
Relation new_rel_desc, Oid new_rel_oid, unsigned natts);
6463
static void AddToTempRelList(Relation r);
6564
static void DeletePgAttributeTuples(Relation rdesc);
6665
static void DeletePgRelationTuple(Relation rdesc);
@@ -165,7 +164,6 @@ static TempRelList *tempRels = NULL;
165164
*/
166165
Relation
167166
heap_creatr(char *name,
168-
unsigned smgr,
169167
TupleDesc tupDesc)
170168
{
171169
register unsigned i;
@@ -283,7 +281,6 @@ heap_creatr(char *name,
283281
namestrcpy(&(rdesc->rd_rel->relname), relname);
284282
rdesc->rd_rel->relkind = RELKIND_UNCATALOGED;
285283
rdesc->rd_rel->relnatts = natts;
286-
rdesc->rd_rel->relsmgr = smgr;
287284
if (tupDesc->constr)
288285
rdesc->rd_rel->relchecks = tupDesc->constr->num_check;
289286

@@ -313,7 +310,7 @@ heap_creatr(char *name,
313310
*/
314311

315312
rdesc->rd_tmpunlinked = TRUE; /* change once table is created */
316-
rdesc->rd_fd = (File) smgrcreate(smgr, rdesc);
313+
rdesc->rd_fd = (File) smgrcreate(DEFAULT_SMGR, rdesc);
317314
rdesc->rd_tmpunlinked = FALSE;
318315

319316
RelationRegisterRelation(rdesc);
@@ -631,7 +628,6 @@ static void
631628
AddPgRelationTuple(Relation pg_class_desc,
632629
Relation new_rel_desc,
633630
Oid new_rel_oid,
634-
int arch,
635631
unsigned natts)
636632
{
637633
Form_pg_class new_rel_reltup;
@@ -656,7 +652,6 @@ AddPgRelationTuple(Relation pg_class_desc,
656652
new_rel_reltup->relkind = RELKIND_SEQUENCE;
657653
else
658654
new_rel_reltup->relkind = RELKIND_RELATION;
659-
new_rel_reltup->relarch = arch;
660655
new_rel_reltup->relnatts = natts;
661656

662657
/* ----------------
@@ -748,16 +743,12 @@ addNewRelationType(char *typeName, Oid new_rel_oid)
748743
*/
749744
Oid
750745
heap_create(char relname[],
751-
char *typename, /* not used currently */
752-
int arch,
753-
unsigned smgr,
754746
TupleDesc tupdesc)
755747
{
756748
Relation pg_class_desc;
757749
Relation new_rel_desc;
758750
Oid new_rel_oid;
759751

760-
/* NameData typeNameData; */
761752
int natts = tupdesc->natts;
762753

763754
/* ----------------
@@ -793,16 +784,14 @@ heap_create(char relname[],
793784
* of creating the disk file for the relation.
794785
* ----------------
795786
*/
796-
new_rel_desc = heap_creatr(relname, smgr, tupdesc);
787+
new_rel_desc = heap_creatr(relname, tupdesc);
797788
new_rel_oid = new_rel_desc->rd_att->attrs[0]->attrelid;
798789

799790
/* ----------------
800791
* since defining a relation also defines a complex type,
801792
* we add a new system type corresponding to the new relation.
802793
* ----------------
803794
*/
804-
/* namestrcpy(&typeNameData, relname);*/
805-
/* addNewRelationType(&typeNameData, new_rel_oid);*/
806795
addNewRelationType(relname, new_rel_oid);
807796

808797
/* ----------------
@@ -819,7 +808,6 @@ heap_create(char relname[],
819808
AddPgRelationTuple(pg_class_desc,
820809
new_rel_desc,
821810
new_rel_oid,
822-
arch,
823811
natts);
824812

825813
StoreConstraints(new_rel_desc);
@@ -1354,7 +1342,7 @@ heap_destroy(char *relname)
13541342
*/
13551343
if (!(rdesc->rd_istemp) || !(rdesc->rd_tmpunlinked))
13561344
{
1357-
smgrunlink(rdesc->rd_rel->relsmgr, rdesc);
1345+
smgrunlink(DEFAULT_SMGR, rdesc);
13581346
}
13591347
rdesc->rd_tmpunlinked = TRUE;
13601348

@@ -1377,9 +1365,7 @@ heap_destroyr(Relation rdesc)
13771365
{
13781366
ReleaseRelationBuffers(rdesc);
13791367
if (!(rdesc->rd_istemp) || !(rdesc->rd_tmpunlinked))
1380-
{
1381-
smgrunlink(rdesc->rd_rel->relsmgr, rdesc);
1382-
}
1368+
smgrunlink(DEFAULT_SMGR, rdesc);
13831369
rdesc->rd_tmpunlinked = TRUE;
13841370
heap_close(rdesc);
13851371
RemoveFromTempRelList(rdesc);

‎src/backend/catalog/index.c

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.26 1997/11/20 23:20:44 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.27 1997/11/21 18:04:16 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -568,10 +568,7 @@ ConstructIndexReldesc(Relation indexRelation, Oid amoid)
568568

569569
indexRelation->rd_rel->relam = amoid;
570570
indexRelation->rd_rel->reltuples = 1; /* XXX */
571-
indexRelation->rd_rel->relexpires = 0; /* XXX */
572-
indexRelation->rd_rel->relpreserved = 0; /* XXX */
573571
indexRelation->rd_rel->relkind = RELKIND_INDEX;
574-
indexRelation->rd_rel->relarch = 'n'; /* XXX */
575572
}
576573

577574
/* ----------------------------------------------------------------
@@ -858,7 +855,6 @@ UpdateIndexRelation(Oid indexoid,
858855
}
859856

860857
indexForm->indisclustered = '\0'; /* XXX constant */
861-
indexForm->indisarchived = '\0'; /* XXX constant */
862858

863859
/* ----------------
864860
* open the system catalog index relation

‎src/backend/commands/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for commands
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.5 1997/10/28 14:54:43 vadim Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.6 1997/11/21 18:04:26 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,7 @@ INCLUDE_OPT = -I.. \
1818
CFLAGS+=$(INCLUDE_OPT)
1919

2020
OBJS = async.o creatinh.o command.o copy.o defind.o define.o \
21-
purge.o remove.o rename.o vacuum.o version.o view.o cluster.o \
21+
remove.o rename.o vacuum.o version.o view.o cluster.o \
2222
recipe.o explain.o sequence.o trigger.o proclang.o
2323

2424
all: SUBSYS.o

0 commit comments

Comments
 (0)