Fix: set RumNullCategory for copied IndexTuple without posting list

Author: Artur Zakirov

rum.h

@@ -211,14 +211,10 @@ typedef signed char RumNullCategory;
 #define RumCategoryOffset(itup,rumstate) \
 	(IndexInfoFindDataOffset((itup)->t_info) + \
 	 ((rumstate)->oneCol ? 0 : sizeof(int16)))
-/*#define RumGetNullCategory(itup,rumstate) \
-	(*((RumNullCategory *) ((char*)(itup) + RumCategoryOffset(itup,rumstate))))
-  #define RumSetNullCategory(itup,rumstate,c) \
-	(*((RumNullCategory *) ((char*)(itup) + RumCategoryOffset(itup,rumstate))) = (c))*/
 
-#define RumGetNullCategory(itup,rumstate) \
+#define RumGetNullCategory(itup) \
 	  (*((RumNullCategory *) ((char*)(itup) + IndexTupleSize(itup) - sizeof(RumNullCategory))))
-#define RumSetNullCategory(itup,rumstate,c) \
+#define RumSetNullCategory(itup,c) \
 	  (*((RumNullCategory *) ((char*)(itup) + IndexTupleSize(itup) - sizeof(RumNullCategory))) = (c))
 
 /*

rumentrypage.c

@@ -68,6 +68,7 @@ static IndexTuple
 RumFormInteriorTuple(IndexTuple itup, Page page, BlockNumber childblk)
 {
 	IndexTuple	nitup;
+	RumNullCategory category;
 
 	if (RumPageIsLeaf(page) && !RumIsPostingTree(itup))
 	{
@@ -91,6 +92,14 @@ RumFormInteriorTuple(IndexTuple itup, Page page, BlockNumber childblk)
 	/* Now insert the correct downlink */
 	RumSetDownlink(nitup, childblk);
 
+	category = RumGetNullCategory(itup);
+	if (category == RUM_CAT_NULL_KEY || category == RUM_CAT_EMPTY_ITEM ||
+		category == RUM_CAT_NULL_ITEM)
+	{
+		nitup->t_info |= INDEX_NULL_MASK;
+		RumSetNullCategory(nitup, category);
+	}
+
 	return nitup;
 }
 

rumfast.c

@@ -421,7 +421,7 @@ RumFastFormTuple(RumState * rumstate,
 	if (category != RUM_CAT_NORM_KEY)
 	{
 		Assert(IndexTupleHasNulls(itup));
-		RumSetNullCategory(itup, rumstate, category);
+		RumSetNullCategory(itup, category);
 	}
 
 	return itup;

ruminsert.c

@@ -227,7 +227,7 @@ RumFormTuple(RumState * rumstate,
 	if (category != RUM_CAT_NORM_KEY)
 	{
 		Assert(IndexTupleHasNulls(itup));
-		RumSetNullCategory(itup, rumstate, category);
+		RumSetNullCategory(itup, category);
 	}
 
 	return itup;

rumutil.c

@@ -419,7 +419,7 @@ rumtuple_get_key(RumState * rumstate, IndexTuple tuple,
 	}
 
 	if (isnull)
-		*category = RumGetNullCategory(tuple, rumstate);
+		*category = RumGetNullCategory(tuple);
 	else
 		*category = RUM_CAT_NORM_KEY;
 

rumvacuum.c

@@ -203,7 +203,7 @@ RumFormTuple(RumState * rumstate,
 	if (category != RUM_CAT_NORM_KEY)
 	{
 		Assert(IndexTupleHasNulls(itup));
-		RumSetNullCategory(itup, rumstate, category);
+		RumSetNullCategory(itup, category);
 	}
 	return itup;
 }