Skip to content

Commit 2ac3173

Browse files
bmomjianbmomjian
committed
major/minor shared name cleanup
1 parent 0044a1b commit 2ac3173

File tree

5 files changed

+55
-21
lines changed

5 files changed

+55
-21
lines changed

‎src/backend/commands/vacuum.c

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.85 1998/10/08 00:10:46 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.86 1998/10/09 21:28:40 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -103,6 +103,8 @@ static int vc_cmp_blk(char *left, char *right);
103103
static int vc_cmp_offno(char *left, char *right);
104104
static bool vc_enough_space(VPageDescr vpd, Size len);
105105

106+
void test(Oid relid);
107+
106108
void
107109
vacuum(char *vacrel, bool verbose, bool analyze, List *va_spec)
108110
{
@@ -329,6 +331,9 @@ vc_getrels(NameData *VacRelP)
329331

330332
cur->vrl_relid = tuple->t_oid;
331333
cur->vrl_next = (VRelList) NULL;
334+
335+
test(tuple->t_oid);
336+
332337
}
333338
if (found == false)
334339
elog(NOTICE, "Vacuum: table not found");
@@ -2245,3 +2250,29 @@ vc_enough_space(VPageDescr vpd, Size len)
22452250
return false;
22462251

22472252
} /* vc_enough_space */
2253+
2254+
2255+
void test(Oid relid)
2256+
{
2257+
Relation rd;
2258+
HeapTuple rtup,
2259+
ctup;
2260+
Buffer buffer;
2261+
2262+
/*
2263+
* update number of tuples and number of pages in pg_class
2264+
*/
2265+
ctup = SearchSysCacheTupleCopy(RELOID,
2266+
ObjectIdGetDatum(relid),
2267+
0, 0, 0);
2268+
if (!HeapTupleIsValid(ctup))
2269+
elog(ERROR, "pg_class entry for relid %d vanished during vacuuming",
2270+
relid);
2271+
2272+
rd = heap_openr(RelationRelationName);
2273+
2274+
/* get the buffer cache tuple */
2275+
rtup = heap_fetch(rd, SnapshotNow, &ctup->t_ctid, &buffer);
2276+
pfree(ctup);
2277+
heap_close(rd);
2278+
}

‎src/backend/parser/gram.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
*
230230
*
231231
* IDENTIFICATION
232-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.43 1998/10/09 07:06:37 thomas Exp $
232+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.44 1998/10/09 21:28:42 momjian Exp $
233233
*
234234
* HISTORY
235235
* AUTHOR DATE MAJOR EVENT
@@ -4450,7 +4450,7 @@ static const short yycheck[] = { 3,
44504450
-1, -1, -1, -1, -1, -1, -1, -1, 204
44514451
};
44524452
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
4453-
#line 3 "/usr/lib/bison.simple"
4453+
#line 3 "/usr/local/bison/bison.simple"
44544454

44554455
/* Skeleton output parser for bison,
44564456
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -4643,7 +4643,7 @@ __yy_memcpy (char *to, char *from, int count)
46434643
#endif
46444644
#endif
46454645

4646-
#line 196 "/usr/lib/bison.simple"
4646+
#line 196 "/usr/local/bison/bison.simple"
46474647

46484648
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
46494649
into yyparse. The argument should have type void *.
@@ -10398,7 +10398,7 @@ case 929:
1039810398
break;}
1039910399
}
1040010400
/* the action file gets copied in in place of this dollarsign */
10401-
#line 498 "/usr/lib/bison.simple"
10401+
#line 498 "/usr/local/bison/bison.simple"
1040210402

1040310403
yyvsp -= yylen;
1040410404
yyssp -= yylen;

‎src/interfaces/libpgtcl/Makefile.in

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.25 1998/10/09 04:50:06 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.26 1998/10/09 21:28:46 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14+
SO_MAJOR_VERSION=2
15+
SO_MINOR_VERSION=0
16+
1417
SRCDIR= ../..
1518
include $(SRCDIR)/Makefile.global
1619

@@ -35,15 +38,15 @@ LIBPQ = -L$(SRCDIR)/interfaces/libpq -lpq
3538

3639
ifeq ($(PORTNAME), linux)
3740
install-shlib-dep := install-shlib
38-
shlib := libpgtcl.so.1
41+
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
3942
CFLAGS += $(CFLAGS_SL)
4043
LDFLAGS_SL = -shared
4144
endif
4245

4346
ifeq ($(PORTNAME), bsd)
4447
ifdef BSD_SHLIB
4548
install-shlib-dep := install-shlib
46-
shlib := libpgtcl.so.1.0
49+
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
4750
LDFLAGS_SL = -x -Bshareable -Bforcearchive
4851
CFLAGS += $(CFLAGS_SL)
4952
endif
@@ -53,13 +56,13 @@ ifeq ($(PORTNAME), bsdi)
5356
ifdef BSD_SHLIB
5457
ifeq ($(DLSUFFIX), .so)
5558
install-shlib-dep := install-shlib
56-
shlib := libpgtcl.so
59+
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
5760
LDFLAGS_SL += -shared
5861
CFLAGS += $(CFLAGS_SL)
5962
endif
6063
ifeq ($(DLSUFFIX), .o)
6164
install-shlib-dep := install-shlib
62-
shlib := libpgtcl.o
65+
shlib := libpgtcl.o.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
6366
LD := shlicc
6467
LDFLAGS_SL += -O -r
6568
CFLAGS += $(CFLAGS_SL)
@@ -69,21 +72,21 @@ endif
6972

7073
ifeq ($(PORTNAME), solaris)
7174
install-shlib-dep := install-shlib
72-
shlib := libpgtcl.so.1
75+
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
7376
LDFLAGS_SL := -G -z text
7477
CFLAGS += $(CFLAGS_SL)
7578
endif
7679

7780
ifeq ($(PORTNAME), unixware)
7881
install-shlib-dep := install-shlib
79-
shlib := libpgtcl.so.1
82+
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
8083
LDFLAGS_SL := -G -z text
8184
CFLAGS += $(CFLAGS_SL)
8285
endif
8386

8487
ifeq ($(PORTNAME), univel)
8588
install-shlib-dep := install-shlib
86-
shlib := libpgtcl.so.1
89+
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
8790
LDFLAGS_SL := -G -z text
8891
CFLAGS += $(CFLAGS_SL)
8992
endif

‎src/interfaces/libpq/Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.33 1998/10/09 04:50:08 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.34 1998/10/09 21:28:48 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -42,8 +42,8 @@ install-shlib-dep :=
4242

4343
ifeq ($(PORTNAME), linux)
4444
install-shlib-dep := install-shlib
45-
shlib := libpq.so.$(SO_MAJOR_VERSION)
46-
LDFLAGS_SL := -shared -soname libpq.so.$(SO_MAJOR_VERSION)
45+
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
46+
LDFLAGS_SL := -shared -soname libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
4747
CFLAGS += $(CFLAGS_SL)
4848
endif
4949

‎src/interfaces/odbc/GNUmakefile.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.3 1998/10/09 07:04:49 thomas Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.4 1998/10/09 21:28:50 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313
@SET_MAKE@
@@ -30,7 +30,7 @@ install-shlib-dep := install-shlib
3030
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
3131

3232
ifeq ($(PORTNAME), linux)
33-
LDFLAGS_SL = -shared -soname lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
33+
LDFLAGS_SL = -shared -soname lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
3434
LDFLAGS_SL += -Bsymbolic $(LDFLAGS) -lc -lm
3535
endif
3636

@@ -87,9 +87,9 @@ install-libpsqlodbc: libpsqlodbc.a
8787
install-shlib: $(shlib)
8888
$(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)/$(shlib)
8989
rm -f $(DESTDIR)$(LIBDIR)/lib$(NAME)$(DLSUFFIX)
90-
rm -f $(DESTDIR)$(LIBDIR)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
91-
cd $(DESTDIR)$(LIBDIR) && $(LN_S) -f $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
92-
cd $(DESTDIR)$(LIBDIR) && $(LN_S) -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) lib$(NAME)$(DLSUFFIX)
90+
rm -f $(DESTDIR)$(LIBDIR)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
91+
cd $(DESTDIR)$(LIBDIR) && $(LN_S) -f $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
92+
cd $(DESTDIR)$(LIBDIR) && $(LN_S) -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) lib$(NAME)$(DLSUFFIX)
9393

9494
install-ini: odbcinst.ini
9595
$(INSTALL) $(INSTL_LIB_OPTS) odbcinst.ini $(ODBCINST)

0 commit comments

Comments
 (0)