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

Commit49f2194

Browse files
committed
Fix numerous typos in incremental backup commits.
Apparently, spell check would have been a really good idea.Alexander Lakhin, with a few additions as per an off-list reportfrom Andres Freund.Discussion:http://postgr.es/m/f08f7c60-1ad3-0b57-d580-54b11f07cddf@gmail.com
1 parentba08c10 commit49f2194

File tree

13 files changed

+33
-34
lines changed

13 files changed

+33
-34
lines changed

‎doc/src/sgml/ref/pg_basebackup.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ PostgreSQL documentation
213213

214214
<varlistentry>
215215
<term><option>-i <replaceable class="parameter">old_manifest_file</replaceable></option></term>
216-
<term><option>--incremental=<replaceable class="parameter">old_meanifest_file</replaceable></option></term>
216+
<term><option>--incremental=<replaceable class="parameter">old_manifest_file</replaceable></option></term>
217217
<listitem>
218218
<para>
219219
Performs an <link linkend="backup-incremental-backup">incremental

‎doc/src/sgml/ref/pg_combinebackup.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ PostgreSQL documentation
8383
<listitem>
8484
<para>
8585
The <option>-n</option>/<option>--dry-run</option> option instructs
86-
<command>pg_cominebackup</command> to figure out what would be done
86+
<command>pg_combinebackup</command> to figure out what would be done
8787
without actually creating the target directory or any output files.
8888
It is particularly useful in combination with <option>--debug</option>.
8989
</para>

‎src/backend/backup/basebackup_incremental.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ CreateIncrementalBackupInfo(MemoryContext mcxt)
158158

159159
/*
160160
* Before taking an incremental backup, the caller must supply the backup
161-
* manifest from a prior backup. Each chunk of manifest datarecieved
161+
* manifest from a prior backup. Each chunk of manifest datareceived
162162
* from the client should be passed to this function.
163163
*/
164164
void
@@ -462,7 +462,7 @@ PrepareForIncrementalBackup(IncrementalBackupInfo *ib,
462462
++deadcycles;
463463

464464
/*
465-
* If we've managed to wait for an entire minutewithot the WAL
465+
* If we've managed to wait for an entire minutewithout the WAL
466466
* summarizer absorbing a single WAL record, error out; probably
467467
* something is wrong.
468468
*
@@ -473,7 +473,7 @@ PrepareForIncrementalBackup(IncrementalBackupInfo *ib,
473473
* likely to catch a reasonable number of the things that can go wrong
474474
* in practice (e.g. the summarizer process is completely hung, say
475475
* because somebody hooked up a debugger to it or something) without
476-
* giving up too quickly when thesytem is just slow.
476+
* giving up too quickly when thesystem is just slow.
477477
*/
478478
if (deadcycles >=6)
479479
ereport(ERROR,

‎src/backend/backup/walsummaryfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pg_wal_summary_contents(PG_FUNCTION_ARGS)
9292
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
9393
errmsg("invalid timeline %lld", (long long)raw_tli));
9494

95-
/* Prepare to read the specified WALsummry file. */
95+
/* Prepare to read the specified WALsummary file. */
9696
ws.tli= (TimeLineID)raw_tli;
9797
ws.start_lsn=PG_GETARG_LSN(1);
9898
ws.end_lsn=PG_GETARG_LSN(2);
@@ -143,7 +143,7 @@ pg_wal_summary_contents(PG_FUNCTION_ARGS)
143143
}
144144

145145
/*
146-
* If the limit block is not InvalidBlockNumber, emit anexta row
146+
* If the limit block is not InvalidBlockNumber, emit anextra row
147147
* with that block number and limit_block = true.
148148
*
149149
* There is no point in doing this when the limit_block is

‎src/backend/postmaster/walsummarizer.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ typedef struct
8787
XLogRecPtrpending_lsn;
8888

8989
/*
90-
* This field handles its ownsynchronizaton.
90+
* This field handles its ownsynchronization.
9191
*/
9292
ConditionVariablesummary_file_cv;
9393
}WalSummarizerData;
@@ -117,7 +117,7 @@ static long sleep_quanta = 1;
117117
/*
118118
* The sleep time will always be a multiple of 200ms and will not exceed
119119
* thirty seconds (150 * 200 = 30 * 1000). Note that the timeout here needs
120-
* to besubstntially less than the maximum amount of time for which an
120+
* to besubstantially less than the maximum amount of time for which an
121121
* incremental backup will wait for this process to catch up. Otherwise, an
122122
* incremental backup might time out on an idle system just because we sleep
123123
* for too long.
@@ -212,7 +212,7 @@ WalSummarizerMain(void)
212212
/*
213213
* Within this function, 'current_lsn' and 'current_tli' refer to the
214214
* point from which the next WAL summary file should start. 'exact' is
215-
* true if 'current_lsn' is known to be the start of a WALrecod or WAL
215+
* true if 'current_lsn' is known to be the start of a WALrecord or WAL
216216
* segment, and false if it might be in the middle of a record someplace.
217217
*
218218
* 'switch_lsn' and 'switch_tli', if set, are the LSN at which we need to
@@ -297,7 +297,7 @@ WalSummarizerMain(void)
297297

298298
/*
299299
* Sleep for 10 seconds before attempting to resume operations in
300-
* order to avoidexcessing logging.
300+
* order to avoidexcessive logging.
301301
*
302302
* Many of the likely error conditions are things that will repeat
303303
* every time. For example, if the WAL can't be read or the summary
@@ -449,7 +449,7 @@ GetOldestUnsummarizedLSN(TimeLineID *tli, bool *lsn_is_exact,
449449
returnInvalidXLogRecPtr;
450450

451451
/*
452-
* Unless we need to reset the pending_lsn, weinitally acquire the lock
452+
* Unless we need to reset the pending_lsn, weinitially acquire the lock
453453
* in shared mode and try to fetch the required information. If we acquire
454454
* in shared mode and find that the data structure hasn't been
455455
* initialized, we reacquire the lock in exclusive mode so that we can
@@ -699,7 +699,7 @@ HandleWalSummarizerInterrupts(void)
699699
*
700700
* 'start_lsn' is the point at which we should start summarizing. If this
701701
* value comes from the end LSN of the previous record as returned by the
702-
*xlograder machinery, 'exact' should be true; otherwise, 'exact' should
702+
*xlogreader machinery, 'exact' should be true; otherwise, 'exact' should
703703
* be false, and this function will search forward for the start of a valid
704704
* WAL record.
705705
*
@@ -872,7 +872,7 @@ SummarizeWAL(TimeLineID tli, XLogRecPtr start_lsn, bool exact,
872872
xlogreader->ReadRecPtr >=switch_lsn)
873873
{
874874
/*
875-
*Woops! We've read a record that *starts* after the switch LSN,
875+
*Whoops! We've read a record that *starts* after the switch LSN,
876876
* contrary to our goal of reading only until we hit the first
877877
* record that ends at or after the switch LSN. Pretend we didn't
878878
* read it after all by bailing out of this loop right here,
@@ -1061,7 +1061,7 @@ SummarizeSmgrRecord(XLogReaderState *xlogreader, BlockRefTable *brtab)
10611061
}
10621062

10631063
/*
1064-
* Special handling for WALrecods with RM_XACT_ID.
1064+
* Special handling for WALrecords with RM_XACT_ID.
10651065
*/
10661066
staticvoid
10671067
SummarizeXactRecord(XLogReaderState*xlogreader,BlockRefTable*brtab)
@@ -1116,7 +1116,7 @@ SummarizeXactRecord(XLogReaderState *xlogreader, BlockRefTable *brtab)
11161116
}
11171117

11181118
/*
1119-
* Special handling for WALrecods with RM_XLOG_ID.
1119+
* Special handling for WALrecords with RM_XLOG_ID.
11201120
*/
11211121
staticbool
11221122
SummarizeXlogRecord(XLogReaderState*xlogreader)
@@ -1294,8 +1294,7 @@ summarizer_wait_for_wal(void)
12941294
* sleep time to the minimum, but we don't want a handful of extra WAL
12951295
* records to provoke a strong reaction. We choose to reduce the sleep
12961296
* time by 1 quantum for each page read beyond the first, which is a
1297-
* fairly arbitrary way of trying to be reactive without
1298-
* overrreacting.
1297+
* fairly arbitrary way of trying to be reactive without overreacting.
12991298
*/
13001299
if (pages_read_since_last_sleep>sleep_quanta-1)
13011300
sleep_quanta=1;

‎src/backend/replication/walsender.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ UploadManifest(void)
706706
pq_endmessage_reuse(&buf);
707707
pq_flush();
708708

709-
/*Recieve packets from client until done. */
709+
/*Receive packets from client until done. */
710710
while (HandleUploadManifestPacket(&buf,&offset,ib))
711711
;
712712

@@ -719,7 +719,7 @@ UploadManifest(void)
719719
*
720720
* We assume that MemoryContextDelete and MemoryContextSetParent won't
721721
* fail, and thus we shouldn't end up bailing out of here in such a way as
722-
* to leave danglingpointrs.
722+
* to leave danglingpointers.
723723
*/
724724
if (uploaded_manifest_mcxt!=NULL)
725725
MemoryContextDelete(uploaded_manifest_mcxt);

‎src/bin/pg_combinebackup/pg_combinebackup.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ check_backup_label_files(int n_backups, char **backup_dirs)
454454
* The exact size limit that we impose here doesn't really matter --
455455
* most of what's supposed to be in the file is fixed size and quite
456456
* short. However, the length of the backup_label is limited (at least
457-
* by some parts of the code) toMAXGPATH, so include that value in
457+
* by some parts of the code) toMAXPGPATH, so include that value in
458458
* the maximum length that we tolerate.
459459
*/
460460
slurp_file(fd,pathbuf,buf,10000+MAXPGPATH);
@@ -1192,7 +1192,7 @@ scan_for_existing_tablespaces(char *pathname, cb_options *opt)
11921192
if (!is_absolute_path(link_target))
11931193
pg_fatal("symbolic link \"%s\" is relative",tblspcdir);
11941194

1195-
/*Caonicalize the link target. */
1195+
/*Canonicalize the link target. */
11961196
canonicalize_path(link_target);
11971197

11981198
/*
@@ -1222,7 +1222,7 @@ scan_for_existing_tablespaces(char *pathname, cb_options *opt)
12221222
* we just record the paths within the data directories.
12231223
*/
12241224
snprintf(ts->old_dir,MAXPGPATH,"%s/%s",pg_tblspc,de->d_name);
1225-
snprintf(ts->new_dir,MAXPGPATH,"%s/pg_tblpc/%s",opt->output,
1225+
snprintf(ts->new_dir,MAXPGPATH,"%s/pg_tblspc/%s",opt->output,
12261226
de->d_name);
12271227
ts->in_place= true;
12281228
}

‎src/bin/pg_combinebackup/t/002_compare_backups.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
# It would be much nicer if we could physically compare the data files, but
114114
# that doesn't really work. The contents of the page hole aren't guaranteed to
115115
# be identical, and there can be other discrepancies as well. To make this work
116-
# we'd need the equivalent of each AM's rm_maskfuncton written or at least
116+
# we'd need the equivalent of each AM's rm_maskfunction written or at least
117117
# callable from Perl, and that doesn't seem practical.
118118
#
119119
# NB: We're just using the primary's backup directory for scratch space here.

‎src/bin/pg_combinebackup/t/004_manifest.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ sub combine_and_test_one_backup
6969
slurp_file($node->backup_dir .'/csum_none/backup_manifest');
7070
my$nocsum_count = (() =$nocsum_manifest =~/Checksum-Algorithm/mig);
7171
is($nocsum_count, 0,
72-
"Checksum_Algorithm is not mentioned in no-checksum manifest");
72+
"Checksum-Algorithm is not mentioned in no-checksum manifest");
7373

7474
# OK, that's all.
7575
done_testing();

‎src/bin/pg_combinebackup/write_manifest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ flush_manifest(manifest_writer *mwriter)
272272
}
273273

274274
/*
275-
* Encode bytes using twohexademical digits for each one.
275+
* Encode bytes using twohexadecimal digits for each one.
276276
*/
277277
staticsize_t
278278
hex_encode(constuint8*src,size_tlen,char*dst)

‎src/common/blkreftable.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ typedef uint16 *BlockRefTableChunk;
100100
* 'chunk_size' is an array storing the allocated size of each chunk.
101101
*
102102
* 'chunk_usage' is an array storing the number of elements used in each
103-
* chunk. If that value is less than MAX_ENTRIES_PER_CHUNK, thecorresonding
103+
* chunk. If that value is less than MAX_ENTRIES_PER_CHUNK, thecorresponding
104104
* chunk is used as an array; else the corresponding chunk is used as a bitmap.
105105
* When used as a bitmap, the least significant bit of the first array element
106106
* is the status of the lowest-numbered block covered by this chunk.
@@ -183,7 +183,7 @@ typedef struct BlockRefTableBuffer
183183
* table reference file from disk.
184184
*
185185
* total_chunks means the number of chunks for the RelFileLocator/ForkNumber
186-
* combination that iscurently being read, and consumed_chunks is the number
186+
* combination that iscurrently being read, and consumed_chunks is the number
187187
* of those that have been read. (We always read all the information for
188188
* a single chunk at one time, so we don't need to be able to represent the
189189
* state where a chunk has been partially read.)
@@ -567,7 +567,7 @@ WriteBlockRefTable(BlockRefTable *brtab,
567567
* malformed. This is not used for I/O errors, which must be handled internally
568568
* by read_callback.
569569
*
570-
* 'error_callback_arg' is an opaquearguent to be passed to error_callback.
570+
* 'error_callback_arg' is an opaqueargument to be passed to error_callback.
571571
*/
572572
BlockRefTableReader*
573573
CreateBlockRefTableReader(io_callback_fnread_callback,
@@ -922,7 +922,7 @@ BlockRefTableEntrySetLimitBlock(BlockRefTableEntry *entry,
922922

923923
/*
924924
* Next, we need to discard any offsets within the chunk that would
925-
* contain the limit_block. We must handle thisdifferenly depending on
925+
* contain the limit_block. We must handle thisdifferently depending on
926926
* whether the chunk that would contain limit_block is a bitmap or an
927927
* array of offsets.
928928
*/
@@ -955,7 +955,7 @@ BlockRefTableEntrySetLimitBlock(BlockRefTableEntry *entry,
955955
}
956956

957957
/*
958-
* Mark a block in a givenBlkRefTableEntry as known to have been modified.
958+
* Mark a block in a givenBlockRefTableEntry as known to have been modified.
959959
*/
960960
void
961961
BlockRefTableEntryMarkBlockModified(BlockRefTableEntry*entry,
@@ -1112,7 +1112,7 @@ BlockRefTableEntryMarkBlockModified(BlockRefTableEntry *entry,
11121112
}
11131113

11141114
/*
1115-
* Release memory for aBlockRefTablEntry that was created by
1115+
* Release memory for aBlockRefTableEntry that was created by
11161116
* CreateBlockRefTableEntry.
11171117
*/
11181118
void

‎src/include/catalog/catversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@
5757
*/
5858

5959
/*yyyymmddN */
60-
#defineCATALOG_VERSION_NO202312071
60+
#defineCATALOG_VERSION_NO202312211
6161

6262
#endif

‎src/include/catalog/pg_proc.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12109,7 +12109,7 @@
1210912109
proargnames => '{tli,start_lsn,end_lsn}',
1211012110
prosrc => 'pg_available_wal_summaries' },
1211112111
{ oid => '8437',
12112-
descr => 'contents of a WALsumamry file',
12112+
descr => 'contents of a WALsummary file',
1211312113
proname => 'pg_wal_summary_contents', prorows => '100',
1211412114
proretset => 't', provolatile => 'v', proparallel => 's',
1211512115
prorettype => 'record', proargtypes => 'int8 pg_lsn pg_lsn',

0 commit comments

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