Skip to content

Commit cb71c85

Browse files
AlexPeshkoffAlexPeshkoff
committed
Avoid use of data members when working with MDC
1 parent b2b254c commit cb71c85

File tree

11 files changed

+32
-50
lines changed

11 files changed

+32
-50
lines changed

‎src/jrd/Attachment.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ void Jrd::Attachment::resetSession(thread_db* tdbb, jrd_tra** traHandle)
427427
{
428428
// Run ON DISCONNECT trigger before reset
429429
if (!(att_flags & ATT_no_db_triggers))
430-
att_database->dbb_mdc->runDBTriggers(tdbb, TRIGGER_DISCONNECT);
430+
MetadataCache::get(tdbb)->runDBTriggers(tdbb, TRIGGER_DISCONNECT);
431431

432432
// shutdown attachment on any error after this point
433433
shutAtt = true;

‎src/jrd/CacheVector.cpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ ULONG* TransactionNumber::getFlags(thread_db* tdbb)
7676

7777
MdcVersion VersionSupport::next(thread_db* tdbb)
7878
{
79-
return tdbb->getDatabase()->dbb_mdc->nextVersion();
79+
return MetadataCache::get(tdbb)->nextVersion();
8080
}
8181

8282

@@ -92,8 +92,7 @@ void ObjectBase::lockedExcl [[noreturn]] (thread_db* tdbb)
9292

9393
MemoryPool& CachePool::get(thread_db* tdbb)
9494
{
95-
Database* dbb = tdbb->getDatabase();
96-
return dbb->dbb_mdc->getPool();
95+
return MetadataCache::get(tdbb)->getPool();
9796
}
9897

9998

@@ -107,8 +106,7 @@ MemoryPool& CachePool::get(thread_db* tdbb)
107106

108107
void ElementBase::commitErase(thread_db* tdbb)
109108
{
110-
auto* mdc = tdbb->getDatabase()->dbb_mdc;
111-
mdc->objectCleanup(TransactionNumber::current(tdbb), this);
109+
MetadataCache::get(tdbb)->objectCleanup(TransactionNumber::current(tdbb), this);
112110
}
113111

114112
ElementBase::~ElementBase()

‎src/jrd/Function.epp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ const char* const Function::EXCEPTION_MESSAGE = "The user defined function: \t%s
6363

6464
Function* Function::lookup(thread_db* tdbb, MetaId id, ObjectBase::Flag flags)
6565
{
66-
Database* const dbb = tdbb->getDatabase();
67-
68-
Function* function = dbb->dbb_mdc->getFunction(tdbb, id, flags);
66+
Function* function = MetadataCache::get(tdbb)->getFunction(tdbb, id, flags);
6967
return function;
7068
}
7169

‎src/jrd/Statement.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ Statement::Statement(thread_db* tdbb, MemoryPool* p, CompilerScratch* csb)
187187

188188
void Statement::loadResources(thread_db* tdbb, Request* req)
189189
{
190-
const MdcVersion currentMdcVersion = tdbb->getDatabase()->dbb_mdc->getVersion();
190+
const MdcVersion currentMdcVersion = MetadataCache::get(tdbb)->getVersion();
191191
if ((!latest) || (latest->version != currentMdcVersion))
192192
{
193193
// Also check for changed streams from known sources

‎src/jrd/dfw.epp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3320,8 +3320,7 @@ void DFW_check_partners(thread_db* tdbb, const USHORT rel_id)
33203320
* Used when FK index was dropped
33213321
*
33223322
**************************************/
3323-
Database* const dbb = tdbb->getDatabase();
3324-
auto* relation = dbb->dbb_mdc->lookupRelation(tdbb, rel_id, CacheFlag::AUTOCREATE);
3323+
auto* relation = MetadataCache::get(tdbb)->lookupRelation(tdbb, rel_id, CacheFlag::AUTOCREATE);
33253324
fb_assert(relation);
33263325

33273326
relation->rel_flags |= REL_check_partners;

‎src/jrd/exe.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -636,10 +636,8 @@ void EXE_execute_db_triggers(thread_db* tdbb, jrd_tra* transaction, TriggerActio
636636
// Execute DDL triggers.
637637
void EXE_execute_ddl_triggers(thread_db* tdbb, jrd_tra* transaction, bool preTriggers, int action)
638638
{
639-
Jrd::Database* const dbb = tdbb->getDatabase();
640-
641639
// Our caller verifies (ATT_no_db_triggers) if DDL triggers should not run.
642-
const Triggers* cachedTriggers = dbb->dbb_mdc->getTriggers(tdbb, TRIGGER_TYPE_DDL);
640+
const Triggers* cachedTriggers = MetadataCache::get(tdbb)->getTriggers(tdbb, TRIGGER_TYPE_DDL);
643641

644642
if (cachedTriggers && *cachedTriggers)
645643
{

‎src/jrd/intl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ void CharSetContainer::unloadCollation(thread_db* tdbb, USHORT tt_id)
291291
Collation* coll(FB_FUNCTION);
292292
if (charset_collations.load(tdbb, id, coll))
293293
{
294-
MutexLockGuard g(tdbb->getDatabase()->dbb_mdc->mdc_use_mutex, FB_FUNCTION);
294+
MutexLockGuard g(MetadataCache::get(tdbb)->mdc_use_mutex, FB_FUNCTION);
295295
296296
if (coll->useCount != 0)
297297
{

‎src/jrd/met.epp‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ bool MetadataCache::get_texttype(thread_db* tdbb, TTypeId* id, const UCHAR* name
11971197
}
11981198
*p = 0;
11991199

1200-
auto mdc = tdbb->getDatabase()->dbb_mdc;
1200+
auto mdc = MetadataCache::get(tdbb);
12011201

12021202
// Is there a period, separating collation name from character set?
12031203
if (period)
@@ -2373,7 +2373,7 @@ jrd_prc* MetadataCache::lookup_procedure(thread_db* tdbb, const QualifiedName& n
23732373
**************************************/
23742374
SET_TDBB(tdbb);
23752375
Attachment* attachment = tdbb->getAttachment();
2376-
MetadataCache* mdc = attachment->att_database->dbb_mdc;
2376+
MetadataCache* mdc = MetadataCache::get(tdbb);
23772377

23782378

23792379
// See if we already know the procedure by name
@@ -2421,7 +2421,7 @@ jrd_prc* MetadataCache::lookup_procedure_id(thread_db* tdbb, MetaId id, ObjectBa
24212421
**************************************/
24222422
SET_TDBB(tdbb);
24232423
Attachment* attachment = tdbb->getAttachment();
2424-
MetadataCache* mdc = attachment->att_database->dbb_mdc;
2424+
MetadataCache* mdc = MetadataCache::get(tdbb);
24252425

24262426
return mdc->mdc_procedures.getObject(tdbb, id, flags);
24272427
}
@@ -2442,7 +2442,7 @@ Function* MetadataCache::lookup_function(thread_db* tdbb, const QualifiedName& n
24422442
**************************************/
24432443
SET_TDBB(tdbb);
24442444
Attachment* attachment = tdbb->getAttachment();
2445-
MetadataCache* mdc = attachment->att_database->dbb_mdc;
2445+
MetadataCache* mdc = MetadataCache::get(tdbb);
24462446

24472447

24482448
// See if we already know the function by name
@@ -2480,7 +2480,7 @@ Cached::Relation* MetadataCache::lookupRelation(thread_db* tdbb, const MetaName&
24802480
SET_TDBB(tdbb);
24812481

24822482
Attachment* attachment = tdbb->getAttachment();
2483-
MetadataCache* mdc = tdbb->getDatabase()->dbb_mdc;
2483+
MetadataCache* mdc = MetadataCache::get(tdbb);
24842484

24852485
// See if we already know the relation by name
24862486
auto* rc = mdc->mdc_relations.lookup(tdbb, [name](RelationPermanent* rel) { return rel->rel_name == name; }, flags);
@@ -2516,12 +2516,12 @@ jrd_rel* MetadataCache::lookup_relation(thread_db* tdbb, const MetaName& name, O
25162516
*
25172517
**************************************/
25182518
SET_TDBB(tdbb);
2519-
MetadataCache* mdc = tdbb->getDatabase()->dbb_mdc;
25202519

25212520
auto* perm = lookupRelation(tdbb, name, flags);
25222521
if (!perm)
25232522
return nullptr;
2524-
return mdc->mdc_relations.getObject(tdbb, perm->getId(), flags);
2523+
2524+
return MetadataCache::get(tdbb)->mdc_relations.getObject(tdbb, perm->getId(), flags);
25252525
}
25262526

25272527

@@ -2538,18 +2538,16 @@ jrd_rel* MetadataCache::lookup_relation_id(thread_db* tdbb, MetaId id, ObjectBas
25382538
*
25392539
**************************************/
25402540
SET_TDBB(tdbb);
2541-
MetadataCache* mdc = tdbb->getDatabase()->dbb_mdc;
25422541

2543-
return mdc->mdc_relations.getObject(tdbb, id, flags);
2542+
return MetadataCache::get(tdbb)->mdc_relations.getObject(tdbb, id, flags);
25442543
}
25452544

25462545

25472546
CharSetVers* MetadataCache::lookup_charset(thread_db* tdbb, CSetId id, ObjectBase::Flag flags)
25482547
{
25492548
SET_TDBB(tdbb);
2550-
MetadataCache* mdc = tdbb->getDatabase()->dbb_mdc;
25512549

2552-
return mdc->mdc_charsets.getObject(tdbb, id, flags);
2550+
return MetadataCache::get(tdbb)->mdc_charsets.getObject(tdbb, id, flags);
25532551
}
25542552

25552553

@@ -2642,11 +2640,8 @@ jrd_prc* MetadataCache::findProcedure(thread_db* tdbb, MetaId id, ObjectBase::Fl
26422640
*
26432641
**************************************/
26442642
SET_TDBB(tdbb);
2645-
Attachment* attachment = tdbb->getAttachment();
2646-
Database* dbb = tdbb->getDatabase();
2647-
MetadataCache* mdc = dbb->dbb_mdc;
26482643

2649-
return mdc->mdc_procedures.getObject(tdbb, id, flags);
2644+
return MetadataCache::get(tdbb)->mdc_procedures.getObject(tdbb, id, flags);
26502645
}
26512646

26522647
jrd_prc* jrd_prc::create(thread_db* tdbb, MemoryPool&, Cached::Procedure* perm)
@@ -3582,7 +3577,7 @@ DSqlCacheItem* MetadataCache::get_dsql_cache_item(thread_db* tdbb, sym_type type
35823577
{
35833578
Database* dbb = tdbb->getDatabase();
35843579
Attachment* attachment = tdbb->getAttachment();
3585-
MetadataCache* mdc = attachment->att_database->dbb_mdc;
3580+
MetadataCache* mdc = MetadataCache::get(tdbb);
35863581

35873582
fb_assert((int) type <= MAX_UCHAR);
35883583
UCHAR ucharType = (UCHAR) type;
@@ -4812,11 +4807,6 @@ void MetadataCache::invalidateReplSet(thread_db* tdbb)
48124807
}
48134808
}
48144809

4815-
MetadataCache* MetadataCache::get(thread_db* tdbb)
4816-
{
4817-
return tdbb->getDatabase()->dbb_mdc;
4818-
}
4819-
48204810
Cached::Triggers* MetadataCache::getTriggersSet(thread_db* tdbb, MetaId triggerId)
48214811
{
48224812
if (triggerId & TRIGGER_TYPE_MASK == TRIGGER_TYPE_DB)
@@ -4984,7 +4974,7 @@ Cached::Function* MetadataCache::lookupFunction(thread_db* tdbb, MetaId id, Obje
49844974
{
49854975
SET_TDBB(tdbb);
49864976

4987-
MetadataCache* mdc = tdbb->getDatabase()->dbb_mdc;
4977+
MetadataCache* mdc = MetadataCache::get(tdbb);
49884978
auto* rc = mdc->mdc_functions.getData(tdbb, id, flags);
49894979
if (rc || !(flags & CacheFlag::AUTOCREATE))
49904980
return rc;
@@ -4999,7 +4989,7 @@ Cached::Procedure* MetadataCache::lookupProcedure(thread_db* tdbb, MetaId id, Ob
49994989
{
50004990
SET_TDBB(tdbb);
50014991

5002-
MetadataCache* mdc = tdbb->getDatabase()->dbb_mdc;
4992+
MetadataCache* mdc = MetadataCache::get(tdbb);
50034993
auto* rc = mdc->mdc_procedures.getData(tdbb, id, flags);
50044994
if (rc || !(flags & CacheFlag::AUTOCREATE))
50054995
return rc;
@@ -5056,7 +5046,7 @@ Cached::CharSet* MetadataCache::getCharSet(thread_db* tdbb, CSetId id, ObjectBas
50565046
{
50575047
SET_TDBB(tdbb);
50585048

5059-
MetadataCache* mdc = tdbb->getDatabase()->dbb_mdc;
5049+
MetadataCache* mdc = MetadataCache::get(tdbb);
50605050
auto* rc = mdc->mdc_charsets.getData(tdbb, id, flags);
50615051
if (rc || !(flags & CacheFlag::AUTOCREATE))
50625052
return rc;

‎src/jrd/met.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,10 @@ class MetadataCache : public Firebird::PermanentStorage
307307
static void post_existence(thread_db* tdbb, jrd_rel* relation);
308308
static jrd_prc* findProcedure(thread_db* tdbb, MetaId id, ObjectBase::Flag flags);
309309
static IndexStatus getIndexStatus(bool nullFlag, int inactive);
310-
static MetadataCache* get(thread_db* tdbb);
310+
static MetadataCache* get(thread_db* tdbb)
311+
{
312+
return getCache(tdbb);
313+
}
311314

312315
template<typename ID>
313316
static bool get_char_coll_subtype(thread_db* tdbb, ID* id, const UCHAR* name, USHORT length)

‎src/jrd/tra.cpp‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2445,9 +2445,7 @@ void MetadataCache::release_temp_tables(thread_db* tdbb, jrd_tra* transaction)
24452445
* Release data of temporary tables with transaction lifetime
24462446
*
24472447
**************************************/
2448-
MetadataCache* mdc = tdbb->getDatabase()->dbb_mdc;
2449-
2450-
for (auto* relation : mdc->mdc_relations)
2448+
for (auto* relation : MetadataCache::get(tdbb)->mdc_relations)
24512449
{
24522450
if (relation->rel_flags & REL_temp_tran)
24532451
relation->delPages(tdbb, transaction->tra_number);
@@ -2468,9 +2466,7 @@ void MetadataCache::retain_temp_tables(thread_db* tdbb, jrd_tra* transaction, Tr
24682466
* transaction number (see retain_context).
24692467
*
24702468
**************************************/
2471-
MetadataCache* mdc = tdbb->getDatabase()->dbb_mdc;
2472-
2473-
for (auto* relation : mdc->mdc_relations)
2469+
for (auto* relation : MetadataCache::get(tdbb)->mdc_relations)
24742470
{
24752471
if (relation->rel_flags & REL_temp_tran)
24762472
relation->retainPages(tdbb, transaction->tra_number, new_number);
@@ -4018,7 +4014,7 @@ void jrd_tra::checkBlob(thread_db* tdbb, const bid* blob_id, jrd_fld* fld, bool
40184014
if (!tra_blobs->locate(blob_id->bid_temp_id()) &&
40194015
!tra_fetched_blobs.locate(*blob_id))
40204016
{
4021-
MetadataCache* mdc = tra_attachment->att_database->dbb_mdc;
4017+
MetadataCache* mdc = MetadataCache::get(tdbb);
40224018
auto* blobRelation = mdc->lookupRelationNoChecks(rel_id); // optimization with NoChecks
40234019
// correct rel definitely present
40244020
if (blobRelation)

0 commit comments

Comments
 (0)