Skip to content

Fix #7700 - SKIP LOCKED returns conflict error or wait when config ReadConsistency = 0 #7701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 13, 2023
Merged

Fix #7700 - SKIP LOCKED returns conflict error or wait when config ReadConsistency = 0 #7701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61d3164
Fix #7700 - SKIP LOCKED returns conflict error or wait when config Re…
asfernandes Aug 6, 2023
ae1b4cc
Rename RecordLock::DONT to NONE.
asfernandes Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/dsql/StmtNodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2658,7 +2658,7 @@ const StmtNode* EraseNode::erase(thread_db* tdbb, Request* request, WhichTrigger

if (rpb->rpb_runtime_flags & RPB_refetch)
{
VIO_refetch_record(tdbb, rpb, transaction, false, false);
VIO_refetch_record(tdbb, rpb, transaction, RecordLock::NONE, false);
rpb->rpb_runtime_flags &= ~RPB_refetch;
}

Expand Down Expand Up @@ -7112,7 +7112,7 @@ const StmtNode* ModifyNode::modify(thread_db* tdbb, Request* request, WhichTrigg

if (orgRpb->rpb_runtime_flags & RPB_refetch)
{
VIO_refetch_record(tdbb, orgRpb, transaction, false, false);
VIO_refetch_record(tdbb, orgRpb, transaction, RecordLock::NONE, false);
orgRpb->rpb_runtime_flags &= ~RPB_refetch;
}

Expand Down Expand Up @@ -10547,9 +10547,9 @@ static void cleanupRpb(thread_db* tdbb, record_param* rpb)
}

// Try to set write lock on record until success or record exists
static void forceWriteLock(thread_db * tdbb, record_param * rpb, jrd_tra * transaction)
static void forceWriteLock(thread_db* tdbb, record_param* rpb, jrd_tra* transaction)
{
while (VIO_refetch_record(tdbb, rpb, transaction, true, true))
while (VIO_refetch_record(tdbb, rpb, transaction, RecordLock::LOCK, true))
{
rpb->rpb_runtime_flags &= ~RPB_refetch;

Expand Down
2 changes: 1 addition & 1 deletion src/jrd/recsrc/RecordSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ bool RecordStream::refetchRecord(thread_db* tdbb) const

if (rpb->rpb_runtime_flags & RPB_refetch)
{
if (VIO_refetch_record(tdbb, rpb, transaction, true, false))
if (VIO_refetch_record(tdbb, rpb, transaction, RecordLock::LOCK, false))
{
rpb->rpb_runtime_flags &= ~RPB_refetch;
return true;
Expand Down
2 changes: 1 addition & 1 deletion src/jrd/recsrc/SortedStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ void SortedStream::mapData(thread_db* tdbb, Request* request, UCHAR* data) const

tdbb->bumpRelStats(RuntimeStatistics::RECORD_RPT_READS, relation->rel_id);

if (VIO_chase_record_version(tdbb, &temp, transaction, tdbb->getDefaultPool(), false, false))
if (VIO_chase_record_version(tdbb, &temp, transaction, tdbb->getDefaultPool(), RecordLock::NONE, false))
{
if (!(temp.rpb_runtime_flags & RPB_undo_data))
VIO_data(tdbb, &temp, tdbb->getDefaultPool());
Expand Down
25 changes: 13 additions & 12 deletions src/jrd/vio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ void VIO_backout(thread_db* tdbb, record_param* rpb, const jrd_tra* transaction)

bool VIO_chase_record_version(thread_db* tdbb, record_param* rpb,
jrd_tra* transaction, MemoryPool* pool,
bool writelock, bool noundo)
RecordLock recordLock, bool noundo)
{
/**************************************
*
Expand Down Expand Up @@ -1258,9 +1258,10 @@ bool VIO_chase_record_version(thread_db* tdbb, record_param* rpb,
// If the transaction is a read committed and chooses the no version
// option, wait for reads also!

if ((transaction->tra_flags & TRA_read_committed) &&
if (recordLock != RecordLock::SKIP &&
(transaction->tra_flags & TRA_read_committed) &&
!(transaction->tra_flags & TRA_read_consistency) &&
(!(transaction->tra_flags & TRA_rec_version) || writelock))
(!(transaction->tra_flags & TRA_rec_version) || recordLock == RecordLock::LOCK))
{
if (state == tra_limbo)
{
Expand Down Expand Up @@ -1975,7 +1976,7 @@ bool VIO_erase(thread_db* tdbb, record_param* rpb, jrd_tra* transaction)

if (rpb->rpb_runtime_flags & (RPB_refetch | RPB_undo_read))
{
VIO_refetch_record(tdbb, rpb, transaction, false, true);
VIO_refetch_record(tdbb, rpb, transaction, RecordLock::NONE, true);
rpb->rpb_runtime_flags &= ~RPB_refetch;
fb_assert(!(rpb->rpb_runtime_flags & RPB_undo_read));
}
Expand Down Expand Up @@ -2904,7 +2905,7 @@ bool VIO_get(thread_db* tdbb, record_param* rpb, jrd_tra* transaction, MemoryPoo
const USHORT lock_type = (rpb->rpb_stream_flags & RPB_s_update) ? LCK_write : LCK_read;

if (!DPM_get(tdbb, rpb, lock_type) ||
!VIO_chase_record_version(tdbb, rpb, transaction, pool, false, false))
!VIO_chase_record_version(tdbb, rpb, transaction, pool, RecordLock::NONE, false))
{
return false;
}
Expand Down Expand Up @@ -3279,7 +3280,7 @@ bool VIO_modify(thread_db* tdbb, record_param* org_rpb, record_param* new_rpb, j
old_record->copyFrom(org_rpb->rpb_record);
}

VIO_refetch_record(tdbb, org_rpb, transaction, false, true);
VIO_refetch_record(tdbb, org_rpb, transaction, RecordLock::NONE, true);
org_rpb->rpb_runtime_flags &= ~RPB_refetch;
fb_assert(!(org_rpb->rpb_runtime_flags & RPB_undo_read));

Expand Down Expand Up @@ -3760,7 +3761,7 @@ bool VIO_next_record(thread_db* tdbb,
{
return false;
}
} while (!VIO_chase_record_version(tdbb, rpb, transaction, pool, false, false));
} while (!VIO_chase_record_version(tdbb, rpb, transaction, pool, RecordLock::NONE, false));

if (rpb->rpb_runtime_flags & RPB_undo_data)
fb_assert(rpb->getWindow(tdbb).win_bdb == NULL);
Expand Down Expand Up @@ -3838,7 +3839,7 @@ Record* VIO_record(thread_db* tdbb, record_param* rpb, const Format* format, Mem


bool VIO_refetch_record(thread_db* tdbb, record_param* rpb, jrd_tra* transaction,
bool writelock, bool noundo)
RecordLock recordLock, bool noundo)
{
/**************************************
*
Expand All @@ -3861,9 +3862,9 @@ bool VIO_refetch_record(thread_db* tdbb, record_param* rpb, jrd_tra* transaction
const TraNumber tid_fetch = rpb->rpb_transaction_nr;

if (!DPM_get(tdbb, rpb, LCK_read) ||
!VIO_chase_record_version(tdbb, rpb, transaction, tdbb->getDefaultPool(), writelock, noundo))
!VIO_chase_record_version(tdbb, rpb, transaction, tdbb->getDefaultPool(), recordLock, noundo))
{
if (writelock)
if (recordLock == RecordLock::LOCK)
return false;

ERR_post(Arg::Gds(isc_no_cur_rec));
Expand All @@ -3887,7 +3888,7 @@ bool VIO_refetch_record(thread_db* tdbb, record_param* rpb, jrd_tra* transaction
// make sure the record has not been updated. Also, punt after
// VIO_data() call which will release the page.

if (!writelock &&
if (recordLock != RecordLock::LOCK &&
(transaction->tra_flags & TRA_read_committed) &&
(tid_fetch != rpb->rpb_transaction_nr) &&
// added to check that it was not current transaction,
Expand Down Expand Up @@ -4483,7 +4484,7 @@ WriteLockResult VIO_writelock(thread_db* tdbb, record_param* org_rpb, jrd_tra* t

if (org_rpb->rpb_runtime_flags & (RPB_refetch | RPB_undo_read))
{
if (!VIO_refetch_record(tdbb, org_rpb, transaction, true, true))
if (!VIO_refetch_record(tdbb, org_rpb, transaction, (skipLocked ? RecordLock::SKIP : RecordLock::LOCK), true))
return WriteLockResult::CONFLICTED;

org_rpb->rpb_runtime_flags &= ~RPB_refetch;
Expand Down
11 changes: 9 additions & 2 deletions src/jrd/vio_proto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ namespace Jrd
DPM_next_pointer_page // data pages from one pointer page
};

enum class RecordLock
{
NONE,
LOCK,
SKIP
};

enum class WriteLockResult
{
LOCKED,
Expand All @@ -54,7 +61,7 @@ namespace Jrd

void VIO_backout(Jrd::thread_db*, Jrd::record_param*, const Jrd::jrd_tra*);
bool VIO_chase_record_version(Jrd::thread_db*, Jrd::record_param*,
Jrd::jrd_tra*, MemoryPool*, bool, bool);
Jrd::jrd_tra*, MemoryPool*, Jrd::RecordLock, bool);
void VIO_copy_record(Jrd::thread_db*, Jrd::jrd_rel*, Jrd::Record*, Jrd::Record*);
void VIO_data(Jrd::thread_db*, Jrd::record_param*, MemoryPool*);
bool VIO_erase(Jrd::thread_db*, Jrd::record_param*, Jrd::jrd_tra*);
Expand All @@ -69,7 +76,7 @@ Jrd::WriteLockResult VIO_writelock(Jrd::thread_db*, Jrd::record_param*, Jrd::jrd
bool VIO_modify(Jrd::thread_db*, Jrd::record_param*, Jrd::record_param*, Jrd::jrd_tra*);
bool VIO_next_record(Jrd::thread_db*, Jrd::record_param*, Jrd::jrd_tra*, MemoryPool*, Jrd::FindNextRecordScope);
Jrd::Record* VIO_record(Jrd::thread_db*, Jrd::record_param*, const Jrd::Format*, MemoryPool*);
bool VIO_refetch_record(Jrd::thread_db*, Jrd::record_param*, Jrd::jrd_tra*, bool, bool);
bool VIO_refetch_record(Jrd::thread_db*, Jrd::record_param*, Jrd::jrd_tra*, Jrd::RecordLock, bool);
void VIO_store(Jrd::thread_db*, Jrd::record_param*, Jrd::jrd_tra*);
bool VIO_sweep(Jrd::thread_db*, Jrd::jrd_tra*, Jrd::TraceSweepEvent*);
void VIO_intermediate_gc(Jrd::thread_db* tdbb, Jrd::record_param* rpb, Jrd::jrd_tra* transaction);
Expand Down