From 2ac3173d75a8c09089a82f273144fe56b5639729 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 9 Oct 1998 21:28:50 +0000 Subject: [PATCH] major/minor shared name cleanup --- src/backend/commands/vacuum.c | 33 ++++++++++++++++++++++++++++++++- src/backend/parser/gram.c | 8 ++++---- src/interfaces/libpgtcl/Makefile.in | 19 +++++++++++-------- src/interfaces/libpq/Makefile.in | 6 +++--- src/interfaces/odbc/GNUmakefile.in | 10 +++++----- 5 files changed, 55 insertions(+), 21 deletions(-) diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index c58515e5b6..bb96aeb5df 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.85 1998/10/08 00:10:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.86 1998/10/09 21:28:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -103,6 +103,8 @@ static int vc_cmp_blk(char *left, char *right); static int vc_cmp_offno(char *left, char *right); static bool vc_enough_space(VPageDescr vpd, Size len); +void test(Oid relid); + void vacuum(char *vacrel, bool verbose, bool analyze, List *va_spec) { @@ -329,6 +331,9 @@ vc_getrels(NameData *VacRelP) cur->vrl_relid = tuple->t_oid; cur->vrl_next = (VRelList) NULL; + + test(tuple->t_oid); + } if (found == false) elog(NOTICE, "Vacuum: table not found"); @@ -2245,3 +2250,29 @@ vc_enough_space(VPageDescr vpd, Size len) return false; } /* vc_enough_space */ + + +void test(Oid relid) +{ + Relation rd; + HeapTuple rtup, + ctup; + Buffer buffer; + + /* + * update number of tuples and number of pages in pg_class + */ + ctup = SearchSysCacheTupleCopy(RELOID, + ObjectIdGetDatum(relid), + 0, 0, 0); + if (!HeapTupleIsValid(ctup)) + elog(ERROR, "pg_class entry for relid %d vanished during vacuuming", + relid); + + rd = heap_openr(RelationRelationName); + + /* get the buffer cache tuple */ + rtup = heap_fetch(rd, SnapshotNow, &ctup->t_ctid, &buffer); + pfree(ctup); + heap_close(rd); +} diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c index 53e979b4b8..1db4867fc4 100644 --- a/src/backend/parser/gram.c +++ b/src/backend/parser/gram.c @@ -229,7 +229,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.43 1998/10/09 07:06:37 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.44 1998/10/09 21:28:42 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -4450,7 +4450,7 @@ static const short yycheck[] = { 3, -1, -1, -1, -1, -1, -1, -1, -1, 204 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/lib/bison.simple" +#line 3 "/usr/local/bison/bison.simple" /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -4643,7 +4643,7 @@ __yy_memcpy (char *to, char *from, int count) #endif #endif -#line 196 "/usr/lib/bison.simple" +#line 196 "/usr/local/bison/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -10398,7 +10398,7 @@ case 929: break;} } /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/lib/bison.simple" +#line 498 "/usr/local/bison/bison.simple" yyvsp -= yylen; yyssp -= yylen; diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in index cb20575940..5e557ebeb5 100644 --- a/src/interfaces/libpgtcl/Makefile.in +++ b/src/interfaces/libpgtcl/Makefile.in @@ -7,10 +7,13 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.25 1998/10/09 04:50:06 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.26 1998/10/09 21:28:46 momjian Exp $ # #------------------------------------------------------------------------- +SO_MAJOR_VERSION=2 +SO_MINOR_VERSION=0 + SRCDIR= ../.. include $(SRCDIR)/Makefile.global @@ -35,7 +38,7 @@ LIBPQ = -L$(SRCDIR)/interfaces/libpq -lpq ifeq ($(PORTNAME), linux) install-shlib-dep := install-shlib - shlib := libpgtcl.so.1 + shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) CFLAGS += $(CFLAGS_SL) LDFLAGS_SL = -shared endif @@ -43,7 +46,7 @@ endif ifeq ($(PORTNAME), bsd) ifdef BSD_SHLIB install-shlib-dep := install-shlib - shlib := libpgtcl.so.1.0 + shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL = -x -Bshareable -Bforcearchive CFLAGS += $(CFLAGS_SL) endif @@ -53,13 +56,13 @@ ifeq ($(PORTNAME), bsdi) ifdef BSD_SHLIB ifeq ($(DLSUFFIX), .so) install-shlib-dep := install-shlib - shlib := libpgtcl.so + shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL += -shared CFLAGS += $(CFLAGS_SL) endif ifeq ($(DLSUFFIX), .o) install-shlib-dep := install-shlib - shlib := libpgtcl.o + shlib := libpgtcl.o.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LD := shlicc LDFLAGS_SL += -O -r CFLAGS += $(CFLAGS_SL) @@ -69,21 +72,21 @@ endif ifeq ($(PORTNAME), solaris) install-shlib-dep := install-shlib - shlib := libpgtcl.so.1 + shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL := -G -z text CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), unixware) install-shlib-dep := install-shlib - shlib := libpgtcl.so.1 + shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL := -G -z text CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), univel) install-shlib-dep := install-shlib - shlib := libpgtcl.so.1 + shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL := -G -z text CFLAGS += $(CFLAGS_SL) endif diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in index 77997a849a..495f0a3939 100644 --- a/src/interfaces/libpq/Makefile.in +++ b/src/interfaces/libpq/Makefile.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.33 1998/10/09 04:50:08 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.34 1998/10/09 21:28:48 momjian Exp $ # #------------------------------------------------------------------------- @@ -42,8 +42,8 @@ install-shlib-dep := ifeq ($(PORTNAME), linux) install-shlib-dep := install-shlib - shlib := libpq.so.$(SO_MAJOR_VERSION) - LDFLAGS_SL := -shared -soname libpq.so.$(SO_MAJOR_VERSION) + shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + LDFLAGS_SL := -shared -soname libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) CFLAGS += $(CFLAGS_SL) endif diff --git a/src/interfaces/odbc/GNUmakefile.in b/src/interfaces/odbc/GNUmakefile.in index 0b2652f2a5..ec819f3169 100644 --- a/src/interfaces/odbc/GNUmakefile.in +++ b/src/interfaces/odbc/GNUmakefile.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.3 1998/10/09 07:04:49 thomas Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.4 1998/10/09 21:28:50 momjian Exp $ # #------------------------------------------------------------------------- @SET_MAKE@ @@ -30,7 +30,7 @@ install-shlib-dep := install-shlib shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) ifeq ($(PORTNAME), linux) - LDFLAGS_SL = -shared -soname lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) + LDFLAGS_SL = -shared -soname lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL += -Bsymbolic $(LDFLAGS) -lc -lm endif @@ -87,9 +87,9 @@ install-libpsqlodbc: libpsqlodbc.a install-shlib: $(shlib) $(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)/$(shlib) rm -f $(DESTDIR)$(LIBDIR)/lib$(NAME)$(DLSUFFIX) - rm -f $(DESTDIR)$(LIBDIR)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) - cd $(DESTDIR)$(LIBDIR) && $(LN_S) -f $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) - cd $(DESTDIR)$(LIBDIR) && $(LN_S) -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) lib$(NAME)$(DLSUFFIX) + rm -f $(DESTDIR)$(LIBDIR)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + cd $(DESTDIR)$(LIBDIR) && $(LN_S) -f $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + cd $(DESTDIR)$(LIBDIR) && $(LN_S) -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) lib$(NAME)$(DLSUFFIX) install-ini: odbcinst.ini $(INSTALL) $(INSTL_LIB_OPTS) odbcinst.ini $(ODBCINST) -- 2.11.0