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

Commit4f44aa0

Browse files
committed
Major overhaul of large-object implementation, by Denis Perchine with
kibitzing from Tom Lane. Large objects are now all stored in a singlesystem relation "pg_largeobject" --- no more xinv or xinx files, no morerelkind 'l'. This should offer substantial performance improvement forlarge numbers of LOs, since there won't be directory bloat anymore.It'll also fix problems like running out of locktable space when youaccess thousands of LOs in one transaction.Also clean up cruft in read/write routines. LOs with "holes" in them(never-written byte ranges) now work just like Unix files with holes do:a hole reads as zeroes but doesn't occupy storage space.INITDB forced!
1 parentd7186cf commit4f44aa0

File tree

21 files changed

+731
-1201
lines changed

21 files changed

+731
-1201
lines changed

‎contrib/pg_dumplo/lo_export.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ pglo_export(LODumpMaster *pgLO)
9494
* Query
9595
* ----------
9696
*/
97-
sprintf(Qbuff,"SELECTx.%s FROM%s x,pg_class c WHERE x.%s =c.oid and c.relkind = 'l'",
97+
sprintf(Qbuff,"SELECTDISTINCT x.\"%s\" FROM\"%s\" x,pg_largeobject l WHERE x.\"%s\" =l.loid",
9898
ll->lo_attr,ll->lo_table,ll->lo_attr);
9999

100100
/* puts(Qbuff); */
@@ -104,7 +104,8 @@ pglo_export(LODumpMaster *pgLO)
104104
if ((tuples=PQntuples(pgLO->res))==0) {
105105

106106
if (!pgLO->quiet&&pgLO->action==ACTION_EXPORT_ATTR)
107-
printf("%s: no large objets in '%s'\n",progname,ll->lo_table);
107+
printf("%s: no large objects in '%s'\n",
108+
progname,ll->lo_table);
108109
continue;
109110

110111
}elseif (check_res(pgLO)) {

‎contrib/vacuumlo/vacuumlo.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/contrib/vacuumlo/vacuumlo.c,v 1.5 2000/06/19 13:54:50 momjian Exp $
11+
* $Header: /cvsroot/pgsql/contrib/vacuumlo/vacuumlo.c,v 1.6 2000/10/24 01:38:20 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -59,10 +59,9 @@ vacuumlo(char *database, int verbose)
5959
* First we create and populate the lo temp table
6060
*/
6161
buf[0]='\0';
62-
strcat(buf,"SELECToid AS lo ");
62+
strcat(buf,"SELECTDISTINCT loid AS lo ");
6363
strcat(buf,"INTO TEMP TABLE vacuum_l ");
64-
strcat(buf,"FROM pg_class ");
65-
strcat(buf,"WHERE relkind='l'");
64+
strcat(buf,"FROM pg_largeobject ");
6665
if (!(res=PQexec(conn,buf)))
6766
{
6867
fprintf(stderr,"Failed to create temp table.\n");

‎doc/src/sgml/ref/psql-ref.sgml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.39 2000/10/12 22:16:58 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.40 2000/10/24 01:38:21 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -706,7 +706,8 @@ lo_import 152801
706706
<listitem>
707707
<para>
708708
Shows a list of all <productname>Postgres</productname> <quote>large
709-
objects</quote> currently stored in the database along with their owners.
709+
objects</quote> currently stored in the database, along with any
710+
comments provided for them.
710711
</para>
711712
</listitem>
712713
</varlistentry>

‎src/backend/catalog/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for catalog
44
#
5-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.30 2000/10/22 05:27:10 momjian Exp $
5+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.31 2000/10/24 01:38:23 tgl Exp $
66
#
77
#-------------------------------------------------------------------------
88

@@ -11,7 +11,8 @@ top_builddir = ../../..
1111
include$(top_builddir)/src/Makefile.global
1212

1313
OBJS = catalog.o heap.o index.o indexing.o aclchk.o\
14-
pg_aggregate.o pg_operator.o pg_proc.o pg_type.o
14+
pg_aggregate.o pg_largeobject.o pg_operator.o pg_proc.o\
15+
pg_type.o
1516

1617
BKIFILES = global.bki template1.bki global.description template1.description
1718

@@ -29,7 +30,7 @@ TEMPLATE1_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\
2930
pg_proc.h pg_type.h pg_attribute.h pg_class.h \
3031
pg_inherits.h pg_index.h pg_statistic.h \
3132
pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
32-
pg_language.h \
33+
pg_language.hpg_largeobject.h\
3334
pg_aggregate.h pg_ipl.h pg_inheritproc.h \
3435
pg_rewrite.h pg_listener.h pg_description.h indexing.h \
3536
)

‎src/backend/catalog/indexing.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.71 2000/10/22 05:27:10 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.72 2000/10/24 01:38:22 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -51,6 +51,8 @@ char *Name_pg_inherits_indices[Num_pg_inherits_indices] =
5151
{InheritsRelidSeqnoIndex};
5252
char*Name_pg_language_indices[Num_pg_language_indices]=
5353
{LanguageOidIndex,LanguageNameIndex};
54+
char*Name_pg_largeobject_indices[Num_pg_largeobject_indices]=
55+
{LargeObjectLOidPNIndex};
5456
char*Name_pg_listener_indices[Num_pg_listener_indices]=
5557
{ListenerPidRelnameIndex};
5658
char*Name_pg_opclass_indices[Num_pg_opclass_indices]=

‎src/backend/catalog/pg_largeobject.c

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
/*-------------------------------------------------------------------------
2+
*
3+
* pg_largeobject.c
4+
* routines to support manipulation of the pg_largeobject relation
5+
*
6+
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
7+
* Portions Copyright (c) 1994, Regents of the University of California
8+
*
9+
*
10+
* IDENTIFICATION
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_largeobject.c,v 1.5 2000/10/24 01:38:23 tgl Exp $
12+
*
13+
*-------------------------------------------------------------------------
14+
*/
15+
#include"postgres.h"
16+
17+
#include"access/genam.h"
18+
#include"access/heapam.h"
19+
#include"catalog/catname.h"
20+
#include"catalog/indexing.h"
21+
#include"catalog/pg_largeobject.h"
22+
#include"miscadmin.h"
23+
#include"utils/builtins.h"
24+
#include"utils/fmgroids.h"
25+
26+
27+
/*
28+
* Create a large object having the given LO identifier.
29+
*
30+
* We do this by inserting an empty first page, so that the object will
31+
* appear to exist with size 0. Note that the unique index will reject
32+
* an attempt to create a duplicate page.
33+
*
34+
* Return value is OID assigned to the page tuple (any use in it?)
35+
*/
36+
Oid
37+
LargeObjectCreate(Oidloid)
38+
{
39+
Oidretval;
40+
Relationpg_largeobject;
41+
HeapTuplentup;
42+
Relationidescs[Num_pg_largeobject_indices];
43+
Datumvalues[Natts_pg_largeobject];
44+
charnulls[Natts_pg_largeobject];
45+
inti;
46+
47+
pg_largeobject=heap_openr(LargeObjectRelationName,RowExclusiveLock);
48+
49+
/*
50+
* Form new tuple
51+
*/
52+
for (i=0;i<Natts_pg_largeobject;i++)
53+
{
54+
values[i]= (Datum)NULL;
55+
nulls[i]=' ';
56+
}
57+
58+
i=0;
59+
values[i++]=ObjectIdGetDatum(loid);
60+
values[i++]=Int32GetDatum(0);
61+
values[i++]=DirectFunctionCall1(byteain,
62+
CStringGetDatum(""));
63+
64+
ntup=heap_formtuple(pg_largeobject->rd_att,values,nulls);
65+
66+
/*
67+
* Insert it
68+
*/
69+
retval=heap_insert(pg_largeobject,ntup);
70+
71+
/*
72+
* Update indices
73+
*/
74+
if (!IsIgnoringSystemIndexes())
75+
{
76+
CatalogOpenIndices(Num_pg_largeobject_indices,Name_pg_largeobject_indices,idescs);
77+
CatalogIndexInsert(idescs,Num_pg_largeobject_indices,pg_largeobject,ntup);
78+
CatalogCloseIndices(Num_pg_largeobject_indices,idescs);
79+
}
80+
81+
heap_close(pg_largeobject,RowExclusiveLock);
82+
83+
heap_freetuple(ntup);
84+
85+
returnretval;
86+
}
87+
88+
void
89+
LargeObjectDrop(Oidloid)
90+
{
91+
boolfound= false;
92+
Relationpg_largeobject;
93+
Relationpg_lo_idx;
94+
ScanKeyDataskey[1];
95+
IndexScanDescsd;
96+
RetrieveIndexResultindexRes;
97+
HeapTupleDatatuple;
98+
Bufferbuffer;
99+
100+
ScanKeyEntryInitialize(&skey[0],
101+
(bits16)0x0,
102+
(AttrNumber)1,
103+
(RegProcedure)F_OIDEQ,
104+
ObjectIdGetDatum(loid));
105+
106+
pg_largeobject=heap_openr(LargeObjectRelationName,RowShareLock);
107+
pg_lo_idx=index_openr(LargeObjectLOidPNIndex);
108+
109+
sd=index_beginscan(pg_lo_idx, false,1,skey);
110+
111+
tuple.t_datamcxt=CurrentMemoryContext;
112+
tuple.t_data=NULL;
113+
114+
while ((indexRes=index_getnext(sd,ForwardScanDirection)))
115+
{
116+
tuple.t_self=indexRes->heap_iptr;
117+
heap_fetch(pg_largeobject,SnapshotNow,&tuple,&buffer);
118+
pfree(indexRes);
119+
if (tuple.t_data!=NULL)
120+
{
121+
heap_delete(pg_largeobject,&tuple.t_self,NULL);
122+
ReleaseBuffer(buffer);
123+
found= true;
124+
}
125+
}
126+
127+
index_endscan(sd);
128+
129+
index_close(pg_lo_idx);
130+
heap_close(pg_largeobject,RowShareLock);
131+
132+
if (!found)
133+
elog(ERROR,"LargeObjectDrop: large object %u not found",loid);
134+
}
135+
136+
bool
137+
LargeObjectExists(Oidloid)
138+
{
139+
boolretval= false;
140+
Relationpg_largeobject;
141+
Relationpg_lo_idx;
142+
ScanKeyDataskey[1];
143+
IndexScanDescsd;
144+
RetrieveIndexResultindexRes;
145+
HeapTupleDatatuple;
146+
Bufferbuffer;
147+
148+
/*
149+
* See if we can find any tuples belonging to the specified LO
150+
*/
151+
ScanKeyEntryInitialize(&skey[0],
152+
(bits16)0x0,
153+
(AttrNumber)1,
154+
(RegProcedure)F_OIDEQ,
155+
ObjectIdGetDatum(loid));
156+
157+
pg_largeobject=heap_openr(LargeObjectRelationName,RowShareLock);
158+
pg_lo_idx=index_openr(LargeObjectLOidPNIndex);
159+
160+
sd=index_beginscan(pg_lo_idx, false,1,skey);
161+
162+
tuple.t_datamcxt=CurrentMemoryContext;
163+
tuple.t_data=NULL;
164+
165+
while ((indexRes=index_getnext(sd,ForwardScanDirection)))
166+
{
167+
tuple.t_self=indexRes->heap_iptr;
168+
heap_fetch(pg_largeobject,SnapshotNow,&tuple,&buffer);
169+
pfree(indexRes);
170+
if (tuple.t_data!=NULL)
171+
{
172+
retval= true;
173+
ReleaseBuffer(buffer);
174+
break;
175+
}
176+
}
177+
178+
index_endscan(sd);
179+
180+
index_close(pg_lo_idx);
181+
heap_close(pg_largeobject,RowShareLock);
182+
183+
returnretval;
184+
}

0 commit comments

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