Bugfix for covering indexes, Fixes work with more than 3-level indexes

vbwagner · vbwagner · commit 0d9c224fa6f4 · 2016-09-09T14:06:08.000+03:00
diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c
@@ -138,7 +138,7 @@ triggered_change_notification(PG_FUNCTION_ARGS)
 		/* we're only interested if it is the primary key and valid */
 		if (index->indisprimary && IndexIsValid(index))
 		{
-			int			indnkeyatts = index->indnkeyatts;
+			int     indnkeyatts = index->indnkeyatts;
 
 			if (indnkeyatts > 0)
 			{
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
@@ -157,7 +157,8 @@ IndexScanEnd(IndexScanDesc scan)
  *
  * Construct a string describing the contents of an index entry, in the
  * form "(key_name, ...)=(key_value, ...)".  This is currently used
- * for building unique-constraint and exclusion-constraint error messages.
+ * for building unique-constraint and exclusion-constraint error messages,
+ * so only key columns of index are checked and printed.
  *
  * Note that if the user does not have permissions to view all of the
  * columns involved then a NULL is returned.  Returning a partial key seems
@@ -183,7 +184,6 @@ BuildIndexValueDescription(Relation indexRelation,
 	AclResult	aclresult;
 
 	indnkeyatts = IndexRelationGetNumberOfKeyAttributes(indexRelation);
-
 	/*
 	 * Check permissions- if the user does not have access to view all of the
 	 * key columns then return NULL to avoid leaking data.
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
@@ -1982,7 +1982,6 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
 	itemid = PageGetItemId(lpage, P_HIKEY);
 	right_item_sz = ItemIdGetLength(itemid);
 	item = (IndexTuple) PageGetItem(lpage, itemid);
-
 	right_item = CopyIndexTuple(item);
 	ItemPointerSet(&(right_item->t_tid), rbkno, P_HIKEY);
 
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
@@ -431,8 +431,6 @@ _bt_compare(Relation rel,
 
 	itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offnum));
 
-	Assert (keysz <= rel->rd_index->indnkeyatts);
-
 	/*
 	 * The scan key is set up with the attribute number associated with each
 	 * term in the key.  It is important that, if the index is multi-key, the
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
@@ -580,15 +580,12 @@ _bt_buildadd(BTWriteState *wstate, BTPageState *state, IndexTuple itup)
 		 * Save a copy of the minimum key for the new page.  We have to copy
 		 * it off the old page, not the new one, in case we are not at leaf
 		 * level.
-		 * If tuple contains non-key attributes, truncate them.
-		 * We perform truncation only for leaf pages,
-		 * beacuse all tuples at inner pages will be already
-		 * truncated by the time we handle them.
+		 * Despite oitup is already initialized, it's important to get high
+		 * key from the page, since we could have replaced it with truncated
+		 * copy. See comment above.
 		 */
-		if (indnkeyatts != indnatts && P_ISLEAF(opageop))
-			state->btps_minkey = index_truncate_tuple(wstate->index, oitup);
-		else
-			state->btps_minkey = CopyIndexTuple(oitup);
+		oitup = (IndexTuple) PageGetItem(opage,PageGetItemId(opage, P_HIKEY));
+		state->btps_minkey = CopyIndexTuple(oitup);
 
 		/*
 		 * Set the sibling links for both pages.
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
@@ -64,7 +64,7 @@ _bt_mkscankey(Relation rel, IndexTuple itup)
 {
 	ScanKey		skey;
 	TupleDesc	itupdesc;
-	int			indnatts,
+	int     	indnatts,
 				indnkeyatts;
 	int16	   *indoption;
 	int			i;
@@ -125,7 +125,7 @@ ScanKey
 _bt_mkscankey_nodata(Relation rel)
 {
 	ScanKey		skey;
-	int			indnkeyatts;
+	int     	indnkeyatts;
 	int16	   *indoption;
 	int			i;
 
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
@@ -586,7 +586,7 @@ infer_arbiter_indexes(PlannerInfo *root)
 
 		/* Build BMS representation of plain (non expression) index attrs */
 		indexedAttrs = NULL;
-		for (natt = 0; natt < idxForm->indnatts; natt++)
+		for (natt = 0; natt < idxForm->indnkeyatts; natt++)
 		{
 			int			attno = idxRel->rd_index->indkey.values[natt];
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ triggered_change_notification(PG_FUNCTION_ARGS)`
`138`	`138`	`/* we're only interested if it is the primary key and valid */`
`139`	`139`	`if (index->indisprimary && IndexIsValid(index))`
`140`	`140`	`{`
`141`		`- int indnkeyatts = index->indnkeyatts;`
	`141`	`+ int indnkeyatts = index->indnkeyatts;`
`142`	`142`
`143`	`143`	`if (indnkeyatts > 0)`
`144`	`144`	`{`
Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ infer_arbiter_indexes(PlannerInfo *root)`
`586`	`586`
`587`	`587`	`/* Build BMS representation of plain (non expression) index attrs */`
`588`	`588`	`indexedAttrs = NULL;`
`589`		`- for (natt = 0; natt < idxForm->indnatts; natt++)`
	`589`	`+ for (natt = 0; natt < idxForm->indnkeyatts; natt++)`
`590`	`590`	`{`
`591`	`591`	`int attno = idxRel->rd_index->indkey.values[natt];`
`592`	`592`