Fix: set RumNullCategory for copied IndexTuple without posting list

Artur Zakirov · Artur Zakirov · commit f4020ebbcd68 · 2016-10-14T11:28:03.000+03:00
diff --git a/rum.h b/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))
 
 /*
diff --git a/rumentrypage.c b/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;
 }
 
diff --git a/rumfast.c b/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;
diff --git a/ruminsert.c b/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;
diff --git a/rumutil.c b/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;
 
diff --git a/rumvacuum.c b/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;
 }

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ static IndexTuple`
`68`	`68`	`RumFormInteriorTuple(IndexTuple itup, Page page, BlockNumber childblk)`
`69`	`69`	`{`
`70`	`70`	`IndexTuple nitup;`
	`71`	`+ RumNullCategory category;`
`71`	`72`
`72`	`73`	`if (RumPageIsLeaf(page) && !RumIsPostingTree(itup))`
`73`	`74`	`{`
`@@ -91,6 +92,14 @@ RumFormInteriorTuple(IndexTuple itup, Page page, BlockNumber childblk)`
`91`	`92`	`/* Now insert the correct downlink */`
`92`	`93`	`RumSetDownlink(nitup, childblk);`
`93`	`94`
	`95`	`+ category = RumGetNullCategory(itup);`
	`96`	`+ if (category == RUM_CAT_NULL_KEY \|\| category == RUM_CAT_EMPTY_ITEM \|\|`
	`97`	`+ category == RUM_CAT_NULL_ITEM)`
	`98`	`+ {`
	`99`	`+ nitup->t_info \|= INDEX_NULL_MASK;`
	`100`	`+ RumSetNullCategory(nitup, category);`
	`101`	`+ }`
	`102`	`+`
`94`	`103`	`return nitup;`
`95`	`104`	`}`
`96`	`105`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ RumFastFormTuple(RumState * rumstate,`
`421`	`421`	`if (category != RUM_CAT_NORM_KEY)`
`422`	`422`	`{`
`423`	`423`	`Assert(IndexTupleHasNulls(itup));`
`424`		`- RumSetNullCategory(itup, rumstate, category);`
	`424`	`+ RumSetNullCategory(itup, category);`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`return itup;`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ RumFormTuple(RumState * rumstate,`
`227`	`227`	`if (category != RUM_CAT_NORM_KEY)`
`228`	`228`	`{`
`229`	`229`	`Assert(IndexTupleHasNulls(itup));`
`230`		`- RumSetNullCategory(itup, rumstate, category);`
	`230`	`+ RumSetNullCategory(itup, category);`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`return itup;`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ rumtuple_get_key(RumState * rumstate, IndexTuple tuple,`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`if (isnull)`
`422`		`- *category = RumGetNullCategory(tuple, rumstate);`
	`422`	`+ *category = RumGetNullCategory(tuple);`
`423`	`423`	`else`
`424`	`424`	`*category = RUM_CAT_NORM_KEY;`
`425`	`425`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ RumFormTuple(RumState * rumstate,`
`203`	`203`	`if (category != RUM_CAT_NORM_KEY)`
`204`	`204`	`{`
`205`	`205`	`Assert(IndexTupleHasNulls(itup));`
`206`		`- RumSetNullCategory(itup, rumstate, category);`
	`206`	`+ RumSetNullCategory(itup, category);`
`207`	`207`	`}`
`208`	`208`	`return itup;`
`209`	`209`	`}`