Updated Babelfish code for community struct/function changes

Signed-off-by: Rucha Kulkarni <ruchask@amazon.com>

Author: Rucha Kulkarni

src/backend/commands/trigger.c

@@ -6595,16 +6595,18 @@ InsteadofTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 
 			if(event == TRIGGER_EVENT_DELETE)
 			{
-				old_tuplestore = transition_capture->tcs_private->old_del_tuplestore;
+				old_tuplestore = transition_capture->tcs_delete_private->old_tuplestore;
 			}
 			else if (event == TRIGGER_EVENT_UPDATE)
 			{
-				old_tuplestore = transition_capture->tcs_private->old_upd_tuplestore;
+				old_tuplestore = transition_capture->tcs_update_private->old_tuplestore;
 			}
 
 			if (map != NULL)
 			{
-				AfterTriggersTableData *table = transition_capture->tcs_private;
+				AfterTriggersTableData *table = (event == TRIGGER_EVENT_DELETE) ?
+					transition_capture->tcs_delete_private :
+					transition_capture->tcs_update_private;
 				TupleTableSlot *storeslot;
 
 				storeslot = GetAfterTriggersStoreSlot(table, map->outdesc);
@@ -6623,19 +6625,21 @@ InsteadofTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 
 			if(event == TRIGGER_EVENT_INSERT)
 			{
-				new_tuplestore = transition_capture->tcs_private->new_ins_tuplestore;
+				new_tuplestore = transition_capture->tcs_insert_private->new_tuplestore;
 			}
 			else if (event == TRIGGER_EVENT_UPDATE)
 			{
-				new_tuplestore = transition_capture->tcs_private->new_upd_tuplestore;
+				new_tuplestore = transition_capture->tcs_update_private->new_tuplestore;
 			}
 
 			if (original_insert_tuple != NULL)
 				tuplestore_puttupleslot(new_tuplestore,
 										original_insert_tuple);
 			else if (map != NULL)
 			{
-				AfterTriggersTableData *table = transition_capture->tcs_private;
+				AfterTriggersTableData *table = (event == TRIGGER_EVENT_INSERT) ?
+					transition_capture->tcs_insert_private :
+					transition_capture->tcs_update_private;
 				TupleTableSlot *storeslot;
 
 				storeslot = GetAfterTriggersStoreSlot(table, map->outdesc);
@@ -6719,7 +6723,23 @@ InsteadofTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 		new_shared.ats_firing_id = 0;
 		if ((trigger->tgoldtable || trigger->tgnewtable) &&
 			transition_capture != NULL)
-			new_shared.ats_table = transition_capture->tcs_private;
+		{
+			switch (event & TRIGGER_EVENT_OPMASK)
+			{
+				case TRIGGER_EVENT_INSERT:
+					new_shared.ats_table = transition_capture->tcs_insert_private;
+					break;
+				case TRIGGER_EVENT_UPDATE:
+					new_shared.ats_table = transition_capture->tcs_update_private;
+					break;
+				case TRIGGER_EVENT_DELETE:
+					new_shared.ats_table = transition_capture->tcs_delete_private;
+					break;
+				default:
+					new_shared.ats_table = NULL;
+					break;
+			}
+		}
 		else
 			new_shared.ats_table = NULL;
 		new_shared.ats_modifiedcols = modifiedCols;

src/backend/utils/cache/inval.c

@@ -590,10 +590,13 @@ RegisterCatcacheInvalidation(int cacheId,
 static void
 RegisterENRCatcacheInvalidation(int cacheId,
 							 uint32 hashValue,
-							 Oid dbId)
+							 Oid dbId,
+							 void *context)
 {
+	InvalidationInfo *info = (InvalidationInfo *) context;
+
 	SaveCatcacheMessage(cacheId, hashValue, dbId);
-	AddCatcacheInvalidationMessage(&transInvalInfo->CurrentCmdInvalidMsgs,
+	AddCatcacheInvalidationMessage(&info->CurrentCmdInvalidMsgs,
 								   cacheId, hashValue, dbId);
 }
 
@@ -1562,11 +1565,12 @@ CacheInvalidateENRHeapTuple(Relation relation,
 	if (RelationInvalidatesSnapshotsOnly(tupleRelId))
 	{
 		databaseId = IsSharedRelation(tupleRelId) ? InvalidOid : MyDatabaseId;
-		RegisterSnapshotInvalidation(databaseId, tupleRelId);
+		RegisterSnapshotInvalidation((InvalidationInfo *) transInvalInfo, databaseId, tupleRelId);
 	}
 	else
 		PrepareToInvalidateCacheTuple(relation, tuple, newtuple,
-									  RegisterENRCatcacheInvalidation);
+									  RegisterENRCatcacheInvalidation,
+									  (void *) transInvalInfo);
 
 	/*
 	 * Now, is this tuple one of the primary definers of a relcache entry? See
@@ -1639,7 +1643,7 @@ CacheInvalidateENRHeapTuple(Relation relation,
 	/*
 	 * Yes.  We need to register a relcache invalidation event.
 	 */
-	RegisterRelcacheInvalidation(databaseId, relationId);
+	RegisterRelcacheInvalidation((InvalidationInfo *) transInvalInfo, databaseId, relationId);
 }
 
 /*