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/access/gist/gistutil.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/access/gist/gistutil.c')
| -rw-r--r-- | src/backend/access/gist/gistutil.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index 8039b5d569c..df1e2e396f2 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -706,13 +706,7 @@ gistoptions(PG_FUNCTION_ARGS) XLogRecPtr GetXLogRecPtrForTemp(void) { - static XLogRecPtr counter = {0, 1}; - - counter.xrecoff++; - if (counter.xrecoff == 0) - { - counter.xlogid++; - counter.xrecoff++; - } + static XLogRecPtr counter = 1; + counter++; return counter; } |