Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1c32d28

Browse files
committed
Remove pg_magic, defaults, server, hosts, and demon tables. unused.
1 parent0dec3a8 commit1c32d28

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
* AUTHORDATEMAJOR EVENT
@@ -3366,10 +3366,9 @@ relation_name:SpecialRuleRelation
33663366
}
33673367
| ColId
33683368
{
3369-
/* disallow refs tomagic system tables */
3369+
/* disallow refs tovariable 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/1517:15:34 momjian Exp $
29+
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.28 1997/11/1520: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 template12>&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 template12>&1> /dev/null|\
357-
grep -v"^DEBUG:"
358-
359-
360352

353+
echo"vacuuming template1"
354+
echo"vacuum analyze"| postgres -F -Q -D$PGDATA template12>&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
#defineAccessMethodProcedureRelationName "pg_amproc"
2222
#defineAttributeRelationName "pg_attribute"
2323
#defineDatabaseRelationName "pg_database"
24-
#defineDefaultsRelationName "pg_defaults"
25-
#defineDemonRelationName "pg_demon"
24+
#defineDescriptionRelationName "pg_description"
2625
#defineGroupRelationName "pg_group"
27-
#defineHostsRelationName "pg_hosts"
2826
#defineIndexRelationName "pg_index"
2927
#defineInheritProcedureRelationName "pg_inheritproc"
3028
#defineInheritsRelationName "pg_inherits"
3129
#defineInheritancePrecidenceListRelationName "pg_ipl"
3230
#defineLanguageRelationName "pg_language"
3331
#defineListenerRelationName "pg_listener"
3432
#defineLogRelationName "pg_log"
35-
#defineMagicRelationName "pg_magic"
3633
#defineOperatorClassRelationName "pg_opclass"
3734
#defineOperatorRelationName "pg_operator"
3835
#defineProcedureRelationName "pg_proc"
3936
#defineRelationRelationName "pg_class"
4037
#defineRewriteRelationName "pg_rewrite"
41-
#defineServerRelationName "pg_server"
4238
#defineStatisticRelationName "pg_statistic"
4339
#defineTypeRelationName "pg_type"
4440
#defineUserRelationName "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/1517:15:35 momjian Exp $
10+
* $Id: indexing.h,v 1.11 1997/11/1520:57:38 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -27,7 +27,7 @@
2727
#defineNum_pg_attrdef_indices1
2828
#defineNum_pg_relcheck_indices 1
2929
#defineNum_pg_trigger_indices1
30-
#defineNum_pg_description_indices1
30+
#defineNum_pg_objoid_indices1
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 xmax28 0 4 -5 0 -1 f f i f f));
227227
DATA(insertOID=0 (1262cmax2904-60-1tfiff));
228228

229229
/* ----------------
230-
*pg_demon
230+
*pg_description
231231
* ----------------
232232
*/
233-
DATA(insertOID=0 (1251demserid260410-1tfiff));
234-
DATA(insertOID=0 (1251demname190NAMEDATALEN20-1ffiff));
235-
DATA(insertOID=0 (1251demowner260430-1tfiff));
236-
DATA(insertOID=0 (1251demcode240440-1tfiff));
233+
DATA(insertOID=0 (1251objoid260410-1tfiff));
234+
DATA(insertOID=0 (1251description250-120-1ffiff));
237235
DATA(insertOID=0 (1251ctid2706-10-1ffiff));
238-
239236
DATA(insertOID=0 (1251oid2604-20-1tfiff));
240237
DATA(insertOID=0 (1251xmin2804-30-1ffiff));
241238
DATA(insertOID=0 (1251cmin2904-40-1tfiff));
@@ -287,20 +284,6 @@ DATA(insert OID = 0 ( 1255 cmin29 0 4 -4 0 -1 t f i f f));
287284
DATA(insertOID=0 (1255xmax2804-50-1ffiff));
288285
DATA(insertOID=0 (1255cmax2904-60-1tfiff));
289286

290-
/* ----------------
291-
*pg_server
292-
* ----------------
293-
*/
294-
DATA(insertOID=0 (1257sername190NAMEDATALEN10-1ffiff));
295-
DATA(insertOID=0 (1257serpid210220-1tfsff));
296-
DATA(insertOID=0 (1257serport210230-1tfsff));
297-
DATA(insertOID=0 (1257ctid2706-10-1ffiff));
298-
DATA(insertOID=0 (1257oid2604-20-1tfiff));
299-
DATA(insertOID=0 (1257xmin2804-30-1ffiff));
300-
DATA(insertOID=0 (1257cmin2904-40-1tfiff));
301-
DATA(insertOID=0 (1257xmax2804-50-1ffiff));
302-
DATA(insertOID=0 (1257cmax2904-60-1tfiff));
303-
304287
/* ----------------
305288
*pg_user
306289
* ----------------
@@ -420,32 +403,6 @@ DATA(insert OID = 0 ( 1259 cmin29 0 4 -4 0 -1 t f i f f));
420403
DATA(insertOID=0 (1259xmax2804-50-1ffiff));
421404
DATA(insertOID=0 (1259cmax2904-60-1tfiff));
422405

423-
/* ----------------
424-
*pg_magic
425-
* ----------------
426-
*/
427-
DATA(insertOID=0 (1253magname190NAMEDATALEN10-1ffiff));
428-
DATA(insertOID=0 (1253magvalue190NAMEDATALEN20-1ffiff));
429-
DATA(insertOID=0 (1253ctid2706-10-1ffiff));
430-
DATA(insertOID=0 (1253oid2604-20-1tfiff));
431-
DATA(insertOID=0 (1253xmin2804-30-1ffiff));
432-
DATA(insertOID=0 (1253cmin2904-40-1tfiff));
433-
DATA(insertOID=0 (1253xmax2804-50-1ffiff));
434-
DATA(insertOID=0 (1253cmax2904-60-1tfiff));
435-
436-
/* ----------------
437-
*pg_defaults
438-
* ----------------
439-
*/
440-
DATA(insertOID=0 (1263defname190NAMEDATALEN10-1ffiff));
441-
DATA(insertOID=0 (1263defvalue190NAMEDATALEN20-1ffiff));
442-
DATA(insertOID=0 (1263ctid2706-10-1ffiff));
443-
DATA(insertOID=0 (1263oid2604-20-1tfiff));
444-
DATA(insertOID=0 (1263xmin2804-30-1ffiff));
445-
DATA(insertOID=0 (1263cmin2904-40-1tfiff));
446-
DATA(insertOID=0 (1263xmax2804-50-1ffiff));
447-
DATA(insertOID=0 (1263cmax2904-60-1tfiff));
448-
449406
/* ----------------
450407
*pg_attrdef
451408
* ----------------
@@ -494,16 +451,6 @@ DATA(insert OID = 0 ( 1219 cmin29 0 4 -4 0 -1 t f i f f));
494451
DATA(insertOID=0 (1219xmax2804-50-1ffiff));
495452
DATA(insertOID=0 (1219cmax2904-60-1tfiff));
496453

497-
/* ----------------
498-
*pg_hosts - this relation is used to store host based authentication
499-
* info
500-
*
501-
* ----------------
502-
*/
503-
DATA(insertOID=0 (1273dbName190NAMEDATALEN10-1ffiff));
504-
DATA(insertOID=0 (1273address250-120-1ffiff));
505-
DATA(insertOID=0 (1273mask250-130-1ffiff));
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(insertOID=1249 (pg_attribute75PGUID00000ffrn16000f_null_ ));
134134
DESCR("");
135-
DATA(insertOID=1251 (pg_demon76PGUID00000ftrn4000f_null_ ));
136-
DESCR("");
137-
DATA(insertOID=1253 (pg_magic80PGUID00000ftrn2000f_null_ ));
135+
DATA(insertOID=1251 (pg_description76PGUID00000ftrn2000f_null_ ));
138136
DESCR("");
139137
DATA(insertOID=1255 (pg_proc81PGUID00000ffrn16000f_null_ ));
140138
DESCR("");
141-
DATA(insertOID=1257 (pg_server82PGUID00000ftrn3000f_null_ ));
142-
DESCR("");
143139
DATA(insertOID=1259 (pg_class83PGUID00000ffrn18000f_null_ ));
144140
DESCR("");
145141
DATA(insertOID=1260 (pg_user86PGUID00000ftrn6000f_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(insertOID=1262 (pg_database88PGUID00000ftrn3000f_null_ ));
150146
DESCR("");
151-
DATA(insertOID=1263 (pg_defaults89PGUID00000ftrn2000f_null_ ));
152-
DESCR("");
153147
DATA(insertOID=1264 (pg_variable90PGUID00000ftsn2000f_null_ ));
154148
DESCR("");
155149
DATA(insertOID=1269 (pg_log99PGUID00000ftsn1000f_null_ ));
156150
DESCR("");
157-
DATA(insertOID=1273 (pg_hosts101PGUID00000ftsn3000f_null_ ));
158-
DESCR("");
159151
DATA(insertOID=1215 (pg_attrdef109PGUID00000ttrn4000f_null_ ));
160152
DESCR("");
161153
DATA(insertOID=1216 (pg_relcheck110PGUID00000ttrn4000f_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
#defineRelOid_pg_type1247
167-
#defineRelOid_pg_demon1251
159+
#defineRelOid_pg_description1251
168160
#defineRelOid_pg_attribute1249
169-
#defineRelOid_pg_magic1253
170161
#defineRelOid_pg_proc1255
171-
#defineRelOid_pg_server1257
172162
#defineRelOid_pg_class1259
173163
#defineRelOid_pg_user1260
174164
#defineRelOid_pg_group1261
175165
#defineRelOid_pg_database1262
176-
#defineRelOid_pg_defaults1263
177166
#defineRelOid_pg_variable1264
178167
#defineRelOid_pg_log1269
179-
#defineRelOid_pg_hosts1273
180168
#defineRelOid_pg_attrdef1215
181169
#defineRelOid_pg_relcheck1216
182170
#defineRelOid_pg_trigger1219
183171

184-
#defineMAX_SYSTEM_RELOID1273/* this does not seem to be used */
185-
/* anywhere */
186-
187172
#defineRELKIND_INDEX 'i'/* secondary index */
188173
#defineRELKIND_RELATION 'r'/* cataloged heap */
189174
#defineRELKIND_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)
[8]ページ先頭
©2009-2025 Movatter.jp