database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Remove Item type

Browse Source 
This type is just char * underneath, it provides no real value, no
type safety, and just makes the code one level more mysterious.  It is
more idiomatic to refer to blobs of memory by a combination of void *
and size_t, so change it to that.

Also, since this type hides the pointerness, we can't apply qualifiers
to what is pointed to, which requires some unconstify nonsense.  This
change allows fixing that.

Extension code that uses the Item type can change its code to use
void * to be backward compatible.

Reviewed-by: Nathan Bossart <nathandbossart@gmail.com>
Reviewed-by: Peter Geoghegan <pg@bowt.ie>
Discussion: https://www.postgresql.org/message-id/flat/c75cccf5-5709-407b-a36a-2ae6570be766@eisentraut.org
This commit is contained in:
Peter Eisentraut
2025-10-27 09:54:16 +01:00
parent 64d2b0968e
commit 76acf4b722
29 changed files with 102 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/backend/access/spgist/spgxlog.c
View File

@@ -47,7 +47,7 @@ fillFakeState(SpGistState *state, spgxlogState stateSrc)
* existing tuple, it had better be a placeholder tuple.
*/
static void
addOrReplaceTuple(Page page, Item tuple, int size, OffsetNumber offset)
addOrReplaceTuple(Page page, const void *tuple, int size, OffsetNumber offset)
{
if (offset <= PageGetMaxOffsetNumber(page))
{
@@ -110,8 +110,7 @@ spgRedoAddLeaf(XLogReaderState *record)
if (xldata->offnumLeaf != xldata->offnumHeadLeaf)
{
/* normal cases, tuple was added by SpGistPageAddNewItem */
addOrReplaceTuple(page, (Item) leafTuple, leafTupleHdr.size,
xldata->offnumLeaf);
addOrReplaceTuple(page, leafTuple, leafTupleHdr.size, xldata->offnumLeaf);
/* update head tuple's chain link if needed */
if (xldata->offnumHeadLeaf != InvalidOffsetNumber)
@@ -129,7 +128,7 @@ spgRedoAddLeaf(XLogReaderState *record)
/* replacing a DEAD tuple */
PageIndexTupleDelete(page, xldata->offnumLeaf);
if (PageAddItem(page,
(Item) leafTuple, leafTupleHdr.size,
leafTuple, leafTupleHdr.size,
xldata->offnumLeaf, false, false) != xldata->offnumLeaf)
elog(ERROR, "failed to add item of size %u to SPGiST index page",
leafTupleHdr.size);
@@ -232,8 +231,7 @@ spgRedoMoveLeafs(XLogReaderState *record)
memcpy(&leafTupleHdr, leafTuple,
sizeof(SpGistLeafTupleData));
addOrReplaceTuple(page, (Item) leafTuple,
leafTupleHdr.size, toInsert[i]);
addOrReplaceTuple(page, leafTuple, leafTupleHdr.size, toInsert[i]);
ptr += leafTupleHdr.size;
}
@@ -309,7 +307,7 @@ spgRedoAddNode(XLogReaderState *record)
page = BufferGetPage(buffer);
PageIndexTupleDelete(page, xldata->offnum);
if (PageAddItem(page, (Item) innerTuple, innerTupleHdr.size,
if (PageAddItem(page, innerTuple, innerTupleHdr.size,
xldata->offnum,
false, false) != xldata->offnum)
elog(ERROR, "failed to add item of size %u to SPGiST index page",
@@ -351,8 +349,7 @@ spgRedoAddNode(XLogReaderState *record)
{
page = BufferGetPage(buffer);
addOrReplaceTuple(page, (Item) innerTuple,
innerTupleHdr.size, xldata->offnumNew);
addOrReplaceTuple(page, innerTuple, innerTupleHdr.size, xldata->offnumNew);
/*
* If parent is in this same page, update it now.
@@ -390,7 +387,7 @@ spgRedoAddNode(XLogReaderState *record)
xldata->offnumNew);
PageIndexTupleDelete(page, xldata->offnum);
if (PageAddItem(page, (Item) dt, dt->size,
if (PageAddItem(page, dt, dt->size,
xldata->offnum,
false, false) != xldata->offnum)
elog(ERROR, "failed to add item of size %u to SPGiST index page",
@@ -492,8 +489,7 @@ spgRedoSplitTuple(XLogReaderState *record)
{
page = BufferGetPage(buffer);
addOrReplaceTuple(page, (Item) postfixTuple,
postfixTupleHdr.size, xldata->offnumPostfix);
addOrReplaceTuple(page, postfixTuple, postfixTupleHdr.size, xldata->offnumPostfix);
PageSetLSN(page, lsn);
MarkBufferDirty(buffer);
@@ -508,15 +504,13 @@ spgRedoSplitTuple(XLogReaderState *record)
page = BufferGetPage(buffer);
PageIndexTupleDelete(page, xldata->offnumPrefix);
if (PageAddItem(page, (Item) prefixTuple, prefixTupleHdr.size,
if (PageAddItem(page, prefixTuple, prefixTupleHdr.size,
xldata->offnumPrefix, false, false) != xldata->offnumPrefix)
elog(ERROR, "failed to add item of size %u to SPGiST index page",
prefixTupleHdr.size);
if (xldata->postfixBlkSame)
addOrReplaceTuple(page, (Item) postfixTuple,
postfixTupleHdr.size,
xldata->offnumPostfix);
addOrReplaceTuple(page, postfixTuple, postfixTupleHdr.size, xldata->offnumPostfix);
PageSetLSN(page, lsn);
MarkBufferDirty(buffer);
@@ -662,8 +656,7 @@ spgRedoPickSplit(XLogReaderState *record)
if (page == NULL)
continue; /* no need to touch this page */
addOrReplaceTuple(page, (Item) leafTuple, leafTupleHdr.size,
toInsert[i]);
addOrReplaceTuple(page, leafTuple, leafTupleHdr.size, toInsert[i]);
}
/* Now update src and dest page LSNs if needed */
@@ -692,8 +685,7 @@ spgRedoPickSplit(XLogReaderState *record)
{
page = BufferGetPage(innerBuffer);
addOrReplaceTuple(page, (Item) innerTuple, innerTupleHdr.size,
xldata->offnumInner);
addOrReplaceTuple(page, innerTuple, innerTupleHdr.size, xldata->offnumInner);
/* if inner is also parent, update link while we're here */
if (xldata->innerIsParent)