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

Commit7a55ba7

Browse files
committed
Back out pg_autovacuum commit after cvs clean failure causes commit.
1 parent8dec0c1 commit7a55ba7

File tree

15 files changed

+114
-507
lines changed

15 files changed

+114
-507
lines changed

‎doc/src/sgml/plperl.sgml

Lines changed: 64 additions & 258 deletions
Large diffs are not rendered by default.

‎src/backend/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.102 2004/07/21 20:22:58 momjian Exp $
7+
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.103 2004/07/21 20:34:44 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -29,13 +29,13 @@ endif
2929

3030
##########################################################################
3131

32-
all: submake-libpgportsubmake-libpqpostgres$(POSTGRES_IMP)
32+
all: submake-libpgport postgres$(POSTGRES_IMP)
3333

3434
ifneq ($(PORTNAME), cygwin)
3535
ifneq ($(PORTNAME), win32)
3636

3737
postgres:$(OBJS)
38-
$(CC)$(CFLAGS)$(LDFLAGS)-I$(libpq_srcdir)$(export_dynamic)$^$(LIBS)$(libpq) -o$@
38+
$(CC)$(CFLAGS)$(LDFLAGS)$(export_dynamic)$^$(LIBS) -o$@
3939

4040
endif
4141
endif

‎src/backend/bootstrap/bootstrap.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.188 2004/07/21 20:22:58 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.189 2004/07/21 20:34:45 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -34,7 +34,6 @@
3434
#include"libpq/pqsignal.h"
3535
#include"miscadmin.h"
3636
#include"postmaster/bgwriter.h"
37-
#include"postmaster/pg_autovacuum.h"
3837
#include"storage/freespace.h"
3938
#include"storage/ipc.h"
4039
#include"storage/pg_shmem.h"
@@ -356,9 +355,6 @@ BootstrapMain(int argc, char *argv[])
356355
caseBS_XLOG_BGWRITER:
357356
statmsg="writer process";
358357
break;
359-
caseBS_XLOG_AUTOVAC:
360-
statmsg="auto vacuum process";
361-
break;
362358
default:
363359
statmsg="??? process";
364360
break;
@@ -395,9 +391,6 @@ BootstrapMain(int argc, char *argv[])
395391
caseBS_XLOG_BGWRITER:
396392
InitDummyProcess(DUMMY_PROC_BGWRITER);
397393
break;
398-
caseBS_XLOG_AUTOVAC:
399-
InitDummyProcess(DUMMY_PROC_AUTOVAC);
400-
break;
401394

402395
default:
403396
InitDummyProcess(DUMMY_PROC_DEFAULT);
@@ -434,12 +427,6 @@ BootstrapMain(int argc, char *argv[])
434427
BackgroundWriterMain();
435428
proc_exit(1);/* should never return */
436429

437-
caseBS_XLOG_AUTOVAC:
438-
/* don't set signals, autovac has its own agenda */
439-
InitXLOGAccess();
440-
AutoVacMain();
441-
proc_exit(1);/* should never return */
442-
443430
default:
444431
elog(PANIC,"unrecognized XLOG op: %d",xlogop);
445432
proc_exit(1);

‎src/backend/catalog/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for backend/catalog
44
#
5-
# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.52 2004/07/21 20:22:59 momjian Exp $
5+
# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.53 2004/07/21 20:34:45 momjian Exp $
66
#
77
#-------------------------------------------------------------------------
88

@@ -32,7 +32,7 @@ POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\
3232
pg_language.h pg_largeobject.h pg_aggregate.h pg_statistic.h \
3333
pg_rewrite.h pg_trigger.h pg_listener.h pg_description.h pg_cast.h \
3434
pg_namespace.h pg_conversion.h pg_database.h pg_shadow.h pg_group.h \
35-
pg_tablespace.h pg_depend.hpg_autovacuum.hindexing.h \
35+
pg_tablespace.h pg_depend.h indexing.h \
3636
)
3737

3838
pg_includes :=$(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include)

‎src/backend/catalog/system_views.sql

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 1996-2003, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.7 2004/07/21 20:22:59 momjian Exp $
6+
* $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.8 2004/07/21 20:34:45 momjian Exp $
77
*/
88

99
CREATEVIEWpg_userAS
@@ -41,26 +41,22 @@ CREATE VIEW pg_tables AS
4141
SELECT
4242
N.nspnameAS schemaname,
4343
C.relnameAS tablename,
44-
T.spcnameAS tablespace,
4544
pg_get_userbyid(C.relowner)AS tableowner,
4645
C.relhasindexAS hasindexes,
4746
C.relhasrulesAS hasrules,
4847
(C.reltriggers>0)AS hastriggers
4948
FROM pg_class CLEFT JOIN pg_namespace NON (N.oid=C.relnamespace)
50-
LEFT JOIN pg_tablespace TON (T.oid=C.reltablespace)
5149
WHEREC.relkind='r';
5250

5351
CREATEVIEWpg_indexesAS
5452
SELECT
5553
N.nspnameAS schemaname,
5654
C.relnameAS tablename,
57-
T.spcnameAS tablespace,
5855
I.relnameAS indexname,
5956
pg_get_indexdef(I.oid)AS indexdef
6057
FROM pg_index XJOIN pg_class CON (C.oid=X.indrelid)
6158
JOIN pg_class ION (I.oid=X.indexrelid)
6259
LEFT JOIN pg_namespace NON (N.oid=C.relnamespace)
63-
LEFT JOIN pg_tablespace TON (T.oid=C.reltablespace)
6460
WHEREC.relkind='r'ANDI.relkind='i';
6561

6662
CREATEVIEWpg_statsAS

‎src/backend/postmaster/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
# Makefile for src/backend/postmaster
55
#
66
# IDENTIFICATION
7-
# $PostgreSQL: pgsql/src/backend/postmaster/Makefile,v 1.17 2004/07/21 20:22:59 momjian Exp $
7+
# $PostgreSQL: pgsql/src/backend/postmaster/Makefile,v 1.18 2004/07/21 20:34:46 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
subdir = src/backend/postmaster
1212
top_builddir = ../../..
1313
include$(top_builddir)/src/Makefile.global
1414

15-
OBJS = postmaster.o bgwriter.o pgstat.o pgarch.o pg_autovacuum.o
15+
OBJS = postmaster.o bgwriter.o pgstat.o pgarch.o
1616

1717
all: SUBSYS.o
1818

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp