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

Commitfdf07fe

Browse files
committed
For consistency with the rest of PostgreSQL, rename BLOBs to large objects
in messages and documentation.
1 parent196700c commitfdf07fe

File tree

8 files changed

+56
-56
lines changed

8 files changed

+56
-56
lines changed

‎doc/src/sgml/ref/pg_dump.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.36 2001/09/03 12:57:50 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.37 2001/09/21 21:58:29 petere Exp $
33
Postgres documentation
44
-->
55

@@ -144,7 +144,7 @@ Postgres documentation
144144
<term>--blobs</term>
145145
<listitem>
146146
<para>
147-
Dump data and <acronym>BLOB</acronym> data.
147+
Include large objects in dump.
148148
</para>
149149
</listitem>
150150
</varlistentry>
@@ -616,17 +616,17 @@ connectDBStart() -- connect() failed: No such file or directory
616616
</para>
617617

618618
<para>
619-
To dump a database called mydb that contains
620-
<acronym>BLOB</acronym>s to a <filename>tar</filename> file:
619+
To dump a database called<literal>mydb</> that contains
620+
large objects to a <filename>tar</filename> file:
621621

622622
<screen>
623623
<prompt>$</prompt> <userinput>pg_dump -Ft -b mydb &gt; db.tar</userinput>
624624
</screen>
625625
</para>
626626

627627
<para>
628-
To reload this database (with<acronym>BLOB</acronym>s) to an
629-
existing database called newdb:
628+
To reload this database (withlarge objects) to an
629+
existing database called<literal>newdb</>:
630630

631631
<screen>
632632
<prompt>$</prompt> <userinput>pg_restore -d newdb db.tar</userinput>

‎doc/src/sgml/ref/pg_restore.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.16 2001/09/13 15:55:24 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.17 2001/09/21 21:58:30 petere Exp $ -->
22

33
<refentry id="APP-PGRESTORE">
44
<docinfo>
@@ -213,7 +213,7 @@
213213
<listitem>
214214
<para>
215215
Connect to database <replaceable class="parameter">dbname</replaceable> and restore
216-
directly into the database.BLOBs can only be restored by using a direct database connection.
216+
directly into the database.Large objects can only be restored by using a direct database connection.
217217
</para>
218218
</listitem>
219219
</varlistentry>
@@ -585,8 +585,8 @@ connectDBStart() -- connect() failed: No such file or directory
585585

586586
<listitem>
587587
<para>
588-
<command>pg_restore</command> will not restoreBLOBs for a single table. If
589-
an archive containsBLOBs, then allBLOBs will be restored.
588+
<command>pg_restore</command> will not restorelarge objects for a single table. If
589+
an archive containslarge objects, then alllarge objects will be restored.
590590
</para>
591591
</listitem>
592592

@@ -620,17 +620,17 @@ connectDBStart() -- connect() failed: No such file or directory
620620
</para>
621621

622622
<para>
623-
To dump a database called mydb that contains
624-
<acronym>BLOB</acronym>s to a <filename>tar</filename> file:
623+
To dump a database called<literal>mydb</> that contains
624+
large objects to a <filename>tar</filename> file:
625625

626626
<screen>
627627
<prompt>$</prompt> <userinput>pg_dump -Ft -b mydb &gt; db.tar</userinput>
628628
</screen>
629629
</para>
630630

631631
<para>
632-
To reload this database (with<acronym>BLOB</acronym>s) to an
633-
existing database called newdb:
632+
To reload this database (withlarge objects) to an
633+
existing database called<literal>newdb</>:
634634

635635
<screen>
636636
<prompt>$</prompt> <userinput>pg_restore -d newdb db.tar</userinput>

‎src/bin/pg_dump/pg_backup_archiver.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*
1717
* IDENTIFICATION
18-
*$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.32 2001/08/22 20:23:23 petere Exp $
18+
*$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.33 2001/09/21 21:58:30 petere Exp $
1919
*
2020
* Modifications - 28-Jun-2000 - pjw@rhyme.com.au
2121
*
@@ -333,7 +333,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
333333
* warnings.
334334
*/
335335
if (!AH->CustomOutPtr)
336-
write_msg(modulename,"WARNING: skippingBLOB restoration\n");
336+
write_msg(modulename,"WARNING: skippinglarge object restoration\n");
337337

338338
}
339339
else
@@ -398,12 +398,12 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
398398

399399
if ((reqs&2)!=0)/* We loaded the data */
400400
{
401-
ahlog(AH,1,"fixing upBLOBreference for %s\n",te->name);
401+
ahlog(AH,1,"fixing uplarge object cross-reference for %s\n",te->name);
402402
FixupBlobRefs(AH,te->name);
403403
}
404404
}
405405
else
406-
ahlog(AH,2,"ignoringBLOB cross-references for %s %s\n",te->desc,te->name);
406+
ahlog(AH,2,"ignoringlarge object cross-references for %s %s\n",te->desc,te->name);
407407

408408
te=te->next;
409409
}
@@ -717,7 +717,7 @@ StartBlob(Archive *AHX, Oid oid)
717717
ArchiveHandle*AH= (ArchiveHandle*)AHX;
718718

719719
if (!AH->StartBlobPtr)
720-
die_horribly(AH,modulename,"BLOB output not supported in chosen format\n");
720+
die_horribly(AH,modulename,"large object output not supported in chosen format\n");
721721

722722
(*AH->StartBlobPtr) (AH,AH->currToc,oid);
723723

@@ -757,14 +757,14 @@ EndRestoreBlobs(ArchiveHandle *AH)
757757
{
758758
if (AH->txActive)
759759
{
760-
ahlog(AH,2,"committingBLOB transactions\n");
760+
ahlog(AH,2,"committinglarge object transactions\n");
761761
CommitTransaction(AH);
762762
}
763763

764764
if (AH->blobTxActive)
765765
CommitTransactionXref(AH);
766766

767-
ahlog(AH,1,"restored %dBLOBs\n",AH->blobCount);
767+
ahlog(AH,1,"restored %dlarge objects\n",AH->blobCount);
768768
}
769769

770770

@@ -781,7 +781,7 @@ StartRestoreBlob(ArchiveHandle *AH, Oid oid)
781781
if (!AH->createdBlobXref)
782782
{
783783
if (!AH->connection)
784-
die_horribly(AH,modulename,"cannot restoreBLOBs without a database connection\n");
784+
die_horribly(AH,modulename,"cannot restorelarge objects without a database connection\n");
785785

786786
CreateBlobXrefTable(AH);
787787
AH->createdBlobXref=1;
@@ -792,23 +792,23 @@ StartRestoreBlob(ArchiveHandle *AH, Oid oid)
792792
*/
793793
if (!AH->txActive)
794794
{
795-
ahlog(AH,2,"startingBLOB transactions\n");
795+
ahlog(AH,2,"startinglarge object transactions\n");
796796
StartTransaction(AH);
797797
}
798798
if (!AH->blobTxActive)
799799
StartTransactionXref(AH);
800800

801801
loOid=lo_creat(AH->connection,INV_READ |INV_WRITE);
802802
if (loOid==0)
803-
die_horribly(AH,modulename,"could not createBLOB\n");
803+
die_horribly(AH,modulename,"could not createlarge object\n");
804804

805-
ahlog(AH,2,"restoringBLOB oid %u as %u\n",oid,loOid);
805+
ahlog(AH,2,"restoringlarge object with oid %u as %u\n",oid,loOid);
806806

807807
InsertBlobXref(AH,oid,loOid);
808808

809809
AH->loFd=lo_open(AH->connection,loOid,INV_WRITE);
810810
if (AH->loFd==-1)
811-
die_horribly(AH,modulename,"could not openBLOB\n");
811+
die_horribly(AH,modulename,"could not openlarge object\n");
812812

813813
AH->writingBlob=1;
814814
}
@@ -824,7 +824,7 @@ EndRestoreBlob(ArchiveHandle *AH, Oid oid)
824824
*/
825825
if (((AH->blobCount /BLOB_BATCH_SIZE)*BLOB_BATCH_SIZE)==AH->blobCount)
826826
{
827-
ahlog(AH,2,"committingBLOB transactions\n");
827+
ahlog(AH,2,"committinglarge object transactions\n");
828828
CommitTransaction(AH);
829829
CommitTransactionXref(AH);
830830
}
@@ -1198,7 +1198,7 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
11981198
if (AH->writingBlob)
11991199
{
12001200
res=lo_write(AH->connection,AH->loFd, (void*)ptr,size*nmemb);
1201-
ahlog(AH,5,"wrote %d bytes ofBLOB data (result = %d)\n",size*nmemb,res);
1201+
ahlog(AH,5,"wrote %d bytes oflarge object data (result = %d)\n",size*nmemb,res);
12021202
if (res<size*nmemb)
12031203
die_horribly(AH,modulename,"could not write to large object (result: %d, expected: %d)\n",
12041204
res,size*nmemb);

‎src/bin/pg_dump/pg_backup_custom.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*
2121
* IDENTIFICATION
22-
*$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.14 2001/08/19 22:17:03 petere Exp $
22+
*$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.15 2001/09/21 21:58:30 petere Exp $
2323
*
2424
* Modifications - 28-Jun-2000 - pjw@rhyme.com.au
2525
*
@@ -386,7 +386,7 @@ static void
386386
_StartBlob(ArchiveHandle*AH,TocEntry*te,Oidoid)
387387
{
388388
if (oid==0)
389-
die_horribly(AH,modulename,"invalid OID forBLOB\n");
389+
die_horribly(AH,modulename,"invalid OID forlarge object\n");
390390

391391
WriteInt(AH,oid);
392392
_StartDataCompressor(AH,te);
@@ -503,7 +503,7 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt)
503503
caseBLK_BLOBS:
504504

505505
if (!AH->connection)
506-
die_horribly(AH,modulename,"BLOBs cannot be loaded without a database connection\n");
506+
die_horribly(AH,modulename,"large objects cannot be loaded without a database connection\n");
507507

508508
_LoadBlobs(AH);
509509
break;

‎src/bin/pg_dump/pg_backup_db.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*Implements the basic DB functions used by the archiver.
66
*
77
* IDENTIFICATION
8-
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.25 2001/09/17 02:07:51 inoue Exp $
8+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.26 2001/09/21 21:58:30 petere Exp $
99
*
1010
* NOTES
1111
*
@@ -738,7 +738,7 @@ FixupBlobRefs(ArchiveHandle *AH, char *tablename)
738738
{
739739
attr=PQgetvalue(res,i,0);
740740

741-
ahlog(AH,1,"fixingBLOB cross-references for %s.%s\n",tablename,attr);
741+
ahlog(AH,1,"fixinglarge object cross-references for %s.%s\n",tablename,attr);
742742

743743
resetPQExpBuffer(tblQry);
744744

@@ -785,16 +785,16 @@ CreateBlobXrefTable(ArchiveHandle *AH)
785785
if (!AH->blobConnection)
786786
AH->blobConnection=_connectDB(AH,NULL,NULL);
787787

788-
ahlog(AH,1,"creating table forBLOB cross-references\n");
788+
ahlog(AH,1,"creating table forlarge object cross-references\n");
789789

790790
appendPQExpBuffer(qry,"Create Temporary Table %s(oldOid oid, newOid oid);",BLOB_XREF_TABLE);
791791

792-
ExecuteSqlCommand(AH,qry,"could not createBLOB crossreference table", true);
792+
ExecuteSqlCommand(AH,qry,"could not createlarge object cross-reference table", true);
793793

794794
resetPQExpBuffer(qry);
795795

796796
appendPQExpBuffer(qry,"Create Unique Index %s_ix on %s(oldOid)",BLOB_XREF_TABLE,BLOB_XREF_TABLE);
797-
ExecuteSqlCommand(AH,qry,"could not create index onBLOB crossreference table", true);
797+
ExecuteSqlCommand(AH,qry,"could not create index onlarge object cross-reference table", true);
798798

799799
destroyPQExpBuffer(qry);
800800
}
@@ -806,7 +806,7 @@ InsertBlobXref(ArchiveHandle *AH, int old, int new)
806806

807807
appendPQExpBuffer(qry,"Insert Into %s(oldOid, newOid) Values (%d, %d);",BLOB_XREF_TABLE,old,new);
808808

809-
ExecuteSqlCommand(AH,qry,"could not createBLOB crossreference entry", true);
809+
ExecuteSqlCommand(AH,qry,"could not createlarge object cross-reference entry", true);
810810

811811
destroyPQExpBuffer(qry);
812812
}
@@ -832,7 +832,7 @@ StartTransactionXref(ArchiveHandle *AH)
832832
appendPQExpBuffer(qry,"Begin;");
833833

834834
ExecuteSqlCommand(AH,qry,
835-
"could not start transaction forBLOB crossreferences", true);
835+
"could not start transaction forlarge object cross-references", true);
836836
AH->blobTxActive= true;
837837

838838
destroyPQExpBuffer(qry);
@@ -858,7 +858,7 @@ CommitTransactionXref(ArchiveHandle *AH)
858858

859859
appendPQExpBuffer(qry,"Commit;");
860860

861-
ExecuteSqlCommand(AH,qry,"could not commit transaction forBLOB crossreferences", true);
861+
ExecuteSqlCommand(AH,qry,"could not commit transaction forlarge object cross-references", true);
862862
AH->blobTxActive= false;
863863

864864
destroyPQExpBuffer(qry);

‎src/bin/pg_dump/pg_backup_files.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
*
2222
* IDENTIFICATION
23-
*$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.12 2001/07/03 20:21:48 petere Exp $
23+
*$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.13 2001/09/2121:58:30 petere Exp $
2424
*
2525
* Modifications - 28-Jun-2000 - pjw@rhyme.com.au
2626
*
@@ -363,7 +363,7 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
363363
ctx->blobToc=fopen("blobs.toc",PG_BINARY_R);
364364

365365
if (ctx->blobToc==NULL)
366-
die_horribly(AH,modulename,"could not openBLOB TOC for input: %s\n",strerror(errno));
366+
die_horribly(AH,modulename,"could not openlarge object TOC for input: %s\n",strerror(errno));
367367

368368
_getBlobTocEntry(AH,&oid,fname);
369369

@@ -376,7 +376,7 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
376376
}
377377

378378
if (fclose(ctx->blobToc)!=0)
379-
die_horribly(AH,modulename,"could not closeBLOB TOC file: %s\n",strerror(errno));
379+
die_horribly(AH,modulename,"could not closelarge object TOC file: %s\n",strerror(errno));
380380

381381
EndRestoreBlobs(AH);
382382
}
@@ -474,7 +474,7 @@ _StartBlobs(ArchiveHandle *AH, TocEntry *te)
474474

475475
if (ctx->blobToc==NULL)
476476
die_horribly(AH,modulename,
477-
"could not openBLOB TOC for output: %s\n",strerror(errno));
477+
"could not openlarge object TOC for output: %s\n",strerror(errno));
478478

479479
}
480480

@@ -495,7 +495,7 @@ _StartBlob(ArchiveHandle *AH, TocEntry *te, Oid oid)
495495
char*sfx;
496496

497497
if (oid==0)
498-
die_horribly(AH,modulename,"invalid OID forBLOB (%u)\n",oid);
498+
die_horribly(AH,modulename,"invalid OID forlarge object (%u)\n",oid);
499499

500500
if (AH->compression!=0)
501501
sfx=".gz";
@@ -514,7 +514,7 @@ _StartBlob(ArchiveHandle *AH, TocEntry *te, Oid oid)
514514
#endif
515515

516516
if (tctx->FH==NULL)
517-
die_horribly(AH,modulename,"could not openBLOB file\n");
517+
die_horribly(AH,modulename,"could not openlarge object file\n");
518518
}
519519

520520
/*
@@ -529,7 +529,7 @@ _EndBlob(ArchiveHandle *AH, TocEntry *te, Oid oid)
529529
lclTocEntry*tctx= (lclTocEntry*)te->formatData;
530530

531531
if (GZCLOSE(tctx->FH)!=0)
532-
die_horribly(AH,modulename,"could not closeBLOB file\n");
532+
die_horribly(AH,modulename,"could not closelarge object file\n");
533533
}
534534

535535
/*
@@ -547,7 +547,7 @@ _EndBlobs(ArchiveHandle *AH, TocEntry *te)
547547
/* WriteInt(AH, 0); */
548548

549549
if (fclose(ctx->blobToc)!=0)
550-
die_horribly(AH,modulename,"could not closeBLOB TOC file: %s\n",strerror(errno));
550+
die_horribly(AH,modulename,"could not closelarge object TOC file: %s\n",strerror(errno));
551551

552552
}
553553

‎src/bin/pg_dump/pg_backup_tar.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*
1818
* IDENTIFICATION
19-
*$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.17 2001/07/03 20:21:48 petere Exp $
19+
*$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.18 2001/09/2121:58:30 petere Exp $
2020
*
2121
* Modifications - 28-Jun-2000 - pjw@rhyme.com.au
2222
*
@@ -715,7 +715,7 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
715715

716716
if (strncmp(th->targetFile,"blob_",5)==0&&oid!=0)
717717
{
718-
ahlog(AH,1,"restoringBLOB oid %u\n",oid);
718+
ahlog(AH,1,"restoringlarge object OID %u\n",oid);
719719

720720
StartRestoreBlob(AH,oid);
721721

@@ -911,7 +911,7 @@ _StartBlob(ArchiveHandle *AH, TocEntry *te, Oid oid)
911911
char*sfx;
912912

913913
if (oid==0)
914-
die_horribly(AH,modulename,"invalid OID forBLOB (%u)\n",oid);
914+
die_horribly(AH,modulename,"invalid OID forlarge object (%u)\n",oid);
915915

916916
if (AH->compression!=0)
917917
sfx=".gz";

0 commit comments

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