Fix insertion in GTT indexes

Author: knizhnik

src/backend/executor/nodeModifyTable.c

@@ -354,14 +354,22 @@ ExecInsert(ModifyTableState *mtstate,
 	ModifyTable *node = (ModifyTable *) mtstate->ps.plan;
 	OnConflictAction onconflict = node->onConflictAction;
 
+	if (resultRelInfo->ri_NumIndices > 0)
 	ExecMaterializeSlot(slot);
 
 	/*
 	 * get information on the (current) result relation
 	 */
 	resultRelInfo = estate->es_result_relation_info;
 	resultRelationDesc = resultRelInfo->ri_RelationDesc;
-
+	if (resultRelationDesc->rd_rel->relpersistence == RELPERSISTENCE_SESSION)
+	{
+		int i;
+		for (i = 0; i < resultRelInfo->ri_NumIndices; i++)
+		{
+			InitGTTIndexes(resultRelInfo->ri_IndexRelationDescs[i]);
+		}
+	}
 	/*
 	 * BEFORE ROW INSERT Triggers.
 	 *

src/backend/optimizer/util/plancat.c

@@ -28,7 +28,6 @@
 #include "catalog/catalog.h"
 #include "catalog/dependency.h"
 #include "catalog/heap.h"
-#include "catalog/index.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_statistic_ext.h"
@@ -47,7 +46,6 @@
 #include "rewrite/rewriteManip.h"
 #include "statistics/statistics.h"
 #include "storage/bufmgr.h"
-#include "storage/buf_internals.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/partcache.h"
@@ -87,21 +85,8 @@ is_index_valid(Relation index)
 {
 	if (!index->rd_index->indisvalid)
 		return false;
-
 	if (index->rd_rel->relpersistence == RELPERSISTENCE_SESSION)
-	{
-		Buffer metapage = ReadBuffer(index, 0);
-		bool isNew = PageIsNew(BufferGetPage(metapage));
-		ReleaseBuffer(metapage);
-		if (isNew)
-		{
-			Relation heap;
-			DropRelFileNodeAllLocalBuffers(index->rd_smgr->smgr_rnode.node);
-			heap = RelationIdGetRelation(index->rd_index->indrelid);
-			index->rd_indam->ambuild(heap, index, BuildIndexInfo(index));
-			RelationClose(heap);
-		}
-	}
+		InitGTTIndexes(index);
 	return true;
 }
 

src/backend/storage/buffer/bufmgr.c

@@ -33,9 +33,11 @@
 #include <sys/file.h>
 #include <unistd.h>
 
+#include "access/amapi.h"
 #include "access/tableam.h"
 #include "access/xlog.h"
 #include "catalog/catalog.h"
+#include "catalog/index.h"
 #include "catalog/storage.h"
 #include "executor/instrument.h"
 #include "lib/binaryheap.h"
@@ -4424,3 +4426,19 @@ TestForOldSnapshot_impl(Snapshot snapshot, Relation relation)
 				(errcode(ERRCODE_SNAPSHOT_TOO_OLD),
 				 errmsg("snapshot too old")));
 }
+
+void InitGTTIndexes(Relation index)
+{
+	Buffer metapage = ReadBuffer(index, 0);
+	bool isNew = PageIsNew(BufferGetPage(metapage));
+	Assert(index->rd_rel->relpersistence == RELPERSISTENCE_SESSION);
+	ReleaseBuffer(metapage);
+	if (isNew)
+	{
+		Relation heap;
+		DropRelFileNodeAllLocalBuffers(index->rd_smgr->smgr_rnode.node);
+		heap = RelationIdGetRelation(index->rd_index->indrelid);
+		index->rd_indam->ambuild(heap, index, BuildIndexInfo(index));
+		RelationClose(heap);
+	}
+}

src/include/storage/bufmgr.h

@@ -231,6 +231,7 @@ extern void TestForOldSnapshot_impl(Snapshot snapshot, Relation relation);
 extern BufferAccessStrategy GetAccessStrategy(BufferAccessStrategyType btype);
 extern void FreeAccessStrategy(BufferAccessStrategy strategy);
 
+extern void InitGTTIndexes(Relation rel);
 
 /* inline functions */