[PGPRO-12159] Fixed the build on version 18 of PostgreSQL.

Tags: rum

Author: Arseny Kositsyn

expected/security_1.out

@@ -18,5 +18,5 @@ CONTEXT:  SQL statement "CREATE FUNCTION rum_anyarray_similar(anyarray,anyarray)
 RETURNS bool
 AS '$libdir/rum'
 LANGUAGE C STRICT STABLE"
-extension script file "rum--1.3.sql", near line 1530
+extension script file "rum--1.4.sql", near line 1530
 DROP FUNCTION rum_anyarray_similar(anyarray,anyarray);

rum_init.sql

@@ -6,6 +6,7 @@ LANGUAGE C;
 /*
  * RUM access method
  */
+
 CREATE ACCESS METHOD rum TYPE INDEX HANDLER rumhandler;
 
 /*
@@ -411,7 +412,7 @@ AS
 /*
  * RUM version 1.1
  */
- 
+
 CREATE FUNCTION rum_btree_consistent(internal,smallint,internal,int,internal,internal,internal,internal)
 RETURNS bool
 AS 'MODULE_PATHNAME'

src/rum_debug_funcs.c

@@ -102,7 +102,7 @@ do { \
 #define RumWriteResBlckNumToValues(piState, counter) \
 do { \
 	(piState)->values[(counter)] = \
-		UInt32GetDatum(PostingItemGetBlockNumber(&((piState)->curPitem))); \
+		UInt32GetDatum(RumPostingItemGetBlockNumber(&((piState)->curPitem))); \
 } while(0)
 
 #define RumWriteResAddInfoToValues(piState, counter) \
@@ -129,7 +129,7 @@ do { \
 do { \
 	memcpy(&((piState)->curPitem), \
 		RumDataPageGetItem((piState)->page, \
-		(piState)->srfFctx->call_cntr), sizeof(PostingItem)); \
+		(piState)->srfFctx->call_cntr), sizeof(RumPostingItem)); \
 } while(0)
 
 #define RumPrepareResultTuple(piState) \
@@ -142,7 +142,7 @@ do { \
 } while(0)
 
 #define RumPrepareCurPitemToPostingList(piState) \
-	memset(&((piState)->curPitem), 0, sizeof(PostingItem))
+	memset(&((piState)->curPitem), 0, sizeof(RumPostingItem))
 
 /*
  * This is necessary in order for the prepare_scan()
@@ -201,7 +201,7 @@ typedef struct RumPageItemsStateData
 	 * On the {leaf, data} page, this is the number of
 	 * RumItem structures that are in the compressed posting list.
 	 *
-	 * On the {data} page, this is the number of PostingItem structures.
+	 * On the {data} page, this is the number of RumPostingItem structures.
 	 *
 	 * On the {leaf} page, this is the number of IndexTuple, each of
 	 * which contains a compressed posting list. In this case, the size
@@ -218,7 +218,7 @@ typedef struct RumPageItemsStateData
 	 * It is used where posting lists are scanned.
 	 * Sometimes only the RumItem it contains is used.
 	 */
-	PostingItem		curPitem;
+	RumPostingItem	curPitem;
 
 	/* Current IndexTuple on the page */
 	IndexTuple		curItup;
@@ -601,17 +601,13 @@ get_positions_to_text_datum(Datum addInfo)
 static Oid
 get_cur_tuple_key_oid(RumPageItemsState piState)
 {
-	Oid			result;
 	TupleDesc	origTupleDesc;
 	OffsetNumber attnum;
-	FormData_pg_attribute *attrs;
 
 	attnum = piState->curKeyAttnum;
 	origTupleDesc = piState->rumState->origTupdesc;
-	attrs = origTupleDesc->attrs;
-	result = (attrs[attnum - 1]).atttypid;
 
-	return result;
+	return TupleDescAttr(origTupleDesc, attnum - 1)->atttypid;
 }
 
 /*
@@ -638,8 +634,8 @@ get_entry_index_tuple_values(RumPageItemsState piState)
 	if (piState->pageType == LEAF_ENTRY_PAGE &&
 		RumGetAddInfoAttr(piState))
 	{
-		(piState)->curKeyAddInfoOid = RumGetAddInfoAttr(piState)->atttypid;
-		(piState)->curKeyAddInfoByval = RumGetAddInfoAttr(piState)->attbyval;
+		piState->curKeyAddInfoOid = RumGetAddInfoAttr(piState)->atttypid;
+		piState->curKeyAddInfoByval = RumGetAddInfoAttr(piState)->attbyval;
 	}
 }
 
@@ -687,7 +683,7 @@ find_page_in_posting_tree(BlockNumber targetPageNum,
 {
 	Page		curPage;
 	RumPageOpaque curOpaq;
-	PostingItem curPitem;
+	RumPostingItem curPitem;
 	BlockNumber nextPageNum;
 
 	/* Page loop */
@@ -713,21 +709,21 @@ find_page_in_posting_tree(BlockNumber targetPageNum,
 		}
 
 		/*
-		 * Reading the first PostingItem from the current page. This is
+		 * Reading the first RumPostingItem from the current page. This is
 		 * necessary to remember the link down.
 		 */
 		memcpy(&curPitem,
-			   RumDataPageGetItem(curPage, 1), sizeof(PostingItem));
-		nextPageNum = PostingItemGetBlockNumber(&curPitem);
+			   RumDataPageGetItem(curPage, 1), sizeof(RumPostingItem));
+		nextPageNum = RumPostingItemGetBlockNumber(&curPitem);
 
 		/* The loop that scans the page */
 		for (int i = 1; i <= curOpaq->maxoff; i++)
 		{
-			/* Reading the PostingItem from the current page */
+			/* Reading the RumPostingItem from the current page */
 			memcpy(&curPitem,
-				   RumDataPageGetItem(curPage, i), sizeof(PostingItem));
+				   RumDataPageGetItem(curPage, i), sizeof(RumPostingItem));
 
-			if (targetPageNum == PostingItemGetBlockNumber(&curPitem))
+			if (targetPageNum == RumPostingItemGetBlockNumber(&curPitem))
 			{
 				pfree(curPage);
 				return true;