From 046a14badc3f86b1d3a2791db327a61ba51a47e9 Mon Sep 17 00:00:00 2001 From: Pavan Deolasee Date: Wed, 29 Mar 2017 10:44:01 +0530 Subject: [PATCH 2/4] Free 3-bits in ip_posid field of the ItemPointerData. We can use those for storing some other information. Right now only index methods will use those to store WARM/CLEAR property of an index pointer. --- src/include/access/ginblock.h | 3 ++- src/include/access/htup_details.h | 2 +- src/include/storage/itemptr.h | 30 +++++++++++++++++++++++++++--- src/include/storage/off.h | 11 ++++++++++- 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/src/include/access/ginblock.h b/src/include/access/ginblock.h index 438912c..316ab65 100644 --- a/src/include/access/ginblock.h +++ b/src/include/access/ginblock.h @@ -135,7 +135,8 @@ typedef struct GinMetaPageData (ItemPointerGetBlockNumberNoCheck(pointer)) #define GinItemPointerGetOffsetNumber(pointer) \ - (ItemPointerGetOffsetNumberNoCheck(pointer)) + (ItemPointerGetOffsetNumberNoCheck(pointer) | \ + (ItemPointerGetFlags(pointer) << OffsetNumberBits)) #define GinItemPointerSetBlockNumber(pointer, blkno) \ (ItemPointerSetBlockNumber((pointer), (blkno))) diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h index 24433c7..4d614b7 100644 --- a/src/include/access/htup_details.h +++ b/src/include/access/htup_details.h @@ -288,7 +288,7 @@ struct HeapTupleHeaderData * than MaxOffsetNumber, so that it can be distinguished from a valid * offset number in a regular item pointer. */ -#define SpecTokenOffsetNumber 0xfffe +#define SpecTokenOffsetNumber OffsetNumberPrev(OffsetNumberMask) /* * HeapTupleHeader accessor macros diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index c21d2ad..74eed4e 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -57,7 +57,7 @@ typedef ItemPointerData *ItemPointer; * True iff the disk item pointer is not NULL. */ #define ItemPointerIsValid(pointer) \ - ((bool) (PointerIsValid(pointer) && ((pointer)->ip_posid != 0))) + ((bool) (PointerIsValid(pointer) && (((pointer)->ip_posid & OffsetNumberMask) != 0))) /* * ItemPointerGetBlockNumberNoCheck @@ -84,7 +84,7 @@ typedef ItemPointerData *ItemPointer; */ #define ItemPointerGetOffsetNumberNoCheck(pointer) \ ( \ - (pointer)->ip_posid \ + ((pointer)->ip_posid & OffsetNumberMask) \ ) /* @@ -98,6 +98,30 @@ typedef ItemPointerData *ItemPointer; ) /* + * Get the flags stored in high order bits in the OffsetNumber. + */ +#define ItemPointerGetFlags(pointer) \ +( \ + ((pointer)->ip_posid & ~OffsetNumberMask) >> OffsetNumberBits \ +) + +/* + * Set the flag bits. We first left-shift since flags are defined starting 0x01 + */ +#define ItemPointerSetFlags(pointer, flags) \ +( \ + ((pointer)->ip_posid |= ((flags) << OffsetNumberBits)) \ +) + +/* + * Clear all flags. + */ +#define ItemPointerClearFlags(pointer) \ +( \ + ((pointer)->ip_posid &= OffsetNumberMask) \ +) + +/* * ItemPointerSet * Sets a disk item pointer to the specified block and offset. */ @@ -105,7 +129,7 @@ typedef ItemPointerData *ItemPointer; ( \ AssertMacro(PointerIsValid(pointer)), \ BlockIdSet(&((pointer)->ip_blkid), blockNumber), \ - (pointer)->ip_posid = offNum \ + (pointer)->ip_posid = (offNum) \ ) /* diff --git a/src/include/storage/off.h b/src/include/storage/off.h index fe8638f..f058fe1 100644 --- a/src/include/storage/off.h +++ b/src/include/storage/off.h @@ -26,7 +26,16 @@ typedef uint16 OffsetNumber; #define InvalidOffsetNumber ((OffsetNumber) 0) #define FirstOffsetNumber ((OffsetNumber) 1) #define MaxOffsetNumber ((OffsetNumber) (BLCKSZ / sizeof(ItemIdData))) -#define OffsetNumberMask (0xffff) /* valid uint16 bits */ + +/* + * The biggest BLCKSZ we support is 32kB, and each ItemId takes 6 bytes. + * That limits the number of line pointers in a page to 32kB/6B = 5461. + * Therefore, 13 bits in OffsetNumber are enough to represent all valid + * on-disk line pointers. Hence, we can reserve the high-order bits in + * OffsetNumber for other purposes. + */ +#define OffsetNumberBits 13 +#define OffsetNumberMask ((((uint16) 1) << OffsetNumberBits) - 1) /* ---------------- * support macros -- 2.9.3 (Apple Git-75)