diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2012-06-24 18:51:37 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2012-06-24 19:19:45 +0300 |
| commit | 0ab9d1c4b31622e9176472b4276f3e9831e3d6ba (patch) | |
| tree | b8e9e5337338ba3010e00af50e1a33adb906a212 /src/backend/postmaster/checkpointer.c | |
| parent | 061e7efb1b4c5b8a5d02122b7780531b8d5bf23d (diff) | |
| download | postgresql-0ab9d1c4b31622e9176472b4276f3e9831e3d6ba.tar.gz postgresql-0ab9d1c4b31622e9176472b4276f3e9831e3d6ba.zip | |
Replace XLogRecPtr struct with a 64-bit integer.
This simplifies code that needs to do arithmetic on XLogRecPtrs.
To avoid changing on-disk format of data pages, the LSN on data pages is
still stored in the old format. That should keep pg_upgrade happy. However,
we have XLogRecPtrs embedded in the control file, and in the structs that
are sent over the replication protocol, so this changes breaks compatibility
of pg_basebackup and server. I didn't do anything about this in this patch,
per discussion on -hackers, the right thing to do would to be to change the
replication protocol to be architecture-independent, so that you could use
a newer version of pg_receivexlog, for example, against an older server
version.
Diffstat (limited to 'src/backend/postmaster/checkpointer.c')
| -rw-r--r-- | src/backend/postmaster/checkpointer.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/backend/postmaster/checkpointer.c b/src/backend/postmaster/checkpointer.c index 7e5db863daf..417e3bb0d1b 100644 --- a/src/backend/postmaster/checkpointer.c +++ b/src/backend/postmaster/checkpointer.c @@ -631,7 +631,7 @@ CheckArchiveTimeout(void) * If the returned pointer points exactly to a segment boundary, * assume nothing happened. */ - if ((switchpoint.xrecoff % XLogSegSize) != 0) + if ((switchpoint % XLogSegSize) != 0) ereport(DEBUG1, (errmsg("transaction log switch forced (archive_timeout=%d)", XLogArchiveTimeout))); @@ -778,10 +778,7 @@ IsCheckpointOnSchedule(double progress) if (!RecoveryInProgress()) { recptr = GetInsertRecPtr(); - elapsed_xlogs = - (((double) ((uint64) (recptr.xlogid - ckpt_start_recptr.xlogid) << 32L)) + - ((double) recptr.xrecoff - (double) ckpt_start_recptr.xrecoff) / XLogSegSize) / - CheckPointSegments; + elapsed_xlogs = (((double) (recptr - ckpt_start_recptr)) / XLogSegSize) / CheckPointSegments; if (progress < elapsed_xlogs) { |