Skip to content

Commit 1c32d28

Browse files
bmomjianbmomjian
committed
Remove pg_magic, defaults, server, hosts, and demon tables. unused.
1 parent 0dec3a8 commit 1c32d28

File tree

15 files changed

+27
-386
lines changed

15 files changed

+27
-386
lines changed

‎src/backend/catalog/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for catalog
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.4 1997/11/13 03:22:18 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.5 1997/11/15 20:57:02 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -29,8 +29,7 @@ SUBSYS.o: $(OBJS)
2929
GENBKI= ./genbki.sh
3030

3131
GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \
32-
pg_database.h pg_demon.h pg_magic.h pg_defaults.h \
33-
pg_variable.h pg_server.h pg_user.h pg_hosts.h \
32+
pg_database.h pg_variable.h pg_user.h \
3433
pg_group.h pg_log.h \
3534
)
3635

‎src/backend/parser/gram.y

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.66 1997/11/14 06:09:07 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.67 1997/11/15 20:57:09 momjian Exp $
1414
*
1515
* HISTORY
1616
* AUTHOR DATE MAJOR EVENT
@@ -3366,10 +3366,9 @@ relation_name: SpecialRuleRelation
33663366
}
33673367
| ColId
33683368
{
3369-
/* disallow refs to magic system tables */
3369+
/* disallow refs to variable system tables */
33703370
if (strcmp(LogRelationName, $1) == 0
3371-
|| strcmp(VariableRelationName, $1) == 0
3372-
|| strcmp(MagicRelationName, $1) == 0)
3371+
|| strcmp(VariableRelationName, $1) == 0)
33733372
elog(WARN,"%s cannot be accessed by users",$1);
33743373
else
33753374
$$ = $1;

‎src/backend/utils/init/globals.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.15 1997/11/02 15:26:12 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.16 1997/11/15 20:57:27 momjian Exp $
1111
*
1212
* NOTES
1313
* Globals used all over the place should be declared here and not
@@ -107,13 +107,8 @@ char *IndexedCatalogNames[] = {
107107
*/
108108
char *SharedSystemRelationNames[] = {
109109
DatabaseRelationName,
110-
DefaultsRelationName,
111-
DemonRelationName,
112110
GroupRelationName,
113-
HostsRelationName,
114111
LogRelationName,
115-
MagicRelationName,
116-
ServerRelationName,
117112
UserRelationName,
118113
VariableRelationName,
119114
0

‎src/bin/initdb/initdb.sh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#
2727
#
2828
# IDENTIFICATION
29-
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.27 1997/11/15 17:15:34 momjian Exp $
29+
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.28 1997/11/15 20:57:30 momjian Exp $
3030
#
3131
#-------------------------------------------------------------------------
3232

@@ -346,15 +346,10 @@ fi
346346

347347
echo
348348

349-
echo "vacuuming template1"
350-
echo "vacuum analyze" | postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
351-
grep -v "^DEBUG:"
352-
353349
echo "loading pg_description"
354350
echo "copy pg_description from '$TEMPLATE_DESCR'" | postgres -F -Q -D$PGDATA template1 > /dev/null
355351
echo "copy pg_description from '$GLOBAL_DESCR'" | postgres -F -Q -D$PGDATA template1 > /dev/null
356-
echo "vacuum analyze pg_description" | postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
357-
grep -v "^DEBUG:"
358-
359-
360352

353+
echo "vacuuming template1"
354+
echo "vacuum analyze" | postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
355+
grep -v "^DEBUG:"

‎src/include/catalog/catname.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: catname.h,v 1.7 1997/11/02 15:26:50 vadim Exp $
9+
* $Id: catname.h,v 1.8 1997/11/15 20:57:38 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -21,24 +21,20 @@
2121
#define AccessMethodProcedureRelationName "pg_amproc"
2222
#define AttributeRelationName "pg_attribute"
2323
#define DatabaseRelationName "pg_database"
24-
#define DefaultsRelationName "pg_defaults"
25-
#define DemonRelationName "pg_demon"
24+
#define DescriptionRelationName "pg_description"
2625
#define GroupRelationName "pg_group"
27-
#define HostsRelationName "pg_hosts"
2826
#define IndexRelationName "pg_index"
2927
#define InheritProcedureRelationName "pg_inheritproc"
3028
#define InheritsRelationName "pg_inherits"
3129
#define InheritancePrecidenceListRelationName "pg_ipl"
3230
#define LanguageRelationName "pg_language"
3331
#define ListenerRelationName "pg_listener"
3432
#define LogRelationName "pg_log"
35-
#define MagicRelationName "pg_magic"
3633
#define OperatorClassRelationName "pg_opclass"
3734
#define OperatorRelationName "pg_operator"
3835
#define ProcedureRelationName "pg_proc"
3936
#define RelationRelationName "pg_class"
4037
#define RewriteRelationName "pg_rewrite"
41-
#define ServerRelationName "pg_server"
4238
#define StatisticRelationName "pg_statistic"
4339
#define TypeRelationName "pg_type"
4440
#define UserRelationName "pg_user"

‎src/include/catalog/indexing.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: indexing.h,v 1.10 1997/11/15 17:15:35 momjian Exp $
10+
* $Id: indexing.h,v 1.11 1997/11/15 20:57:38 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -27,7 +27,7 @@
2727
#define Num_pg_attrdef_indices 1
2828
#define Num_pg_relcheck_indices 1
2929
#define Num_pg_trigger_indices 1
30-
#define Num_pg_description_indices 1
30+
#define Num_pg_objoid_indices 1
3131

3232

3333
/*

‎src/include/catalog/pg_attribute.h

Lines changed: 4 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_attribute.h,v 1.17 1997/11/02 15:26:56 vadim Exp $
10+
* $Id: pg_attribute.h,v 1.18 1997/11/15 20:57:40 momjian Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -227,15 +227,12 @@ DATA(insert OID = 0 ( 1262 xmax 28 0 4 -5 0 -1 f f i f f));
227227
DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 t f i f f));
228228

229229
/* ----------------
230-
* pg_demon
230+
* pg_description
231231
* ----------------
232232
*/
233-
DATA(insert OID = 0 ( 1251 demserid 26 0 4 1 0 -1 t f i f f));
234-
DATA(insert OID = 0 ( 1251 demname 19 0 NAMEDATALEN 2 0 -1 f f i f f));
235-
DATA(insert OID = 0 ( 1251 demowner 26 0 4 3 0 -1 t f i f f));
236-
DATA(insert OID = 0 ( 1251 demcode 24 0 4 4 0 -1 t f i f f));
233+
DATA(insert OID = 0 ( 1251 objoid 26 0 4 1 0 -1 t f i f f));
234+
DATA(insert OID = 0 ( 1251 description 25 0 -1 2 0 -1 f f i f f));
237235
DATA(insert OID = 0 ( 1251 ctid 27 0 6 -1 0 -1 f f i f f));
238-
239236
DATA(insert OID = 0 ( 1251 oid 26 0 4 -2 0 -1 t f i f f));
240237
DATA(insert OID = 0 ( 1251 xmin 28 0 4 -3 0 -1 f f i f f));
241238
DATA(insert OID = 0 ( 1251 cmin 29 0 4 -4 0 -1 t f i f f));
@@ -287,20 +284,6 @@ DATA(insert OID = 0 ( 1255 cmin 29 0 4 -4 0 -1 t f i f f));
287284
DATA(insert OID = 0 ( 1255 xmax 28 0 4 -5 0 -1 f f i f f));
288285
DATA(insert OID = 0 ( 1255 cmax 29 0 4 -6 0 -1 t f i f f));
289286

290-
/* ----------------
291-
* pg_server
292-
* ----------------
293-
*/
294-
DATA(insert OID = 0 ( 1257 sername 19 0 NAMEDATALEN 1 0 -1 f f i f f));
295-
DATA(insert OID = 0 ( 1257 serpid 21 0 2 2 0 -1 t f s f f));
296-
DATA(insert OID = 0 ( 1257 serport 21 0 2 3 0 -1 t f s f f));
297-
DATA(insert OID = 0 ( 1257 ctid 27 0 6 -1 0 -1 f f i f f));
298-
DATA(insert OID = 0 ( 1257 oid 26 0 4 -2 0 -1 t f i f f));
299-
DATA(insert OID = 0 ( 1257 xmin 28 0 4 -3 0 -1 f f i f f));
300-
DATA(insert OID = 0 ( 1257 cmin 29 0 4 -4 0 -1 t f i f f));
301-
DATA(insert OID = 0 ( 1257 xmax 28 0 4 -5 0 -1 f f i f f));
302-
DATA(insert OID = 0 ( 1257 cmax 29 0 4 -6 0 -1 t f i f f));
303-
304287
/* ----------------
305288
* pg_user
306289
* ----------------
@@ -420,32 +403,6 @@ DATA(insert OID = 0 ( 1259 cmin 29 0 4 -4 0 -1 t f i f f));
420403
DATA(insert OID = 0 ( 1259 xmax 28 0 4 -5 0 -1 f f i f f));
421404
DATA(insert OID = 0 ( 1259 cmax 29 0 4 -6 0 -1 t f i f f));
422405

423-
/* ----------------
424-
* pg_magic
425-
* ----------------
426-
*/
427-
DATA(insert OID = 0 ( 1253 magname 19 0 NAMEDATALEN 1 0 -1 f f i f f));
428-
DATA(insert OID = 0 ( 1253 magvalue 19 0 NAMEDATALEN 2 0 -1 f f i f f));
429-
DATA(insert OID = 0 ( 1253 ctid 27 0 6 -1 0 -1 f f i f f));
430-
DATA(insert OID = 0 ( 1253 oid 26 0 4 -2 0 -1 t f i f f));
431-
DATA(insert OID = 0 ( 1253 xmin 28 0 4 -3 0 -1 f f i f f));
432-
DATA(insert OID = 0 ( 1253 cmin 29 0 4 -4 0 -1 t f i f f));
433-
DATA(insert OID = 0 ( 1253 xmax 28 0 4 -5 0 -1 f f i f f));
434-
DATA(insert OID = 0 ( 1253 cmax 29 0 4 -6 0 -1 t f i f f));
435-
436-
/* ----------------
437-
* pg_defaults
438-
* ----------------
439-
*/
440-
DATA(insert OID = 0 ( 1263 defname 19 0 NAMEDATALEN 1 0 -1 f f i f f));
441-
DATA(insert OID = 0 ( 1263 defvalue 19 0 NAMEDATALEN 2 0 -1 f f i f f));
442-
DATA(insert OID = 0 ( 1263 ctid 27 0 6 -1 0 -1 f f i f f));
443-
DATA(insert OID = 0 ( 1263 oid 26 0 4 -2 0 -1 t f i f f));
444-
DATA(insert OID = 0 ( 1263 xmin 28 0 4 -3 0 -1 f f i f f));
445-
DATA(insert OID = 0 ( 1263 cmin 29 0 4 -4 0 -1 t f i f f));
446-
DATA(insert OID = 0 ( 1263 xmax 28 0 4 -5 0 -1 f f i f f));
447-
DATA(insert OID = 0 ( 1263 cmax 29 0 4 -6 0 -1 t f i f f));
448-
449406
/* ----------------
450407
* pg_attrdef
451408
* ----------------
@@ -494,16 +451,6 @@ DATA(insert OID = 0 ( 1219 cmin 29 0 4 -4 0 -1 t f i f f));
494451
DATA(insert OID = 0 ( 1219 xmax 28 0 4 -5 0 -1 f f i f f));
495452
DATA(insert OID = 0 ( 1219 cmax 29 0 4 -6 0 -1 t f i f f));
496453

497-
/* ----------------
498-
* pg_hosts - this relation is used to store host based authentication
499-
* info
500-
*
501-
* ----------------
502-
*/
503-
DATA(insert OID = 0 ( 1273 dbName 19 0 NAMEDATALEN 1 0 -1 f f i f f));
504-
DATA(insert OID = 0 ( 1273 address 25 0 -1 2 0 -1 f f i f f));
505-
DATA(insert OID = 0 ( 1273 mask 25 0 -1 3 0 -1 f f i f f));
506-
507454
/* ----------------
508455
* pg_variable - this relation is modified by special purpose access
509456
* method code. The following is garbage but is needed

‎src/include/catalog/pg_class.h

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_class.h,v 1.13 1997/11/13 03:22:58 momjian Exp $
10+
* $Id: pg_class.h,v 1.14 1997/11/15 20:57:41 momjian Exp $
1111
*
1212
* NOTES
1313
* ``pg_relation'' is being replaced by ``pg_class''. currently
@@ -132,14 +132,10 @@ DATA(insert OID = 1247 ( pg_type 71 PGUID 0 0 0 0 0 f f r n 16 0 0 0 f _null
132132
DESCR("");
133133
DATA(insert OID = 1249 ( pg_attribute 75 PGUID 0 0 0 0 0 f f r n 16 0 0 0 f _null_ ));
134134
DESCR("");
135-
DATA(insert OID = 1251 ( pg_demon 76 PGUID 0 0 0 0 0 f t r n 4 0 0 0 f _null_ ));
136-
DESCR("");
137-
DATA(insert OID = 1253 ( pg_magic 80 PGUID 0 0 0 0 0 f t r n 2 0 0 0 f _null_ ));
135+
DATA(insert OID = 1251 ( pg_description 76 PGUID 0 0 0 0 0 f t r n 2 0 0 0 f _null_ ));
138136
DESCR("");
139137
DATA(insert OID = 1255 ( pg_proc 81 PGUID 0 0 0 0 0 f f r n 16 0 0 0 f _null_ ));
140138
DESCR("");
141-
DATA(insert OID = 1257 ( pg_server 82 PGUID 0 0 0 0 0 f t r n 3 0 0 0 f _null_ ));
142-
DESCR("");
143139
DATA(insert OID = 1259 ( pg_class 83 PGUID 0 0 0 0 0 f f r n 18 0 0 0 f _null_ ));
144140
DESCR("");
145141
DATA(insert OID = 1260 ( pg_user 86 PGUID 0 0 0 0 0 f t r n 6 0 0 0 f _null_ ));
@@ -148,14 +144,10 @@ DATA(insert OID = 1261 ( pg_group 87 PGUID 0 0 0 0 0 f t s n 3 0 0 0 f _null
148144
DESCR("");
149145
DATA(insert OID = 1262 ( pg_database 88 PGUID 0 0 0 0 0 f t r n 3 0 0 0 f _null_ ));
150146
DESCR("");
151-
DATA(insert OID = 1263 ( pg_defaults 89 PGUID 0 0 0 0 0 f t r n 2 0 0 0 f _null_ ));
152-
DESCR("");
153147
DATA(insert OID = 1264 ( pg_variable 90 PGUID 0 0 0 0 0 f t s n 2 0 0 0 f _null_ ));
154148
DESCR("");
155149
DATA(insert OID = 1269 ( pg_log 99 PGUID 0 0 0 0 0 f t s n 1 0 0 0 f _null_ ));
156150
DESCR("");
157-
DATA(insert OID = 1273 ( pg_hosts 101 PGUID 0 0 0 0 0 f t s n 3 0 0 0 f _null_ ));
158-
DESCR("");
159151
DATA(insert OID = 1215 ( pg_attrdef 109 PGUID 0 0 0 0 0 t t r n 4 0 0 0 f _null_ ));
160152
DESCR("");
161153
DATA(insert OID = 1216 ( pg_relcheck 110 PGUID 0 0 0 0 0 t t r n 4 0 0 0 f _null_ ));
@@ -164,26 +156,19 @@ DATA(insert OID = 1219 ( pg_trigger 111 PGUID 0 0 0 0 0 t t r n 7 0 0 0 f _nu
164156
DESCR("");
165157

166158
#define RelOid_pg_type 1247
167-
#define RelOid_pg_demon 1251
159+
#define RelOid_pg_description 1251
168160
#define RelOid_pg_attribute 1249
169-
#define RelOid_pg_magic 1253
170161
#define RelOid_pg_proc 1255
171-
#define RelOid_pg_server 1257
172162
#define RelOid_pg_class 1259
173163
#define RelOid_pg_user 1260
174164
#define RelOid_pg_group 1261
175165
#define RelOid_pg_database 1262
176-
#define RelOid_pg_defaults 1263
177166
#define RelOid_pg_variable 1264
178167
#define RelOid_pg_log 1269
179-
#define RelOid_pg_hosts 1273
180168
#define RelOid_pg_attrdef 1215
181169
#define RelOid_pg_relcheck 1216
182170
#define RelOid_pg_trigger 1219
183171

184-
#define MAX_SYSTEM_RELOID 1273 /* this does not seem to be used */
185-
/* anywhere */
186-
187172
#define RELKIND_INDEX 'i' /* secondary index */
188173
#define RELKIND_RELATION 'r' /* cataloged heap */
189174
#define RELKIND_SPECIAL 's' /* special (non-heap) */

‎src/include/catalog/pg_defaults.h

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy