Skip to content

Commit c96581a

Browse files
committed
Fix inconsistencies and typos in the tree, take 11
This fixes various typos in docs and comments, and removes some orphaned definitions. Author: Alexander Lakhin Discussion: https://postgr.es/m/5da8e325-c665-da95-21e0-c8a99ea61fbf@gmail.com
1 parent 927f34c commit c96581a

File tree

48 files changed

+60
-65
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+60
-65
lines changed

contrib/hstore/hstore_op.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,8 @@ hstore_slice_to_hstore(PG_FUNCTION_ARGS)
682682
}
683683

684684
/*
685-
* we don't use uniquePairs here because we know that the pairs list is
686-
* already sorted and uniq'ed.
685+
* we don't use hstoreUniquePairs here because we know that the pairs list
686+
* is already sorted and uniq'ed.
687687
*/
688688

689689
out = hstorePairs(out_pairs, out_count, bufsiz);

doc/src/sgml/func.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2875,7 +2875,7 @@
28752875
</row>
28762876

28772877
<row>
2878-
<entry><literal>tcvn_to_utf8</literal></entry>
2878+
<entry><literal>windows_1258_to_utf8</literal></entry>
28792879
<entry><literal>WIN1258</literal></entry>
28802880
<entry><literal>UTF8</literal></entry>
28812881
</row>
@@ -3037,7 +3037,7 @@
30373037
</row>
30383038

30393039
<row>
3040-
<entry><literal>utf8_to_tcvn</literal></entry>
3040+
<entry><literal>utf8_to_windows_1258</literal></entry>
30413041
<entry><literal>UTF8</literal></entry>
30423042
<entry><literal>WIN1258</literal></entry>
30433043
</row>

doc/src/sgml/gist.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,8 @@ my_picksplit(PG_FUNCTION_ARGS)
697697

698698
/*
699699
* Choose where to put the index entries and update unionL and unionR
700-
* accordingly. Append the entries to either v_spl_left or
701-
* v_spl_right, and care about the counters.
700+
* accordingly. Append the entries to either v-&gt;spl_left or
701+
* v-&gt;spl_right, and care about the counters.
702702
*/
703703

704704
if (my_choice_is_left(unionL, curl, unionR, curr))

src/backend/access/heap/tuptoaster.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
#include "utils/typcache.h"
4545

4646

47-
#undef TOAST_DEBUG
48-
4947
/*
5048
* The information at the start of the compressed toast data.
5149
*/

src/backend/access/transam/varsup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ ForceTransactionIdLimitUpdate(void)
488488
if (!TransactionIdIsValid(xidVacLimit))
489489
return true; /* this shouldn't happen anymore either */
490490
if (TransactionIdFollowsOrEquals(nextXid, xidVacLimit))
491-
return true; /* past VacLimit, don't delay updating */
491+
return true; /* past xidVacLimit, don't delay updating */
492492
if (!SearchSysCacheExists1(DATABASEOID, ObjectIdGetDatum(oldestXidDB)))
493493
return true; /* could happen, per comments above */
494494
return false;

src/backend/access/transam/xact.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ int synchronous_commit = SYNCHRONOUS_COMMIT_ON;
9292
* in the user backend, so we need some additional bookkeeping.
9393
*
9494
* XactTopFullTransactionId stores the XID of our toplevel transaction, which
95-
* will be the same as TopTransactionState.fullTransactionId in an ordinary
96-
* backend; but in a parallel backend, which does not have the entire
95+
* will be the same as TopTransactionStateData.fullTransactionId in an
96+
* ordinary backend; but in a parallel backend, which does not have the entire
9797
* transaction state, it will instead be copied from the backend that started
9898
* the parallel operation.
9999
*

src/backend/access/transam/xlog.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ typedef struct XLogCtlData
626626

627627
/*
628628
* These values do not change after startup, although the pointed-to pages
629-
* and xlblocks values certainly do. xlblock values are protected by
629+
* and xlblocks values certainly do. xlblocks values are protected by
630630
* WALBufMappingLock.
631631
*/
632632
char *pages; /* buffers for unwritten XLOG pages */
@@ -743,7 +743,7 @@ static ControlFileData *ControlFile = NULL;
743743
*/
744744
#define UsableBytesInPage (XLOG_BLCKSZ - SizeOfXLogShortPHD)
745745

746-
/* Convert min_wal_size_mb and max wal_size_mb to equivalent segment count */
746+
/* Convert min_wal_size_mb and max_wal_size_mb to equivalent segment count */
747747
#define ConvertToXSegs(x, segsize) \
748748
(x / ((segsize) / (1024 * 1024)))
749749

@@ -903,7 +903,7 @@ static XLogRecord *ReadRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr,
903903
int emode, bool fetching_ckpt);
904904
static void CheckRecoveryConsistency(void);
905905
static XLogRecord *ReadCheckpointRecord(XLogReaderState *xlogreader,
906-
XLogRecPtr RecPtr, int whichChkpti, bool report);
906+
XLogRecPtr RecPtr, int whichChkpt, bool report);
907907
static bool rescanLatestTimeLine(void);
908908
static void WriteControlFile(void);
909909
static void ReadControlFile(void);
@@ -3049,9 +3049,9 @@ XLogBackgroundFlush(void)
30493049
else if (TimestampDifferenceExceeds(lastflush, now, WalWriterDelay))
30503050
{
30513051
/*
3052-
* Flush the writes at least every WalWriteDelay ms. This is important
3053-
* to bound the amount of time it takes for an asynchronous commit to
3054-
* hit disk.
3052+
* Flush the writes at least every WalWriterDelay ms. This is
3053+
* important to bound the amount of time it takes for an asynchronous
3054+
* commit to hit disk.
30553055
*/
30563056
WriteRqst.Flush = WriteRqst.Write;
30573057
lastflush = now;
@@ -8442,7 +8442,7 @@ LogCheckpointEnd(bool restartpoint)
84428442
* Update the estimate of distance between checkpoints.
84438443
*
84448444
* The estimate is used to calculate the number of WAL segments to keep
8445-
* preallocated, see XLOGFileSlop().
8445+
* preallocated, see XLOGfileslop().
84468446
*/
84478447
static void
84488448
UpdateCheckPointDistanceEstimate(uint64 nbytes)

src/backend/access/transam/xlogfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ pg_stop_backup_v2(PG_FUNCTION_ARGS)
267267
values[0] = LSNGetDatum(stoppoint);
268268

269269
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
270-
tuplestore_donestoring(typstore);
270+
tuplestore_donestoring(tupstore);
271271

272272
return (Datum) 0;
273273
}

src/backend/access/transam/xlogutils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ XLogReadBufferExtended(RelFileNode rnode, ForkNumber forknum,
523523
}
524524

525525
/*
526-
* Struct actually returned by XLogFakeRelcacheEntry, though the declared
526+
* Struct actually returned by CreateFakeRelcacheEntry, though the declared
527527
* return type is Relation.
528528
*/
529529
typedef struct

src/backend/commands/vacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ get_all_vacuum_rels(int options)
863863
* DEAD or RECENTLY_DEAD (see HeapTupleSatisfiesVacuum).
864864
* - freezeLimit is the Xid below which all Xids are replaced by
865865
* FrozenTransactionId during vacuum.
866-
* - xidFullScanLimit (computed from table_freeze_age parameter)
866+
* - xidFullScanLimit (computed from freeze_table_age parameter)
867867
* represents a minimum Xid value; a table whose relfrozenxid is older than
868868
* this will have a full-table vacuum applied to it, to freeze tuples across
869869
* the whole table. Vacuuming a table younger than this value can use a

0 commit comments

Comments
 (0)