Fixed assertion in DROP DATABASE reported in devel

Author: AlexPeshkoff

src/jrd/Relation.cpp

@@ -778,6 +778,10 @@ bool GCLock::acquire(thread_db* tdbb, int wait)
 		oldFlags = gcFlags.load(std::memory_order_acquire);			// and retry
 	}
 
+	// No need to use LM for LTT
+	if (gcRel->isLTT())
+		return true;
+
 	// We incremented counter from 0 to 1 - take care about lck
 	if (!gcLck)
 		gcLck = gcRel->createLock(tdbb, LCK_rel_gc, false);
@@ -826,7 +830,7 @@ void GCLock::downgrade(thread_db* tdbb)
 		checkGuard(newFlags);
 	} while (!gcFlags.compare_exchange_weak(oldFlags, newFlags, std::memory_order_release, std::memory_order_acquire));
 
-	if ((newFlags & GC_counterMask == 0) && (newFlags & GC_blocking))
+	if ((!gcRel->isLTT()) && (newFlags & GC_counterMask == 0) && (newFlags & GC_blocking))
 	{
 		fb_assert(newFlags & GC_locked);
 		fb_assert(gcLck->lck_id);
@@ -886,6 +890,9 @@ bool GCLock::disable(thread_db* tdbb, int wait, Lock*& tempLock)
 		return false;
 	}
 
+	if (gcRel->isLTT())
+		return true;
+
 	ensureReleased(tdbb);
 
 	// we need no AST here
@@ -901,6 +908,9 @@ bool GCLock::disable(thread_db* tdbb, int wait, Lock*& tempLock)
 
 void GCLock::ensureReleased(thread_db* tdbb)
 {
+	if (!gcLck)
+		return;
+
 	unsigned oldFlags = gcFlags.load(std::memory_order_acquire);
 	for (;;)
 	{
@@ -980,7 +990,7 @@ const QualifiedName& IndexPermanent::getName()
 
 FB_UINT64 IndexPermanent::makeLockId(MetaId relId, MetaId indexId)
 {
-	if (MetadataCache::isLtt(relId))
+	if (MetadataCache::isLTT(relId))
 		return ElementBase::NO_METALOCK;
 
 	const int REL_ID_KEY_OFFSET = 16;

src/jrd/met.h

@@ -439,7 +439,7 @@ class MetadataCache : public Firebird::PermanentStorage
 		return rc;
 	}
 
-	static bool isLtt(MetaId id)
+	static bool isLTT(MetaId id)
 	{
 		return (id >= MIN_LTT_ID && id <= MAX_LTT_ID);
 	}
@@ -618,7 +618,7 @@ template <>
 inline jrd_rel* MetadataCache::getVersioned<Cached::Relation, jrd_rel>(thread_db* tdbb,
 	MetaId id, ObjectBase::Flag flags)
 {
-	if (isLtt(id))
+	if (isLTT(id))
 		return getLtt(tdbb, id);
 
 	auto& vector = getCache(tdbb)->mdc_relations;
@@ -642,7 +642,7 @@ template <>
 inline Cached::Relation* MetadataCache::getPerm<Cached::Relation>(thread_db* tdbb,
 	MetaId id, ObjectBase::Flag flags)
 {
-	if (isLtt(id))
+	if (isLTT(id))
 		return getPermanent(getLtt(tdbb, id));
 
 	auto& vector = getCache(tdbb)->mdc_relations;