Check additional information attribute in index.

We perform this check during rumbuild() and ruminsert(). We can't do it
during index creation because of we don't know which attribute should
store additional information.

Author: Artur Zakirov

expected/rum.out

@@ -5,6 +5,8 @@ BEFORE UPDATE OR INSERT ON test_rum
 FOR EACH ROW EXECUTE PROCEDURE tsvector_update_trigger('a', 'pg_catalog.english', 't');
 CREATE INDEX rumidx ON test_rum USING rum (a rum_tsvector_ops);
 \copy test_rum(t) from 'data/rum.data';
+CREATE INDEX failed_rumidx ON test_rum USING rum (a rum_tsvector_timestamp_ops);
+ERROR:  additional information attribute "a" is not found in index
 SET enable_seqscan=off;
 explain (costs off)
 SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', 'ever|wrote');

rum.h

@@ -870,6 +870,8 @@ rumDataPageLeafRead(Pointer ptr, OffsetNumber attnum, RumKey * item,
 	{
 		attr = rumstate->addAttrs[attnum - 1];
 
+		Assert(attr);
+
 		if (attr->attbyval)
 		{
 			/* do not use aligment for pass-by-value types */
@@ -949,6 +951,8 @@ rumDataPageLeafReadPointer(Pointer ptr, OffsetNumber attnum, RumKey * item,
 	{
 		attr = rumstate->addAttrs[attnum - 1];
 
+		Assert(attr);
+
 		if (!attr->attbyval)
 			ptr = (Pointer) att_align_pointer(ptr, attr->attalign, attr->attlen,
 											  ptr);

rumdatapage.c

@@ -236,6 +236,8 @@ rumPlaceToDataPageLeaf(Pointer ptr, OffsetNumber attnum,
 	if (!item->addInfoIsNull)
 	{
 		attr = rumstate->addAttrs[attnum - 1];
+		Assert(attr);
+
 		ptr = rumDatumWrite(ptr, item->addInfo, attr->attbyval, attr->attalign,
 							attr->attlen, attr->attstorage);
 	}
@@ -293,6 +295,8 @@ rumCheckPlaceToDataPageLeaf(OffsetNumber attnum,
 	if (!item->addInfoIsNull)
 	{
 		attr = rumstate->addAttrs[attnum - 1];
+		Assert(attr);
+
 		size = rumComputeDatumSize(size, item->addInfo, attr->attbyval,
 							 attr->attalign, attr->attlen, attr->attstorage);
 	}

rumfast.c

@@ -658,6 +658,7 @@ processPendingPage(BuildAccumulator *accum, KeyArray *ka,
 		if (OidIsValid(accum->rumstate->addInfoTypeOid[curattnum - 1]))
 		{
 			Form_pg_attribute attr = accum->rumstate->addAttrs[curattnum - 1];
+			Assert(attr);
 
 			if (accum->rumstate->oneCol)
 				addInfo = index_getattr(itup, 2,

ruminsert.c

@@ -511,8 +511,13 @@ rumHeapTupleBulkInsert(RumBuildState * buildstate, OffsetNumber attnum,
 	MemoryContextSwitchTo(oldCtx);
 	for (i = 0; i < nentries; i++)
 	{
-		if (attr && !addInfoIsNull[i])
+		if (!addInfoIsNull[i])
 		{
+			/* Check existance of additional information attribute in index */
+			if (!attr)
+				elog(ERROR, "additional information attribute \"%s\" is not found in index",
+					 NameStr(buildstate->rumstate.origTupdesc->attrs[attnum - 1]->attname));
+
 			addInfo[i] = datumCopy(addInfo[i], attr->attbyval, attr->attlen);
 		}
 	}
@@ -767,6 +772,11 @@ rumHeapTupleInsert(RumState * rumstate, OffsetNumber attnum,
 	{
 		RumKey		insert_item;
 
+		/* Check existance of additional information attribute in index */
+		if (!addInfoIsNull[i] && !rumstate->addAttrs[attnum - 1])
+			elog(ERROR, "additional information attribute \"%s\" is not found in index",
+				 NameStr(rumstate->origTupdesc->attrs[attnum - 1]->attname));
+
 		insert_item.iptr = *item;
 		insert_item.addInfo = addInfo[i];
 		insert_item.addInfoIsNull = addInfoIsNull[i];

sql/rum.sql

@@ -10,6 +10,8 @@ CREATE INDEX rumidx ON test_rum USING rum (a rum_tsvector_ops);
 
 \copy test_rum(t) from 'data/rum.data';
 
+CREATE INDEX failed_rumidx ON test_rum USING rum (a rum_tsvector_timestamp_ops);
+
 SET enable_seqscan=off;
 
 explain (costs off)