Remove upgrade_tuple and related code.

These functions were used to upgrade AO relations from formats that
existed in GPDB 3/4X and are no longer relevant.

- formatversion is always > AORelationVersion_Aligned64bit, so convert_alignment is false
- PG82NumericConversionNeeded() is always false, so convert_numerics is always false

This also resolves a FIXME in appendonlyam.c

Authored-by: Brent Doil <[email protected]>

Author: bmdoil

src/backend/access/aocs/aocsam.c

@@ -675,80 +675,6 @@ aocs_endscan(AOCSScanDesc scan)
 	pfree(scan);
 }
 
-/*
- * Upgrades a Datum value from a previous version of the AOCS page format. The
- * DatumStreamRead that is passed must correspond to the column being upgraded.
- */
-static void upgrade_datum_impl(DatumStreamRead *ds, int attno, Datum values[],
-							   bool isnull[], int formatversion)
-{
-	bool 	convert_numeric = false;
-
-	if (PG82NumericConversionNeeded(formatversion))
-	{
-		/*
-		 * On the first call for this DatumStream, figure out if this column is
-		 * a numeric, or a domain over numerics.
-		 *
-		 * TODO: consolidate this code with upgrade_tuple() in appendonlyam.c.
-		 */
-		if (!OidIsValid(ds->baseTypeOid))
-		{
-			ds->baseTypeOid = getBaseType(ds->typeInfo.typid);
-		}
-
-		/* If this Datum is a numeric, we need to convert it. */
-		convert_numeric = (ds->baseTypeOid == NUMERICOID) && !isnull[attno];
-	}
-
-	if (convert_numeric)
-	{
-		/*
-		 * Before PostgreSQL 8.3, the n_weight and n_sign_dscale fields were the
-		 * other way 'round. Swap them.
-		 */
-		Datum 		datum;
-		char	   *numericdata;
-		char	   *upgradedata;
-		size_t		datalen;
-		uint16		tmp;
-
-		/*
-		 * We need to make a copy of this data so that any other tuples pointing
-		 * to it won't be affected. Store it in the upgrade space for this
-		 * DatumStream.
-		 */
-		datum = values[attno];
-		datalen = VARSIZE_ANY(DatumGetPointer(datum));
-
-		upgradedata = datumstreamread_get_upgrade_space(ds, datalen);
-		memcpy(upgradedata, DatumGetPointer(datum), datalen);
-
-		/* Swap the fields. */
-		numericdata = VARDATA_ANY(upgradedata);
-
-		memcpy(&tmp, &numericdata[0], 2);
-		memcpy(&numericdata[0], &numericdata[2], 2);
-		memcpy(&numericdata[2], &tmp, 2);
-
-		/* Re-point the Datum to the upgraded numeric. */
-		values[attno] = PointerGetDatum(upgradedata);
-	}
-}
-
-static void upgrade_datum_scan(AOCSScanDesc scan, int attno, Datum values[],
-							   bool isnull[], int formatversion)
-{
-	upgrade_datum_impl(scan->columnScanInfo.ds[attno], attno, values, isnull, formatversion);
-}
-
-static void upgrade_datum_fetch(AOCSFetchDesc fetch, int attno, Datum values[],
-								bool isnull[], int formatversion)
-{
-	upgrade_datum_impl(fetch->datumStreamFetchDesc[attno]->datumStream, attno,
-					   values, isnull, formatversion);
-}
-
 bool
 aocs_getnext(AOCSScanDesc scan, ScanDirection direction, TupleTableSlot *slot)
 {
@@ -849,15 +775,6 @@ aocs_getnext(AOCSScanDesc scan, ScanDirection direction, TupleTableSlot *slot)
 			 */
 			datumstreamread_get(scan->columnScanInfo.ds[attno], &d[attno], &null[attno]);
 
-			/*
-			 * Perform any required upgrades on the Datum we just fetched.
-			 */
-			if (curseginfo->formatversion < AOSegfileFormatVersion_GetLatest ())
-			{
-				upgrade_datum_scan(scan, attno, d, null,
-								   curseginfo->formatversion);
-			}
-
 			if (i == 0)
 			{
 				if (rowNum == INT64CONST(-1) &&
@@ -1291,18 +1208,8 @@ fetchFromCurrentBlock(AOCSFetchDesc aocsFetchDesc,
 	{
 		Datum	   *values = slot->tts_values;
 		bool	   *nulls = slot->tts_isnull;
-		int			formatversion = datumStream->ao_read.formatVersion;
 
 		datumstreamread_get(datumStream, &(values[colno]), &(nulls[colno]));
-
-		/*
-		 * Perform any required upgrades on the Datum we just fetched.
-		 */
-		if (formatversion < AOSegfileFormatVersion_GetLatest ())
-		{
-			upgrade_datum_fetch(aocsFetchDesc, colno, values, nulls,
-								formatversion);
-		}
 	}
 	else
 	{
@@ -2598,15 +2505,6 @@ aocs_getnext_sample(AOCSScanDesc scan, ScanDirection direction, TupleTableSlot *
 			 */
 			datumstreamread_get(scan->columnScanInfo.ds[attno], &d[attno], &null[attno]);
 
-			/*
-			 * Perform any required upgrades on the Datum we just fetched.
-			 */
-			if (curseginfo->formatversion < AOSegfileFormatVersion_GetLatest ())
-			{
-				upgrade_datum_scan(scan, attno, d, null,
-								   curseginfo->formatversion);
-			}
-
 			/*
 			 * set rowNum, aoTupleId and test visibility.
 			 */

src/backend/access/appendonly/appendonlyam.c

@@ -783,141 +783,6 @@ AppendOnlyExecutorReadBlock_ResetCounts(AppendOnlyExecutorReadBlock *executorRea
 	executorReadBlock->totalRowsScanned = 0;
 }
 
-/*
- * Given a tuple in 'formatversion', convert it to a format that is
- * understood by the rest of the system.
- */
-static MemTuple
-upgrade_tuple(AppendOnlyExecutorReadBlock *executorReadBlock,
-			  MemTuple mtup, MemTupleBinding *pbind, int formatversion, bool *shouldFree)
-{
-	TupleDesc	tupdesc = pbind->tupdesc;
-	const int	natts = tupdesc->natts;
-	MemTuple	newtuple;
-	int			i;
-
-	static Datum *values = NULL;
-	static bool *isnull = NULL;
-	static int	nallocated = 0;
-
-	bool		convert_alignment = false;
-	bool		convert_numerics = false;
-
-	/*
-	 * MPP-7372: If the AO table was created before the fix for this issue, it
-	 * may contain tuples with misaligned bindings. Here we check if the
-	 * stored memtuple is problematic and then create a clone of the tuple
-	 * with properly aligned bindings to be used by the executor.
-	 */
-	if (formatversion < AOSegfileFormatVersion_Aligned64bit &&
-		memtuple_has_misaligned_attribute(mtup, pbind))
-		convert_alignment = true;
-
-	if (PG82NumericConversionNeeded(formatversion))
-	{
-		/*
-		 * On first call, figure out which columns are numerics, or domains
-		 * over numerics.
-		 */
-		if (executorReadBlock->numericAtts == NULL)
-		{
-			int			n;
-
-			executorReadBlock->numericAtts = (int *) palloc(natts * sizeof(int));
-
-			n = 0;
-			for (i = 0; i < natts; i++)
-			{
-				Oid			typeoid;
-
-				typeoid = getBaseType(TupleDescAttr(tupdesc, i)->atttypid);
-				if (typeoid == NUMERICOID)
-					executorReadBlock->numericAtts[n++] = i;
-			}
-			executorReadBlock->numNumericAtts = n;
-		}
-
-		/* If there were any numeric columns, we need to convert them. */
-		if (executorReadBlock->numNumericAtts > 0)
-			convert_numerics = true;
-	}
-
-	if (!convert_alignment && !convert_numerics)
-	{
-		/* No conversion required. Return the original tuple unmodified. */
-		*shouldFree = false;
-		return mtup;
-	}
-
-	/* Conversion is needed. */
-
-	/* enlarge the arrays if needed */
-	if (natts > nallocated)
-	{
-		if (values)
-			pfree(values);
-		if (isnull)
-			pfree(isnull);
-		values = (Datum *) MemoryContextAlloc(TopMemoryContext, natts * sizeof(Datum));
-		isnull = (bool *) MemoryContextAlloc(TopMemoryContext, natts * sizeof(bool));
-		nallocated = natts;
-	}
-
-	if (convert_alignment)
-	{
-		/* get attribute values form mis-aligned tuple */
-		memtuple_deform_misaligned(mtup, pbind, values, isnull);
-		/* Form a new, properly-aligned, tuple */
-		newtuple = memtuple_form(pbind, values, isnull);
-	}
-	else
-	{
-		/*
-		 * make a modifiable copy
-		 */
-		newtuple = memtuple_copy(mtup);
-	}
-
-	/*
-	 * NOTE: we do this *after* creating the new tuple, so that we can modify
-	 * the new, copied, tuple in-place.
-	 */
-	if (convert_numerics)
-	{
-		int			i;
-
-		/*
-		 * Get pointers to the datums within the tuple
-		 */
-		memtuple_deform(newtuple, pbind, values, isnull);
-
-		for (i = 0; i < executorReadBlock->numNumericAtts; i++)
-		{
-			/*
-			 * Before PostgreSQL 8.3, the n_weight and n_sign_dscale fields
-			 * were the other way 'round. Swap them.
-			 */
-			Datum		datum;
-			char	   *numericdata;
-			uint16		tmp;
-
-			if (isnull[executorReadBlock->numericAtts[i]])
-				continue;
-
-			datum = values[executorReadBlock->numericAtts[i]];
-			numericdata = VARDATA_ANY(DatumGetPointer(datum));
-
-			memcpy(&tmp, &numericdata[0], 2);
-			memcpy(&numericdata[0], &numericdata[2], 2);
-			memcpy(&numericdata[2], &tmp, 2);
-		}
-	}
-
-	*shouldFree = true;
-	return newtuple;
-}
-
-
 static void
 AOExecutorReadBlockBindingInit(AppendOnlyExecutorReadBlock *executorReadBlock,
 									   TupleTableSlot *slot)
@@ -970,11 +835,6 @@ AppendOnlyExecutorReadBlock_ProcessTuple(AppendOnlyExecutorReadBlock *executorRe
 
 		Assert(executorReadBlock->mt_bind);
 
-		/* If the tuple is not in the latest format, convert it */
-		// GPDB_12_MERGE_FIXME: Is pg_upgrade from old versions still a thing? Can we drop this?
-		if (formatVersion < AOSegfileFormatVersion_GetLatest ())
-			tuple = upgrade_tuple(executorReadBlock, tuple, executorReadBlock->mt_bind, formatVersion, &shouldFree);
-
 		ExecClearTuple(slot);
 		memtuple_deform(tuple, executorReadBlock->mt_bind, slot->tts_values, slot->tts_isnull);
 		slot->tts_tid = fake_ctid;

src/include/catalog/pg_appendonly.h

@@ -118,15 +118,6 @@ static inline void AOSegfileFormatVersion_CheckValid(int version)
 	(version > AOSegfileFormatVersion_Original) \
 )
 
-/*
- * Are numerics stored in old, pre-PostgreSQL 8.3 format, and need converting?
- */
-#define PG82NumericConversionNeeded(version) \
-( \
-	AOSegfileFormatVersion_CheckValid(version), \
-	(version > AOSegfileFormatVersion_Original) \
-)
-
 extern void
 InsertAppendOnlyEntry(Oid relid,
 					  int blocksize,

src/test/isolation2/.gitignore

@@ -2,9 +2,6 @@ regression.diffs
 regression.out
 */dummy.sql
 */dummy.out
-sql/ao_upgrade.sql
-expected/ao_upgrade.out
-expected/ao_upgrade_optimizer.out
 sql/external_table.sql
 expected/external_table.out
 sql/fts_manual_probe.sql

src/test/isolation2/expected/.gitignore

@@ -1,6 +1,4 @@
 # ignores only for this directory
-/ao_upgrade.out
-/ao_upgrade_optimizer.out
 /external_table.out
 /fts_manual_probe.out
 /gp_collation.out