Refactor UpdateStripeMetadataRow for improved readability and consistency

m3hm3t/pg18_columnar_write_1
Mehmet Yilmaz 2025-06-23 17:08:35 +00:00
parent e9e976d331
commit fc93466516
1 changed files with 39 additions and 33 deletions

View File

@ -1392,9 +1392,11 @@ UpdateStripeMetadataRow(uint64 storageId, uint64 stripeId, bool *update,
Oid columnarStripesOid = ColumnarStripeRelationId(); Oid columnarStripesOid = ColumnarStripeRelationId();
#if PG_VERSION_NUM >= 180000 #if PG_VERSION_NUM >= 180000
/* CatalogTupleUpdate performs a normal heap UPDATE → RowExclusiveLock */ /* CatalogTupleUpdate performs a normal heap UPDATE → RowExclusiveLock */
const LOCKMODE openLockMode = RowExclusiveLock; const LOCKMODE openLockMode = RowExclusiveLock;
#else #else
/* Inplace update never changed tuple length → AccessShareLock was enough */ /* Inplace update never changed tuple length → AccessShareLock was enough */
const LOCKMODE openLockMode = AccessShareLock; const LOCKMODE openLockMode = AccessShareLock;
#endif #endif
@ -1415,11 +1417,13 @@ UpdateStripeMetadataRow(uint64 storageId, uint64 stripeId, bool *update,
HeapTuple oldTuple = systable_getnext(scanDescriptor); HeapTuple oldTuple = systable_getnext(scanDescriptor);
if (!HeapTupleIsValid(oldTuple)) if (!HeapTupleIsValid(oldTuple))
{
ereport(ERROR, ereport(ERROR,
(errmsg("attempted to modify an unexpected stripe, " (errmsg("attempted to modify an unexpected stripe, "
"columnar storage with id=" UINT64_FORMAT "columnar storage with id=" UINT64_FORMAT
" does not have stripe with id=" UINT64_FORMAT, " does not have stripe with id=" UINT64_FORMAT,
storageId, stripeId))); storageId, stripeId)));
}
/* ---------------- construct the new tuple ---------------- */ /* ---------------- construct the new tuple ---------------- */
bool newNulls[Natts_columnar_stripe] = { false }; bool newNulls[Natts_columnar_stripe] = { false };
@ -1431,10 +1435,12 @@ UpdateStripeMetadataRow(uint64 storageId, uint64 stripeId, bool *update,
update); update);
#if PG_VERSION_NUM < 180000 #if PG_VERSION_NUM < 180000
/* Fast path: true inplace update (same physical tuple) */ /* Fast path: true inplace update (same physical tuple) */
heap_inplace_update(columnarStripes, modifiedTuple); heap_inplace_update(columnarStripes, modifiedTuple);
HeapTuple newTuple = oldTuple; /* contents overwritten in place */ HeapTuple newTuple = oldTuple; /* contents overwritten in place */
#else #else
/* Regular catalog UPDATE keeps indexes in sync */ /* Regular catalog UPDATE keeps indexes in sync */
CatalogTupleUpdate(columnarStripes, &oldTuple->t_self, modifiedTuple); CatalogTupleUpdate(columnarStripes, &oldTuple->t_self, modifiedTuple);
HeapTuple newTuple = modifiedTuple; /* freshly written tuple */ HeapTuple newTuple = modifiedTuple; /* freshly written tuple */