Combine simple_heap_update and CatalogUpdateIndexes routines in pg version 9.6 and below into one routine CatalogTupleUpdate as it is in pg10

Maksim Milyutin · Maksim Milyutin · commit c436b29cc9f9 · 2017-04-24T19:29:22.000+03:00
diff --git a/src/compat/pg_compat.c b/src/compat/pg_compat.c
@@ -37,8 +37,6 @@
 /*
  * CatalogIndexInsert is the copy of static prototype having the same name from
  * 		src/backend/catalog/indexing.c
- *
- * 	CatalogUpdateIndexes
  */
 #if PG_VERSION_NUM >= 100000
 #include "catalog/index.h"
@@ -119,10 +117,6 @@ CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple)
 
 	ExecDropSingleTupleTableSlot(slot);
 }
-void
-CatalogUpdateIndexes(Relation heapRel, HeapTuple heapTuple)
-{
-}
 #endif
 
 
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -69,13 +69,23 @@
 
 
 /*
- * CatalogIndexInsert
- * CatalogUpdateIndexes
+ * CatalogIndexInsert()
  */
 #if PG_VERSION_NUM >= 100000
 #include "catalog/indexing.h"
 void CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple);
-void CatalogUpdateIndexes(Relation heapRel, HeapTuple heapTuple);
+#endif
+
+
+/*
+ * CatalogTupleUpdate()
+ */
+#if PG_VERSION_NUM >= 90500 && PG_VERSION_NUM < 100000
+#define CatalogTupleUpdate(heapRel, updTid, heapTuple) \
+	do { \
+		simple_heap_update((heapRel), (updTid), (heapTuple)); \
+		CatalogUpdateIndexes((heapRel), (heapTuple)); \
+	} while (0)
 #endif
 
 
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -981,11 +981,8 @@ postprocess_child_table_and_atts(Oid parent_relid, Oid partition_relid)
 		/* Build new tuple with parent's ACL */
 		htup = heap_modify_tuple(htup, pg_class_desc, values, nulls, replaces);
 
-		/* Update child's tuple */
-		simple_heap_update(pg_class_rel, &iptr, htup);
-
-		/* Don't forget to update indexes */
-		CatalogUpdateIndexes(pg_class_rel, htup);
+		/* Update child's tuple with related indexes */
+		CatalogTupleUpdate(pg_class_rel, &iptr, htup);
 	}
 
 	systable_endscan(scan);
@@ -1085,11 +1082,8 @@ postprocess_child_table_and_atts(Oid parent_relid, Oid partition_relid)
 			subhtup = heap_modify_tuple(subhtup, pg_attribute_desc,
 										values, nulls, replaces);
 
-			/* Update child's tuple */
-			simple_heap_update(pg_attribute_rel, &iptr, subhtup);
-
-			/* Don't forget to update indexes */
-			CatalogUpdateIndexes(pg_attribute_rel, subhtup);
+			/* Update child's tuple and related indexes */
+			CatalogTupleUpdate(pg_attribute_rel, &iptr, subhtup);
 		}
 
 		systable_endscan(subscan);
