Fix bug in rumReadTuple

Artur Zakirov · Artur Zakirov · commit 80b864b8fe64 · 2016-05-24T20:34:56.000+03:00
diff --git a/rumdatapage.c b/rumdatapage.c
@@ -1400,8 +1400,8 @@ rumInsertItemPointers(RumState *rumstate,
 
 	BlockNumber rootBlkno = gdi->stack->blkno;
 
-	/* TODO: Fix this */
-	gdi->btree.items = (ItemPointer) palloc(sizeof(ItemPointerData) * nitem);
+	/* TODO: Fix this terrible code. */
+	gdi->btree.items = (ItemPointerData *) palloc(sizeof(ItemPointerData) * nitem);
 	gdi->btree.addInfo = (Datum *) palloc(sizeof(Datum) * nitem);
 	gdi->btree.addInfoIsNull = (bool *) palloc(sizeof(bool) * nitem);
 	for (i = 0; i < nitem; i++)
diff --git a/rumentrypage.c b/rumentrypage.c
@@ -24,18 +24,18 @@ rumReadTuple(RumState *rumstate, OffsetNumber attnum,
 			 IndexTuple itup, RumKey *items)
 {
 	Pointer ptr = RumGetPosting(itup);
+	RumKey	item;
 	int		nipd = RumGetNPosting(itup),
 			i;
 
+	item.iptr.ip_blkid.bi_lo = 0;
+	item.iptr.ip_blkid.bi_hi = 0;
+	item.iptr.ip_posid = 0;
+
 	for (i = 0; i < nipd; i++)
 	{
-		if (i == 0)
-		{
-			items[0].iptr.ip_blkid.bi_lo = 0;
-			items[0].iptr.ip_blkid.bi_hi = 0;
-			items[0].iptr.ip_posid = 0;
-		}
-		ptr = rumDataPageLeafRead(ptr, attnum, &items[i], rumstate, true);
+		ptr = rumDataPageLeafRead(ptr, attnum, &item, rumstate, true);
+		items[i] = item;
 	}
 }
 
diff --git a/rumvalidate.c b/rumvalidate.c
@@ -111,7 +111,7 @@ rumvalidate(Oid opclassoid)
 			case GIN_EXTRACTVALUE_PROC:
 				/* Some opclasses omit nullFlags */
 				ok = check_amproc_signature(procform->amproc, INTERNALOID, false,
-											3, 3, opcintype, INTERNALOID,
+											5, 5, opcintype, INTERNALOID,
 											INTERNALOID, INTERNALOID,
 											INTERNALOID);
 				break;

Original file line number	Diff line number	Diff line change
`@@ -24,18 +24,18 @@ rumReadTuple(RumState *rumstate, OffsetNumber attnum,`
`24`	`24`	`IndexTuple itup, RumKey *items)`
`25`	`25`	`{`
`26`	`26`	`Pointer ptr = RumGetPosting(itup);`
	`27`	`+ RumKey item;`
`27`	`28`	`int nipd = RumGetNPosting(itup),`
`28`	`29`	`i;`
`29`	`30`
	`31`	`+ item.iptr.ip_blkid.bi_lo = 0;`
	`32`	`+ item.iptr.ip_blkid.bi_hi = 0;`
	`33`	`+ item.iptr.ip_posid = 0;`
	`34`	`+`
`30`	`35`	`for (i = 0; i < nipd; i++)`
`31`	`36`	`{`
`32`		`- if (i == 0)`
`33`		`- {`
`34`		`- items[0].iptr.ip_blkid.bi_lo = 0;`
`35`		`- items[0].iptr.ip_blkid.bi_hi = 0;`
`36`		`- items[0].iptr.ip_posid = 0;`
`37`		`- }`
`38`		`- ptr = rumDataPageLeafRead(ptr, attnum, &items[i], rumstate, true);`
	`37`	`+ ptr = rumDataPageLeafRead(ptr, attnum, &item, rumstate, true);`
	`38`	`+ items[i] = item;`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`