diff options
author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2012-12-28 13:06:15 -0300 |
---|---|---|
committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2012-12-28 13:06:15 -0300 |
commit | 5ab3af46ddd2f2c2b248f1ffdb688b394d4bb387 (patch) | |
tree | 6150244dc25064e933170880cab2037a79682f65 /src/backend/access/spgist/spgxlog.c | |
parent | 24eca7977ed208de33791af8890975ffcf086598 (diff) | |
download | postgresql-5ab3af46ddd2f2c2b248f1ffdb688b394d4bb387.tar.gz postgresql-5ab3af46ddd2f2c2b248f1ffdb688b394d4bb387.zip |
Remove obsolete XLogRecPtr macros
This gets rid of XLByteLT, XLByteLE, XLByteEQ and XLByteAdvance.
These were useful for brevity when XLogRecPtrs were split in
xlogid/xrecoff; but now that they are simple uint64's, they are just
clutter. The only downside to making this change would be ease of
backporting patches, but that has been negated by other substantive
changes to the involved code anyway. The clarity of simpler expressions
makes the change worthwhile.
Most of the changes are mechanical, but in a couple of places, the patch
author chose to invert the operator sense, making the code flow more
logical (and more in line with preceding comments).
Author: Andres Freund
Eyeballed by Dimitri Fontaine and Alvaro Herrera
Diffstat (limited to 'src/backend/access/spgist/spgxlog.c')
-rw-r--r-- | src/backend/access/spgist/spgxlog.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/backend/access/spgist/spgxlog.c b/src/backend/access/spgist/spgxlog.c index 2a874a2f16b..9a7aaf75e30 100644 --- a/src/backend/access/spgist/spgxlog.c +++ b/src/backend/access/spgist/spgxlog.c @@ -139,7 +139,7 @@ spgRedoAddLeaf(XLogRecPtr lsn, XLogRecord *record) SpGistInitBuffer(buffer, SPGIST_LEAF | (xldata->storesNulls ? SPGIST_NULLS : 0)); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { /* insert new tuple */ if (xldata->offnumLeaf != xldata->offnumHeadLeaf) @@ -187,7 +187,7 @@ spgRedoAddLeaf(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(buffer)) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { SpGistInnerTuple tuple; @@ -251,7 +251,7 @@ spgRedoMoveLeafs(XLogRecPtr lsn, XLogRecord *record) SpGistInitBuffer(buffer, SPGIST_LEAF | (xldata->storesNulls ? SPGIST_NULLS : 0)); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { int i; @@ -280,7 +280,7 @@ spgRedoMoveLeafs(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(buffer)) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { spgPageIndexMultiDelete(&state, page, toDelete, xldata->nMoves, state.isBuild ? SPGIST_PLACEHOLDER : SPGIST_REDIRECT, @@ -305,7 +305,7 @@ spgRedoMoveLeafs(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(buffer)) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { SpGistInnerTuple tuple; @@ -353,7 +353,7 @@ spgRedoAddNode(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(buffer)) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { PageIndexTupleDelete(page, xldata->offnum); if (PageAddItem(page, (Item) innerTuple, innerTuple->size, @@ -399,7 +399,7 @@ spgRedoAddNode(XLogRecPtr lsn, XLogRecord *record) if (xldata->newPage) SpGistInitBuffer(buffer, 0); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { addOrReplaceTuple(page, (Item) innerTuple, innerTuple->size, xldata->offnumNew); @@ -430,7 +430,7 @@ spgRedoAddNode(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(buffer)) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { SpGistDeadTuple dt; @@ -495,7 +495,7 @@ spgRedoAddNode(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(buffer)) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { SpGistInnerTuple innerTuple; @@ -552,7 +552,7 @@ spgRedoSplitTuple(XLogRecPtr lsn, XLogRecord *record) if (xldata->newPage) SpGistInitBuffer(buffer, 0); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { addOrReplaceTuple(page, (Item) postfixTuple, postfixTuple->size, xldata->offnumPostfix); @@ -574,7 +574,7 @@ spgRedoSplitTuple(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(buffer)) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { PageIndexTupleDelete(page, xldata->offnumPrefix); if (PageAddItem(page, (Item) prefixTuple, prefixTuple->size, @@ -670,7 +670,7 @@ spgRedoPickSplit(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(srcBuffer)) { srcPage = BufferGetPage(srcBuffer); - if (!XLByteLE(lsn, PageGetLSN(srcPage))) + if (lsn > PageGetLSN(srcPage)) { /* * We have it a bit easier here than in doPickSplit(), @@ -737,7 +737,7 @@ spgRedoPickSplit(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(destBuffer)) { destPage = (Page) BufferGetPage(destBuffer); - if (XLByteLE(lsn, PageGetLSN(destPage))) + if (lsn <= PageGetLSN(destPage)) destPage = NULL; /* don't do any page updates */ } else @@ -790,7 +790,7 @@ spgRedoPickSplit(XLogRecPtr lsn, XLogRecord *record) SpGistInitBuffer(buffer, (xldata->storesNulls ? SPGIST_NULLS : 0)); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { addOrReplaceTuple(page, (Item) innerTuple, innerTuple->size, xldata->offnumInner); @@ -842,7 +842,7 @@ spgRedoPickSplit(XLogRecPtr lsn, XLogRecord *record) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { SpGistInnerTuple parent; @@ -900,7 +900,7 @@ spgRedoVacuumLeaf(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(buffer)) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { spgPageIndexMultiDelete(&state, page, toDead, xldata->nDead, @@ -971,7 +971,7 @@ spgRedoVacuumRoot(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(buffer)) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { /* The tuple numbers are in order */ PageIndexMultiDelete(page, toDelete, xldata->nDelete); @@ -1017,7 +1017,7 @@ spgRedoVacuumRedirect(XLogRecPtr lsn, XLogRecord *record) if (BufferIsValid(buffer)) { page = BufferGetPage(buffer); - if (!XLByteLE(lsn, PageGetLSN(page))) + if (lsn > PageGetLSN(page)) { SpGistPageOpaque opaque = SpGistPageGetOpaque(page); int i; |