diff options
Diffstat (limited to 'src/backend/executor/nodeModifyTable.c')
-rw-r--r-- | src/backend/executor/nodeModifyTable.c | 80 |
1 files changed, 41 insertions, 39 deletions
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index 3125e5c993d..a3c0e915434 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -236,7 +236,7 @@ ExecCheckTIDVisible(EState *estate, if (!IsolationUsesXactSnapshot()) return; - if (!table_fetch_row_version(rel, tid, SnapshotAny, tempSlot)) + if (!table_tuple_fetch_row_version(rel, tid, SnapshotAny, tempSlot)) elog(ERROR, "failed to fetch conflicting tuple for ON CONFLICT"); ExecCheckTupleVisible(estate, rel, tempSlot); ExecClearTuple(tempSlot); @@ -544,11 +544,11 @@ ExecInsert(ModifyTableState *mtstate, specToken = SpeculativeInsertionLockAcquire(GetCurrentTransactionId()); /* insert the tuple, with the speculative token */ - table_insert_speculative(resultRelationDesc, slot, - estate->es_output_cid, - 0, - NULL, - specToken); + table_tuple_insert_speculative(resultRelationDesc, slot, + estate->es_output_cid, + 0, + NULL, + specToken); /* insert index entries for tuple */ recheckIndexes = ExecInsertIndexTuples(slot, estate, true, @@ -556,8 +556,8 @@ ExecInsert(ModifyTableState *mtstate, arbiterIndexes); /* adjust the tuple's state accordingly */ - table_complete_speculative(resultRelationDesc, slot, - specToken, !specConflict); + table_tuple_complete_speculative(resultRelationDesc, slot, + specToken, !specConflict); /* * Wake up anyone waiting for our decision. They will re-check @@ -584,9 +584,9 @@ ExecInsert(ModifyTableState *mtstate, else { /* insert the tuple normally */ - table_insert(resultRelationDesc, slot, - estate->es_output_cid, - 0, NULL); + table_tuple_insert(resultRelationDesc, slot, + estate->es_output_cid, + 0, NULL); /* insert index entries for tuple */ if (resultRelInfo->ri_NumIndices > 0) @@ -766,13 +766,13 @@ ExecDelete(ModifyTableState *mtstate, * mode transactions. */ ldelete:; - result = table_delete(resultRelationDesc, tupleid, - estate->es_output_cid, - estate->es_snapshot, - estate->es_crosscheck_snapshot, - true /* wait for commit */ , - &tmfd, - changingPart); + result = table_tuple_delete(resultRelationDesc, tupleid, + estate->es_output_cid, + estate->es_snapshot, + estate->es_crosscheck_snapshot, + true /* wait for commit */ , + &tmfd, + changingPart); switch (result) { @@ -832,7 +832,7 @@ ldelete:; inputslot = EvalPlanQualSlot(epqstate, resultRelationDesc, resultRelInfo->ri_RangeTableIndex); - result = table_lock_tuple(resultRelationDesc, tupleid, + result = table_tuple_lock(resultRelationDesc, tupleid, estate->es_snapshot, inputslot, estate->es_output_cid, LockTupleExclusive, LockWaitBlock, @@ -875,7 +875,7 @@ ldelete:; * out. * * See also TM_SelfModified response to - * table_delete() above. + * table_tuple_delete() above. */ if (tmfd.cmax != estate->es_output_cid) ereport(ERROR, @@ -900,7 +900,7 @@ ldelete:; * locking the latest version via * TUPLE_LOCK_FLAG_FIND_LAST_VERSION. */ - elog(ERROR, "unexpected table_lock_tuple status: %u", + elog(ERROR, "unexpected table_tuple_lock status: %u", result); return NULL; } @@ -918,7 +918,8 @@ ldelete:; return NULL; default: - elog(ERROR, "unrecognized table_delete status: %u", result); + elog(ERROR, "unrecognized table_tuple_delete status: %u", + result); return NULL; } @@ -990,8 +991,8 @@ ldelete:; } else { - if (!table_fetch_row_version(resultRelationDesc, tupleid, - SnapshotAny, slot)) + if (!table_tuple_fetch_row_version(resultRelationDesc, tupleid, + SnapshotAny, slot)) elog(ERROR, "failed to fetch deleted tuple for DELETE RETURNING"); } } @@ -1134,7 +1135,7 @@ ExecUpdate(ModifyTableState *mtstate, * If we generate a new candidate tuple after EvalPlanQual testing, we * must loop back here and recheck any RLS policies and constraints. * (We don't need to redo triggers, however. If there are any BEFORE - * triggers then trigger.c will have done table_lock_tuple to lock the + * triggers then trigger.c will have done table_tuple_lock to lock the * correct tuple, so there's no need to do them again.) */ lreplace:; @@ -1309,12 +1310,12 @@ lreplace:; * needed for referential integrity updates in transaction-snapshot * mode transactions. */ - result = table_update(resultRelationDesc, tupleid, slot, - estate->es_output_cid, - estate->es_snapshot, - estate->es_crosscheck_snapshot, - true /* wait for commit */ , - &tmfd, &lockmode, &update_indexes); + result = table_tuple_update(resultRelationDesc, tupleid, slot, + estate->es_output_cid, + estate->es_snapshot, + estate->es_crosscheck_snapshot, + true /* wait for commit */ , + &tmfd, &lockmode, &update_indexes); switch (result) { @@ -1373,7 +1374,7 @@ lreplace:; inputslot = EvalPlanQualSlot(epqstate, resultRelationDesc, resultRelInfo->ri_RangeTableIndex); - result = table_lock_tuple(resultRelationDesc, tupleid, + result = table_tuple_lock(resultRelationDesc, tupleid, estate->es_snapshot, inputslot, estate->es_output_cid, lockmode, LockWaitBlock, @@ -1412,7 +1413,7 @@ lreplace:; * otherwise error out. * * See also TM_SelfModified response to - * table_update() above. + * table_tuple_update() above. */ if (tmfd.cmax != estate->es_output_cid) ereport(ERROR, @@ -1422,8 +1423,8 @@ lreplace:; return NULL; default: - /* see table_lock_tuple call in ExecDelete() */ - elog(ERROR, "unexpected table_lock_tuple status: %u", + /* see table_tuple_lock call in ExecDelete() */ + elog(ERROR, "unexpected table_tuple_lock status: %u", result); return NULL; } @@ -1440,7 +1441,8 @@ lreplace:; return NULL; default: - elog(ERROR, "unrecognized table_update status: %u", result); + elog(ERROR, "unrecognized table_tuple_update status: %u", + result); return NULL; } @@ -1521,7 +1523,7 @@ ExecOnConflictUpdate(ModifyTableState *mtstate, * previous conclusion that the tuple is conclusively committed is not * true anymore. */ - test = table_lock_tuple(relation, conflictTid, + test = table_tuple_lock(relation, conflictTid, estate->es_snapshot, existing, estate->es_output_cid, lockmode, LockWaitBlock, 0, @@ -1612,7 +1614,7 @@ ExecOnConflictUpdate(ModifyTableState *mtstate, return false; default: - elog(ERROR, "unrecognized table_lock_tuple status: %u", test); + elog(ERROR, "unrecognized table_tuple_lock status: %u", test); } /* Success, the tuple is locked. */ @@ -1677,7 +1679,7 @@ ExecOnConflictUpdate(ModifyTableState *mtstate, /* * Note that it is possible that the target tuple has been modified in - * this session, after the above table_lock_tuple. We choose to not error + * this session, after the above table_tuple_lock. We choose to not error * out in that case, in line with ExecUpdate's treatment of similar cases. * This can happen if an UPDATE is triggered from within ExecQual(), * ExecWithCheckOptions() or ExecProject() above, e.g. by selecting from a |