Remove (almost) unused fields.

src/backend/access/appendonly/appendonlyam.c

@@ -936,10 +936,6 @@ AppendOnlyExecutorReadBlock_Init(
 	oldcontext = MemoryContextSwitchTo(memoryContext);
 	executorReadBlock->uncompressedBuffer = (uint8 *) palloc(usableBlockSize * sizeof(uint8));
 
-	executorReadBlock->mt_bind = create_memtuple_binding(RelationGetDescr(relation));
-
-	ItemPointerSet(&executorReadBlock->cdb_fake_ctid, 0, 0);
-
 	executorReadBlock->storageRead = storageRead;
 
 	MemoryContextSwitchTo(oldcontext);
@@ -958,12 +954,6 @@ AppendOnlyExecutorReadBlock_Finish(
 		pfree(executorReadBlock->uncompressedBuffer);
 		executorReadBlock->uncompressedBuffer = NULL;
 	}
-
-	if (executorReadBlock->mt_bind)
-	{
-		destroy_memtuple_binding(executorReadBlock->mt_bind);
-		executorReadBlock->mt_bind = NULL;
-	}
 }
 
 static void
@@ -1051,7 +1041,8 @@ AppendOnlyExecutorReadBlock_ProcessTuple(
 	TupleTableSlot 					*slot)
 {
 	bool	valid = true;	// Assume for HeapKeyTestUsingSlot define.
-	AOTupleId *aoTupleId = (AOTupleId*)&executorReadBlock->cdb_fake_ctid;
+	ItemPointerData	fake_ctid;
+	AOTupleId *aoTupleId = (AOTupleId*)&fake_ctid;
 	int			formatVersion = executorReadBlock->storageRead->formatVersion;
 
 	AORelationVersion_CheckValid(formatVersion);
@@ -1068,7 +1059,7 @@ AppendOnlyExecutorReadBlock_ProcessTuple(
 		if (formatVersion < AORelationVersion_GetLatest())
 			tuple = upgrade_tuple(tuple, slot->tts_mt_bind, formatVersion, &shouldFree);
 		ExecStoreMinimalTuple(tuple, slot, shouldFree);
-		slot_set_ctid(slot, &(executorReadBlock->cdb_fake_ctid));
+		slot_set_ctid(slot, &fake_ctid);
 	}
 
 
@@ -1083,7 +1074,7 @@ AppendOnlyExecutorReadBlock_ProcessTuple(
 		     AppendOnlyStorageRead_RelationName(executorReadBlock->storageRead),
 		     AOTupleIdToString(aoTupleId),
 		     tupleLen,
-		     memtuple_get_size(tuple, executorReadBlock->mt_bind),
+		     memtuple_get_size(tuple, slot->tts_mt_bind),
 		     executorReadBlock->headerOffsetInFile);
 
 	return valid;

src/include/cdb/cdbappendonlyam.h

@@ -138,10 +138,6 @@ typedef struct AppendOnlyExecutorReadBlock
 	
 	uint8			*singleRow;
 	int32			singleRowLen;
-
-	/* synthetic system attributes */
-	ItemPointerData cdb_fake_ctid;
-	MemTupleBinding *mt_bind;
 } AppendOnlyExecutorReadBlock;
 
 /*