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

Refactor UpdateStripeMetadataRow for improved error handling and code clarity

m3hm3t/pg18_columnar_write_1
Mehmet Yilmaz 2025-06-23 17:20:38 +00:00
parent fc93466516
commit 096a510dfe
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1418,14 +1418,12 @@ 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 ---------------- */
bool newNulls[Natts_columnar_stripe] = { false }; bool newNulls[Natts_columnar_stripe] = { false };
TupleDesc tupleDescriptor = RelationGetDescr(columnarStripes); TupleDesc tupleDescriptor = RelationGetDescr(columnarStripes);
HeapTuple modifiedTuple = heap_modify_tuple(oldTuple, HeapTuple modifiedTuple = heap_modify_tuple(oldTuple,
@ -1434,27 +1432,39 @@ UpdateStripeMetadataRow(uint64 storageId, uint64 stripeId, bool *update,
newNulls, newNulls,
update); update);
#if PG_VERSION_NUM < 180000 #if PG_VERSION_NUM < PG_VERSION_18
/* Fast path: true in‑place update (same physical tuple) */ /*
* heap_inplace_update already doesn't allow changing size of the original
* tuple, so we don't allow setting any Datum's to NULL values.
*/
heap_inplace_update(columnarStripes, modifiedTuple); heap_inplace_update(columnarStripes, modifiedTuple);
HeapTuple newTuple = oldTuple; /* contents overwritten in place */
/*
* Existing tuple now contains modifications, because we used
* heap_inplace_update().
*/
HeapTuple newTuple = oldTuple;
#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;
#endif #endif
CommandCounterIncrement(); CommandCounterIncrement();
/* Build StripeMetadata from the up‑to‑date tuple */ /*
* Must not pass modifiedTuple, because BuildStripeMetadata expects a real
* heap tuple with MVCC fields.
*/
StripeMetadata *modifiedStripeMetadata = StripeMetadata *modifiedStripeMetadata =
BuildStripeMetadata(columnarStripes, newTuple); BuildStripeMetadata(columnarStripes, newTuple);
systable_endscan(scanDescriptor); systable_endscan(scanDescriptor);
table_close(columnarStripes, openLockMode); table_close(columnarStripes, openLockMode);
/* return StripeMetadata object built from modified tuple */
return modifiedStripeMetadata; return modifiedStripeMetadata;
} }