Pass indexUnchanged to index_update method

Author: homper

src/backend/access/index/indexam.c

@@ -278,6 +278,7 @@ index_update(Relation indexRelation,
 			 Datum oldTupleid,
 			 Relation heapRelation,
 			 IndexUniqueCheck checkUnique,
+			 bool indexUnchanged,
 			 IndexInfo *indexInfo)
 {
 	RELATION_CHECKS;
@@ -294,6 +295,7 @@ index_update(Relation indexRelation,
 											 valuesOld, isnullOld, oldTupleid,
 											 heapRelation,
 											 checkUnique,
+											 indexUnchanged,
 											 indexInfo);
 }
 

src/backend/executor/execIndexing.c

@@ -552,6 +552,7 @@ ExecUpdateIndexTuples(ResultRelInfo *resultRelInfo,
 		IndexInfo  *indexInfo;
 		bool		applyNoDupErr;
 		IndexUniqueCheck checkUnique;
+		bool		indexUnchanged;
 		bool		satisfiesConstraint;
 		bool		new_valid = true;
 
@@ -643,6 +644,16 @@ ExecUpdateIndexTuples(ResultRelInfo *resultRelInfo,
 		else
 			checkUnique = UNIQUE_CHECK_PARTIAL;
 
+		/*
+		* There's definitely going to be an index_insert() call for this
+		* index.  If we're being called as part of an UPDATE statement,
+		* consider if the 'indexUnchanged' = true hint should be passed.
+		*/
+		indexUnchanged = index_unchanged_by_update(resultRelInfo,
+												   estate,
+												   indexInfo,
+												   indexRelation);
+
 		if (indexRelation->rd_indam->ammvccaware)
 		{
 			Datum		valuesOld[INDEX_MAX_KEYS];
@@ -704,22 +715,12 @@ ExecUpdateIndexTuples(ResultRelInfo *resultRelInfo,
 							 oldTupleidDatum,
 							 heapRelation,	/* heap relation */
 							 checkUnique,	/* type of uniqueness check to do */
+							 indexUnchanged,	/* UPDATE without logical change? */
 							 indexInfo);	/* index AM may need this */
 
 		}
 		else
 		{
-			bool		indexUnchanged;
-			/*
-			* There's definitely going to be an index_insert() call for this
-			* index.  If we're being called as part of an UPDATE statement,
-			* consider if the 'indexUnchanged' = true hint should be passed.
-			*/
-			indexUnchanged = index_unchanged_by_update(resultRelInfo,
-													   estate,
-													   indexInfo,
-													   indexRelation);
-
 			satisfiesConstraint =
 				index_insert(indexRelation, /* index relation */
 							 values,	/* array of index Datums */
@@ -1212,9 +1213,10 @@ check_exclusion_or_unique_constraint(Relation heap, Relation index,
 				continue;
 			}
 		} else {
-			Assert(tupleidDatum > 0);
-			Pointer rowid = DatumGetPointer(tupleidDatum);
+			Pointer rowid;
 
+			Assert(tupleidDatum > 0);
+			rowid = DatumGetPointer(tupleidDatum);
 			if (PointerIsValid(rowid))
 			{
 				bool	isnull;

src/include/access/amapi.h

@@ -142,6 +142,7 @@ typedef bool (*amupdate_function) (Relation indexRelation,
 								   Datum oldTupleid,
 								   Relation heapRelation,
 								   IndexUniqueCheck checkUnique,
+								   bool indexUnchanged,
 								   struct IndexInfo *indexInfo);
 /* delete this tuple */
 typedef bool (*amdelete_function) (Relation indexRelation,

src/include/access/genam.h

@@ -162,6 +162,7 @@ extern bool index_update(Relation indexRelation,
 						 Datum oldTupleid,
 						 Relation heapRelation,
 						 IndexUniqueCheck checkUnique,
+						 bool indexUnchanged,
 						 struct IndexInfo *indexInfo);
 extern bool index_delete(Relation indexRelation, Datum *values, bool *isnull,
 						 Datum tupleid, Relation heapRelation,