I neglected many comments in the log+seg -> 64-bit segno patch. Fix.

hlinnaka · hlinnaka · commit ec786c6c81bf · 2012-06-27T17:53:53.000+03:00
Reported by Amit Kapila.
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -2479,7 +2479,7 @@ XLogFileInit(XLogSegNo logsegno, bool *use_existent, bool use_lock)
 /*
  * Create a new XLOG file segment by copying a pre-existing one.
  *
- * log, seg: identify segment to be created.
+ * destsegno: identify segment to be created.
  *
  * srcTLI, srclog, srcseg: identify segment to be copied (could be from
  *		a different timeline)
@@ -2582,8 +2582,8 @@ XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno)
  * This is used both to install a newly-created segment (which has a temp
  * filename while it's being created) and to recycle an old segment.
  *
- * *log, *seg: identify segment to install as (or first possible target).
- * When find_free is TRUE, these are modified on return to indicate the
+ * *segno: identify segment to install as (or first possible target).
+ * When find_free is TRUE, this is modified on return to indicate the
  * actual installation location or last segment searched.
  *
  * tmppath: initial name of file to install.  It will be renamed into place.
@@ -3317,7 +3317,7 @@ PreallocXlogFiles(XLogRecPtr endptr)
 }
 
 /*
- * Get the log/seg of the latest removed or recycled WAL segment.
+ * Get the segno of the latest removed or recycled WAL segment.
  * Returns 0/0 if no WAL segments have been removed since startup.
  */
 void
@@ -3332,7 +3332,7 @@ XLogGetLastRemoved(XLogSegNo *segno)
 }
 
 /*
- * Update the last removed log/seg pointer in shared memory, to reflect
+ * Update the last removed segno pointer in shared memory, to reflect
  * that the given XLOG file has been removed.
  */
 static void
@@ -3352,7 +3352,7 @@ UpdateLastRemovedPtr(char *filename)
 }
 
 /*
- * Recycle or remove all log files older or equal to passed log/seg#
+ * Recycle or remove all log files older or equal to passed segno
  *
  * endptr is current (or recent) end of xlog; this is used to determine
  * whether we want to recycle rather than delete no-longer-wanted log files.
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
@@ -68,7 +68,7 @@ walrcv_disconnect_type walrcv_disconnect = NULL;
 #define NAPTIME_PER_CYCLE 100	/* max sleep time between cycles (100ms) */
 
 /*
- * These variables are used similarly to openLogFile/Id/Seg/Off,
+ * These variables are used similarly to openLogFile/SegNo/Off,
  * but for walreceiver to write the XLOG. recvFileTLI is the TimeLineID
  * corresponding the filename of recvFile, used for error messages.
  */

Original file line number	Diff line number	Diff line change
`@@ -2479,7 +2479,7 @@ XLogFileInit(XLogSegNo logsegno, bool *use_existent, bool use_lock)`
`2479`	`2479`	`/*`
`2480`	`2480`	`* Create a new XLOG file segment by copying a pre-existing one.`
`2481`	`2481`	`*`
`2482`		`- * log, seg: identify segment to be created.`
	`2482`	`+ * destsegno: identify segment to be created.`
`2483`	`2483`	`*`
`2484`	`2484`	`* srcTLI, srclog, srcseg: identify segment to be copied (could be from`
`2485`	`2485`	`* a different timeline)`
`@@ -2582,8 +2582,8 @@ XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno)`
`2582`	`2582`	`* This is used both to install a newly-created segment (which has a temp`
`2583`	`2583`	`* filename while it's being created) and to recycle an old segment.`
`2584`	`2584`	`*`
`2585`		`- * log, seg: identify segment to install as (or first possible target).`
`2586`		`- * When find_free is TRUE, these are modified on return to indicate the`
	`2585`	`+ * *segno: identify segment to install as (or first possible target).`
	`2586`	`+ * When find_free is TRUE, this is modified on return to indicate the`
`2587`	`2587`	`* actual installation location or last segment searched.`
`2588`	`2588`	`*`
`2589`	`2589`	`* tmppath: initial name of file to install. It will be renamed into place.`
`@@ -3317,7 +3317,7 @@ PreallocXlogFiles(XLogRecPtr endptr)`
`3317`	`3317`	`}`
`3318`	`3318`
`3319`	`3319`	`/*`
`3320`		`- * Get the log/seg of the latest removed or recycled WAL segment.`
	`3320`	`+ * Get the segno of the latest removed or recycled WAL segment.`
`3321`	`3321`	`* Returns 0/0 if no WAL segments have been removed since startup.`
`3322`	`3322`	`*/`
`3323`	`3323`	`void`
`@@ -3332,7 +3332,7 @@ XLogGetLastRemoved(XLogSegNo *segno)`
`3332`	`3332`	`}`
`3333`	`3333`
`3334`	`3334`	`/*`
`3335`		`- * Update the last removed log/seg pointer in shared memory, to reflect`
	`3335`	`+ * Update the last removed segno pointer in shared memory, to reflect`
`3336`	`3336`	`* that the given XLOG file has been removed.`
`3337`	`3337`	`*/`
`3338`	`3338`	`static void`
`@@ -3352,7 +3352,7 @@ UpdateLastRemovedPtr(char *filename)`
`3352`	`3352`	`}`
`3353`	`3353`
`3354`	`3354`	`/*`
`3355`		`- * Recycle or remove all log files older or equal to passed log/seg#`
	`3355`	`+ * Recycle or remove all log files older or equal to passed segno`
`3356`	`3356`	`*`
`3357`	`3357`	`* endptr is current (or recent) end of xlog; this is used to determine`
`3358`	`3358`	`* whether we want to recycle rather than delete no-longer-wanted log files.`