external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor UpdateStripeMetadataRow to handle locking modes based on PostgreSQL version

m3hm3t/pg18_columnar_write_1
Mehmet Yilmaz 2025-06-23 16:35:37 +00:00
parent 433e22e995
commit e9e976d331
1 changed files with 39 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/backend/columnar/columnar_metadata.c
View File

@ -1391,7 +1391,15 @@ UpdateStripeMetadataRow(uint64 storageId, uint64 stripeId, bool *update,
Oid columnarStripesOid = ColumnarStripeRelationId(); Oid columnarStripesOid = ColumnarStripeRelationId();
Relation columnarStripes = table_open(columnarStripesOid, AccessShareLock); #if PG_VERSION_NUM >= 180000
/* CatalogTupleUpdate performs a normal heap UPDATE → RowExclusiveLock */
const LOCKMODE openLockMode = RowExclusiveLock;
#else
/* In‑place update never changed tuple length → AccessShareLock was enough */
const LOCKMODE openLockMode = AccessShareLock;
#endif
Relation columnarStripes = table_open(columnarStripesOid, openLockMode);
Oid indexId = ColumnarStripePKeyIndexRelationId(); Oid indexId = ColumnarStripePKeyIndexRelationId();
bool indexOk = OidIsValid(indexId); bool indexOk = OidIsValid(indexId);
@ -1405,58 +1413,43 @@ UpdateStripeMetadataRow(uint64 storageId, uint64 stripeId, bool *update,
loggedSlowMetadataAccessWarning = true; loggedSlowMetadataAccessWarning = true;
} }
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 ---------------- */
bool newNulls[Natts_columnar_stripe] = {false};
TupleDesc tupleDescriptor = RelationGetDescr(columnarStripes);
HeapTuple modifiedTuple = heap_modify_tuple(oldTuple,
tupleDescriptor,
newValues,
newNulls,
update);
/* #if PG_VERSION_NUM < 180000
* heap_modify_tuple + heap_inplace_update only exist on PG < 18; /* Fast path: true in‑place update (same physical tuple) */
* on PG18 the in-place helper was removed upstream, so we skip the whole block. heap_inplace_update(columnarStripes, modifiedTuple);
*/ HeapTuple newTuple = oldTuple; /* contents overwritten in place */
#if PG_VERSION_NUM < PG_VERSION_18 #else
/* Regular catalog UPDATE keeps indexes in sync */
/* CatalogTupleUpdate(columnarStripes, &oldTuple->t_self, modifiedTuple);
* heap_inplace_update already doesn't allow changing size of the original HeapTuple newTuple = modifiedTuple; /* freshly written tuple */
* tuple, so we don't allow setting any Datum's to NULL values.
*/
bool newNulls[Natts_columnar_stripe] = { false };
TupleDesc tupleDescriptor = RelationGetDescr(columnarStripes);
HeapTuple modifiedTuple = heap_modify_tuple(oldTuple,
tupleDescriptor,
newValues,
newNulls,
update);
heap_inplace_update(columnarStripes, modifiedTuple);
#endif #endif
CommandCounterIncrement();
/* /* Build StripeMetadata from the up‑to‑date tuple */
* Existing tuple now contains modifications, because we used StripeMetadata *modifiedStripeMetadata =
* heap_inplace_update(). BuildStripeMetadata(columnarStripes, newTuple);
*/
HeapTuple newTuple = oldTuple;
/* systable_endscan(scanDescriptor);
* Must not pass modifiedTuple, because BuildStripeMetadata expects a real table_close(columnarStripes, openLockMode);
* heap tuple with MVCC fields.
*/
StripeMetadata *modifiedStripeMetadata = BuildStripeMetadata(columnarStripes,
newTuple);
CommandCounterIncrement(); return modifiedStripeMetadata;
systable_endscan(scanDescriptor);
table_close(columnarStripes, AccessShareLock);
/* return StripeMetadata object built from modified tuple */
return modifiedStripeMetadata;
} }