Skip to content

Allow isc_tpb_read_consistency to imply read committed #8746

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 3 commits into from
Sep 24, 2025
+51 −34
Merged

Allow isc_tpb_read_consistency to imply read committed #8746

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5f6ec1
Allow isc_tpb_read_consistency used alone to imply Read Committed Rea…
dyemanov Sep 21, 2025
44e9748
Sync the trace logic with MON$ tables regarding txn isolation, make i…
dyemanov Sep 21, 2025
8b1507e
Restore the original error for isc_tpb_[no_]rec_version version speci…
dyemanov Sep 21, 2025
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
80 changes: 58 additions & 22 deletions src/jrd/tra.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2929,39 +2929,85 @@ static void transaction_options(thread_db* tdbb,
{
case isc_tpb_consistency:
if (!isolation.assignOnce(true))
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_multiple_txn_isolation));
}

if (read_consistency.isAssigned())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
// 'Option @1 is not valid if @2 was used previously in TPB'
Arg::Gds(isc_tpb_conflicting_options) <<
Arg::Str("isc_tpb_consistency") << Arg::Str("isc_tpb_read_consistency"));
}

if (rec_version.isAssigned())
{
const auto tpbStr = rec_version.asBool() ?
"isc_tpb_rec_version" : "isc_tpb_no_rec_version";

ERR_post(Arg::Gds(isc_bad_tpb_content) <<
// 'Option @1 is not valid if @2 was used previously in TPB'
Arg::Gds(isc_tpb_conflicting_options) <<
Arg::Str("isc_tpb_consistency") << Arg::Str(tpbStr) );
}

if (shared_snapshot)
{
ERR_post(
Arg::Gds(isc_bad_tpb_content) <<
// 'Option @1 is not valid if @2 was used previously in TPB'
Arg::Gds(isc_tpb_conflicting_options) <<
Arg::Str("isc_tpb_consistency") << Arg::Str("isc_tpb_at_snapshot_number"));
}

transaction->tra_flags |= TRA_degree3;
transaction->tra_flags &= ~TRA_read_committed;
transaction->tra_flags &= ~(TRA_read_committed | TRA_read_consistency | TRA_rec_version);
break;

case isc_tpb_concurrency:
if (!isolation.assignOnce(true))
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_multiple_txn_isolation));
}

if (read_consistency.isAssigned())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
// 'Option @1 is not valid if @2 was used previously in TPB'
Arg::Gds(isc_tpb_conflicting_options) <<
Arg::Str("isc_tpb_concurrency") << Arg::Str("isc_tpb_read_consistency"));
}

if (rec_version.isAssigned())
{
const auto tpbStr = rec_version.asBool() ?
"isc_tpb_rec_version" : "isc_tpb_no_rec_version";

ERR_post(Arg::Gds(isc_bad_tpb_content) <<
// 'Option @1 is not valid if @2 was used previously in TPB'
Arg::Gds(isc_tpb_conflicting_options) <<
Arg::Str("isc_tpb_concurrency") << Arg::Str(tpbStr) );
}

transaction->tra_flags &= ~TRA_degree3;
transaction->tra_flags &= ~TRA_read_committed;
transaction->tra_flags &= ~(TRA_read_committed | TRA_read_consistency | TRA_rec_version);
break;

case isc_tpb_read_committed:
if (!isolation.assignOnce(true))
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_multiple_txn_isolation));
}

if (shared_snapshot)
{
ERR_post(
Arg::Gds(isc_bad_tpb_content) <<
// 'Option @1 is not valid if @2 was used previously in TPB'
Arg::Gds(isc_tpb_conflicting_options) <<
Arg::Str("isc_tpb_read_committed") << Arg::Str("isc_tpb_at_snapshot_number"));
}
Expand Down Expand Up @@ -3066,14 +3112,16 @@ static void transaction_options(thread_db* tdbb,

if (rec_version.isAssigned())
{
const auto tpbStr = rec_version.asBool() ?
"isc_tpb_rec_version" : "isc_tpb_no_rec_version";

ERR_post(Arg::Gds(isc_bad_tpb_content) <<
// 'Option @1 is not valid if @2 was used previously in TPB'
Arg::Gds(isc_tpb_conflicting_options) <<
Arg::Str("isc_tpb_read_consistency") << (rec_version.asBool() ?
Arg::Str("isc_tpb_rec_version") : Arg::Str("isc_tpb_no_rec_version")) );
Arg::Str("isc_tpb_read_consistency") << Arg::Str(tpbStr) );
}

transaction->tra_flags |= TRA_read_consistency | TRA_rec_version;
transaction->tra_flags |= TRA_read_committed | TRA_read_consistency | TRA_rec_version;
break;

case isc_tpb_nowait:
Expand Down Expand Up @@ -3479,24 +3527,12 @@ static void transaction_options(thread_db* tdbb,
}
}

if (rec_version.isAssigned() && !(transaction->tra_flags & TRA_read_committed))
{
if (rec_version.asBool())
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_option_without_rc) << Arg::Str("isc_tpb_rec_version"));
}
else
{
ERR_post(Arg::Gds(isc_bad_tpb_content) <<
Arg::Gds(isc_tpb_option_without_rc) << Arg::Str("isc_tpb_no_rec_version"));
}
}

if ((transaction->tra_flags & TRA_read_committed) && !(tdbb->tdbb_flags & TDBB_sweeper))
if ((transaction->tra_flags & TRA_read_committed) &&
!(transaction->tra_flags & TRA_read_consistency) &&
!(tdbb->tdbb_flags & TDBB_sweeper) &&
tdbb->getDatabase()->dbb_config->getReadConsistency())
{
if (tdbb->getDatabase()->dbb_config->getReadConsistency())
transaction->tra_flags |= TRA_read_consistency | TRA_rec_version;
transaction->tra_flags |= TRA_read_consistency | TRA_rec_version;
}

if (transaction->tra_attachment->isGbak())
Expand Down
26 changes: 10 additions & 16 deletions src/jrd/trace/TraceObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,27 +210,21 @@ int TraceTransactionImpl::getWait()

unsigned TraceTransactionImpl::getIsolation()
{
switch (m_tran->tra_flags & (TRA_read_committed | TRA_rec_version | TRA_degree3 | TRA_read_consistency))
{
case TRA_degree3:
if (m_tran->tra_flags & TRA_degree3)
return ISOLATION_CONSISTENCY;

case TRA_read_committed:
return ISOLATION_READ_COMMITTED_NORECVER;

case TRA_read_committed | TRA_rec_version:
return ISOLATION_READ_COMMITTED_RECVER;

case TRA_read_committed | TRA_rec_version | TRA_read_consistency:
return ISOLATION_READ_COMMITTED_READ_CONSISTENCY;
if (m_tran->tra_flags & TRA_read_committed)
{
if (m_tran->tra_flags & TRA_read_consistency)
return ISOLATION_READ_COMMITTED_READ_CONSISTENCY;

case 0:
return ISOLATION_CONCURRENCY;
if (m_tran->tra_flags & TRA_rec_version)
return ISOLATION_READ_COMMITTED_RECVER;

default:
fb_assert(false);
return ISOLATION_CONCURRENCY;
return ISOLATION_READ_COMMITTED_NORECVER;
}

return ISOLATION_CONCURRENCY;
}

ISC_INT64 TraceTransactionImpl::getInitialID()
Expand Down
Loading