Add prototype of CatalogInsertIndex routine and stub of CatalogUpdateIndex into pg_pathman

Maksim Milyutin · Maksim Milyutin · commit d056e0283972 · 2017-04-24T18:01:48.000+03:00
diff --git a/src/compat/pg_compat.c b/src/compat/pg_compat.c
@@ -34,6 +34,98 @@
  */
 
 
+/*
+ * 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"
+void
+CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple)
+{
+	int			i;
+	int			numIndexes;
+	RelationPtr relationDescs;
+	Relation	heapRelation;
+	TupleTableSlot *slot;
+	IndexInfo **indexInfoArray;
+	Datum		values[INDEX_MAX_KEYS];
+	bool		isnull[INDEX_MAX_KEYS];
+
+	/* HOT update does not require index inserts */
+	if (HeapTupleIsHeapOnly(heapTuple))
+		return;
+
+	/*
+	 * Get information from the state structure.  Fall out if nothing to do.
+	 */
+	numIndexes = indstate->ri_NumIndices;
+	if (numIndexes == 0)
+		return;
+	relationDescs = indstate->ri_IndexRelationDescs;
+	indexInfoArray = indstate->ri_IndexRelationInfo;
+	heapRelation = indstate->ri_RelationDesc;
+
+	/* Need a slot to hold the tuple being examined */
+	slot = MakeSingleTupleTableSlot(RelationGetDescr(heapRelation));
+	ExecStoreTuple(heapTuple, slot, InvalidBuffer, false);
+
+	/*
+	 * for each index, form and insert the index tuple
+	 */
+	for (i = 0; i < numIndexes; i++)
+	{
+		IndexInfo  *indexInfo;
+
+		indexInfo = indexInfoArray[i];
+
+		/* If the index is marked as read-only, ignore it */
+		if (!indexInfo->ii_ReadyForInserts)
+			continue;
+
+		/*
+		 * Expressional and partial indexes on system catalogs are not
+		 * supported, nor exclusion constraints, nor deferred uniqueness
+		 */
+		Assert(indexInfo->ii_Expressions == NIL);
+		Assert(indexInfo->ii_Predicate == NIL);
+		Assert(indexInfo->ii_ExclusionOps == NULL);
+		Assert(relationDescs[i]->rd_index->indimmediate);
+
+		/*
+		 * FormIndexDatum fills in its values and isnull parameters with the
+		 * appropriate values for the column(s) of the index.
+		 */
+		FormIndexDatum(indexInfo,
+					   slot,
+					   NULL,	/* no expression eval to do */
+					   values,
+					   isnull);
+
+		/*
+		 * The index AM does the rest.
+		 */
+		index_insert(relationDescs[i],	/* index relation */
+					 values,	/* array of index Datums */
+					 isnull,	/* is-null flags */
+					 &(heapTuple->t_self),		/* tid of heap tuple */
+					 heapRelation,
+					 relationDescs[i]->rd_index->indisunique ?
+					 UNIQUE_CHECK_YES : UNIQUE_CHECK_NO,
+					 indexInfo);
+	}
+
+	ExecDropSingleTupleTableSlot(slot);
+}
+void
+CatalogUpdateIndexes(Relation heapRel, HeapTuple heapTuple)
+{
+}
+#endif
+
+
 /*
  * create_plain_partial_paths
  *	  Build partial access paths for parallel scan of a plain relation
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -11,6 +11,14 @@
 #ifndef PG_COMPAT_H
 #define PG_COMPAT_H
 
+/* Check PostgreSQL version (9.5.4 contains an important fix for BGW) */
+#include "pg_config.h"
+#if PG_VERSION_NUM < 90503
+	#error "Cannot build pg_pathman with PostgreSQL version lower than 9.5.3"
+#elif PG_VERSION_NUM < 90504
+	#warning "It is STRONGLY recommended to use pg_pathman with PostgreSQL 9.5.4 since it contains important fixes"
+#endif
+
 #include "compat/debug_compat_features.h"
 
 #include "postgres.h"
@@ -60,6 +68,17 @@
 #endif
 
 
+/*
+ * CatalogIndexInsert
+ * CatalogUpdateIndexes
+ */
+#if PG_VERSION_NUM >= 100000
+#include "catalog/indexing.h"
+void CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple);
+void CatalogUpdateIndexes(Relation heapRel, HeapTuple heapTuple);
+#endif
+
+
 /*
  * check_index_predicates()
  */
diff --git a/src/include/pathman.h b/src/include/pathman.h
@@ -23,13 +23,6 @@
 #include "parser/parsetree.h"
 
 
-/* Check PostgreSQL version (9.5.4 contains an important fix for BGW) */
-#if PG_VERSION_NUM < 90503
-	#error "Cannot build pg_pathman with PostgreSQL version lower than 9.5.3"
-#elif PG_VERSION_NUM < 90504
-	#warning "It is STRONGLY recommended to use pg_pathman with PostgreSQL 9.5.4 since it contains important fixes"
-#endif
-
 /* Get CString representation of Datum (simple wrapper) */
 #ifdef USE_ASSERT_CHECKING
 	#include "utils.h"
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -13,6 +13,7 @@
 #include "partition_filter.h"
 #include "pathman.h"
 #include "pathman_workers.h"
+#include "compat/pg_compat.h"
 #include "xact_handling.h"
 
 #include "access/htup_details.h"
@@ -891,96 +892,6 @@ create_table_using_stmt(CreateStmt *create_stmt, Oid relowner)
 	return table_addr;
 }
 
-#if PG_VERSION_NUM >= 100000
-#include "catalog/index.h"
-static void
-CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple)
-{
-	int			i;
-	int			numIndexes;
-	RelationPtr relationDescs;
-	Relation	heapRelation;
-	TupleTableSlot *slot;
-	IndexInfo **indexInfoArray;
-	Datum		values[INDEX_MAX_KEYS];
-	bool		isnull[INDEX_MAX_KEYS];
-
-	/* HOT update does not require index inserts */
-	if (HeapTupleIsHeapOnly(heapTuple))
-		return;
-
-	/*
-	 * Get information from the state structure.  Fall out if nothing to do.
-	 */
-	numIndexes = indstate->ri_NumIndices;
-	if (numIndexes == 0)
-		return;
-	relationDescs = indstate->ri_IndexRelationDescs;
-	indexInfoArray = indstate->ri_IndexRelationInfo;
-	heapRelation = indstate->ri_RelationDesc;
-
-	/* Need a slot to hold the tuple being examined */
-	slot = MakeSingleTupleTableSlot(RelationGetDescr(heapRelation));
-	ExecStoreTuple(heapTuple, slot, InvalidBuffer, false);
-
-	/*
-	 * for each index, form and insert the index tuple
-	 */
-	for (i = 0; i < numIndexes; i++)
-	{
-		IndexInfo  *indexInfo;
-
-		indexInfo = indexInfoArray[i];
-
-		/* If the index is marked as read-only, ignore it */
-		if (!indexInfo->ii_ReadyForInserts)
-			continue;
-
-		/*
-		 * Expressional and partial indexes on system catalogs are not
-		 * supported, nor exclusion constraints, nor deferred uniqueness
-		 */
-		Assert(indexInfo->ii_Expressions == NIL);
-		Assert(indexInfo->ii_Predicate == NIL);
-		Assert(indexInfo->ii_ExclusionOps == NULL);
-		Assert(relationDescs[i]->rd_index->indimmediate);
-
-		/*
-		 * FormIndexDatum fills in its values and isnull parameters with the
-		 * appropriate values for the column(s) of the index.
-		 */
-		FormIndexDatum(indexInfo,
-					   slot,
-					   NULL,	/* no expression eval to do */
-					   values,
-					   isnull);
-
-		/*
-		 * The index AM does the rest.
-		 */
-		index_insert(relationDescs[i],	/* index relation */
-					 values,	/* array of index Datums */
-					 isnull,	/* is-null flags */
-					 &(heapTuple->t_self),		/* tid of heap tuple */
-					 heapRelation,
-					 relationDescs[i]->rd_index->indisunique ?
-					 UNIQUE_CHECK_YES : UNIQUE_CHECK_NO,
-					 indexInfo);
-	}
-
-	ExecDropSingleTupleTableSlot(slot);
-}
-static void
-CatalogUpdateIndexes(Relation heapRel, HeapTuple heapTuple)
-{
-	CatalogIndexState indstate;
-
-	indstate = CatalogOpenIndexes(heapRel);
-	CatalogIndexInsert(indstate, heapTuple);
-	CatalogCloseIndexes(indstate);
-}
-#endif
-
 /* Copy ACL privileges of parent table and set "attislocal" = true */
 static void
 postprocess_child_table_and_atts(Oid parent_relid, Oid partition_relid)
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -794,86 +794,6 @@ build_check_constraint_name_attname(PG_FUNCTION_ARGS)
  * ------------------------
  */
 
-#if PG_VERSION_NUM >= 100000
-#include "catalog/index.h"
-static void
-CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple)
-{
-	int			i;
-	int			numIndexes;
-	RelationPtr relationDescs;
-	Relation	heapRelation;
-	TupleTableSlot *slot;
-	IndexInfo **indexInfoArray;
-	Datum		values[INDEX_MAX_KEYS];
-	bool		isnull[INDEX_MAX_KEYS];
-
-	/* HOT update does not require index inserts */
-	if (HeapTupleIsHeapOnly(heapTuple))
-		return;
-
-	/*
-	 * Get information from the state structure.  Fall out if nothing to do.
-	 */
-	numIndexes = indstate->ri_NumIndices;
-	if (numIndexes == 0)
-		return;
-	relationDescs = indstate->ri_IndexRelationDescs;
-	indexInfoArray = indstate->ri_IndexRelationInfo;
-	heapRelation = indstate->ri_RelationDesc;
-
-	/* Need a slot to hold the tuple being examined */
-	slot = MakeSingleTupleTableSlot(RelationGetDescr(heapRelation));
-	ExecStoreTuple(heapTuple, slot, InvalidBuffer, false);
-
-	/*
-	 * for each index, form and insert the index tuple
-	 */
-	for (i = 0; i < numIndexes; i++)
-	{
-		IndexInfo  *indexInfo;
-
-		indexInfo = indexInfoArray[i];
-
-		/* If the index is marked as read-only, ignore it */
-		if (!indexInfo->ii_ReadyForInserts)
-			continue;
-
-		/*
-		 * Expressional and partial indexes on system catalogs are not
-		 * supported, nor exclusion constraints, nor deferred uniqueness
-		 */
-		Assert(indexInfo->ii_Expressions == NIL);
-		Assert(indexInfo->ii_Predicate == NIL);
-		Assert(indexInfo->ii_ExclusionOps == NULL);
-		Assert(relationDescs[i]->rd_index->indimmediate);
-
-		/*
-		 * FormIndexDatum fills in its values and isnull parameters with the
-		 * appropriate values for the column(s) of the index.
-		 */
-		FormIndexDatum(indexInfo,
-					   slot,
-					   NULL,	/* no expression eval to do */
-					   values,
-					   isnull);
-
-		/*
-		 * The index AM does the rest.
-		 */
-		index_insert(relationDescs[i],	/* index relation */
-					 values,	/* array of index Datums */
-					 isnull,	/* is-null flags */
-					 &(heapTuple->t_self),		/* tid of heap tuple */
-					 heapRelation,
-					 relationDescs[i]->rd_index->indisunique ?
-					 UNIQUE_CHECK_YES : UNIQUE_CHECK_NO,
-					 indexInfo);
-	}
-
-	ExecDropSingleTupleTableSlot(slot);
-}
-#endif
 
 /*
  * Try to add previously partitioned table to PATHMAN_CONFIG.
