pass indexRel to table_index_fetch_begin to detect index bridging for orioledb

Author: homper

src/backend/access/heap/heapam_handler.c

@@ -105,7 +105,7 @@ heapam_free_rd_amcache(Relation rel)
  */
 
 static IndexFetchTableData *
-heapam_index_fetch_begin(Relation rel)
+heapam_index_fetch_begin(Relation rel, Relation index)
 {
 	IndexFetchHeapData *hscan = palloc0(sizeof(IndexFetchHeapData));
 

src/backend/access/index/indexam.c

@@ -340,7 +340,7 @@ index_beginscan(Relation heapRelation,
 	scan->xs_snapshot = snapshot;
 
 	/* prepare to fetch index matches from table */
-	scan->xs_heapfetch = table_index_fetch_begin(heapRelation);
+	scan->xs_heapfetch = table_index_fetch_begin(heapRelation, indexRelation);
 
 	return scan;
 }
@@ -628,7 +628,7 @@ index_beginscan_parallel(Relation heaprel, Relation indexrel, int nkeys,
 	scan->xs_snapshot = snapshot;
 
 	/* prepare to fetch index matches from table */
-	scan->xs_heapfetch = table_index_fetch_begin(heaprel);
+	scan->xs_heapfetch = table_index_fetch_begin(heaprel, indexrel);
 
 	return scan;
 }

src/backend/access/nbtree/nbtinsert.c

@@ -557,7 +557,7 @@ _bt_check_unique(Relation rel, BTInsertState insertstate, Relation heapRel,
 				 * with optimizations like heap's HOT, we have just a single
 				 * index entry for the entire chain.
 				 */
-				else if (table_index_fetch_tuple_check(heapRel, &htid,
+				else if (table_index_fetch_tuple_check(heapRel, rel, &htid,
 													   &SnapshotDirty,
 													   &all_dead))
 				{
@@ -615,7 +615,7 @@ _bt_check_unique(Relation rel, BTInsertState insertstate, Relation heapRel,
 					 * entry.
 					 */
 					htid = itup->t_tid;
-					if (table_index_fetch_tuple_check(heapRel, &htid,
+					if (table_index_fetch_tuple_check(heapRel, rel, &htid,
 													  SnapshotSelf, NULL))
 					{
 						/* Normal case --- it's still live */

src/backend/access/table/tableam.c

@@ -216,6 +216,7 @@ table_beginscan_parallel(Relation relation, ParallelTableScanDesc pscan)
  */
 bool
 table_index_fetch_tuple_check(Relation rel,
+							  Relation indexRel,
 							  ItemPointer tid,
 							  Snapshot snapshot,
 							  bool *all_dead)
@@ -226,7 +227,7 @@ table_index_fetch_tuple_check(Relation rel,
 	bool		found;
 
 	slot = table_slot_create(rel, NULL);
-	scan = table_index_fetch_begin(rel);
+	scan = table_index_fetch_begin(rel, indexRel);
 	found = table_index_fetch_tuple(scan, PointerGetDatum(tid), snapshot, slot, &call_again,
 									all_dead);
 	table_index_fetch_end(scan);

src/backend/commands/constraint.c

@@ -130,9 +130,12 @@ unique_key_recheck(PG_FUNCTION_ARGS)
 	 */
 	tmptidDatum = checktidDatum;
 	{
-		IndexFetchTableData *scan = table_index_fetch_begin(trigdata->tg_relation);
+		IndexFetchTableData *scan;
 		bool		call_again = false;
 
+		indexRel = index_open(trigdata->tg_trigger->tgconstrindid, AccessShareLock);
+		scan = table_index_fetch_begin(trigdata->tg_relation, indexRel);
+		index_close(indexRel, AccessShareLock);
 		if (!table_index_fetch_tuple(scan, tmptidDatum, SnapshotSelf, slot,
 									 &call_again, NULL))
 		{

src/backend/executor/execIndexing.c

@@ -1114,6 +1114,7 @@ check_exclusion_or_unique_constraint(Relation heap, Relation index,
 	TupleTableSlot *existing_slot;
 	TupleTableSlot *save_scantuple;
 
+
 	if (indexInfo->ii_ExclusionOps)
 	{
 		constr_procs = indexInfo->ii_ExclusionProcs;

src/include/access/tableam.h

@@ -448,7 +448,7 @@ typedef struct TableAmRoutine
 	 *
 	 * Tuples for an index scan can then be fetched via index_fetch_tuple.
 	 */
-	struct IndexFetchTableData *(*index_fetch_begin) (Relation rel);
+	struct IndexFetchTableData *(*index_fetch_begin) (Relation rel, Relation index);
 
 	/*
 	 * Reset index fetch. Typically this will release cross index fetch
@@ -1225,9 +1225,9 @@ table_parallelscan_reinitialize(Relation rel, ParallelTableScanDesc pscan)
  * Tuples for an index scan can then be fetched via table_index_fetch_tuple().
  */
 static inline IndexFetchTableData *
-table_index_fetch_begin(Relation rel)
+table_index_fetch_begin(Relation rel, Relation index)
 {
-	return rel->rd_tableam->index_fetch_begin(rel);
+	return rel->rd_tableam->index_fetch_begin(rel, index);
 }
 
 /*
@@ -1300,6 +1300,7 @@ table_index_fetch_tuple(struct IndexFetchTableData *scan,
  * unique index.
  */
 extern bool table_index_fetch_tuple_check(Relation rel,
+										  Relation indexRel,
 										  ItemPointer tid,
 										  Snapshot snapshot,
 										  bool *all_dead);