Before adding conversion to non-safe PTRs

Author: AlexPeshkoff

src/common/classes/sparse_bitmap.h

@@ -31,6 +31,7 @@
 #define SPARSE_BITMAP_H
 
 #include "../common/classes/alloc.h"
+#include "../common/classes/tree.h"
 
 namespace Firebird {
 

src/dsql/DsqlCompilerScratch.cpp

@@ -1105,3 +1105,20 @@ BoolExprNode* DsqlCompilerScratch::pass1JoinIsRecursive(RecordSourceNode*& input
 
 	return NULL;
 }
+
+// hvlad: each member of recursive CTE can refer to CTE itself (only once) via
+// CTE name or via alias. We need to substitute this aliases when processing CTE
+// member to resolve field names. Therefore we store all aliases in order of
+// occurrence and later use it in backward order (since our parser is right-to-left).
+// Also we put CTE name after all such aliases to distinguish aliases for
+// different CTE's.
+// We also need to repeat this process if main select expression contains union with
+// recursive CTE
+
+void DsqlCompilerScratch::addCTEAlias(const string& alias)
+{
+	thread_db* tdbb = JRD_get_thread_data();
+	fb_assert(currCteAlias == NULL);
+	cteAliases.add(FB_NEW_POOL(*tdbb->getDefaultPool()) string(*tdbb->getDefaultPool(), alias));
+}
+

src/dsql/DsqlCompilerScratch.h

@@ -211,21 +211,7 @@ class DsqlCompilerScratch : public BlrDebugWriter
 	SelectExprNode* findCTE(const MetaName& name);
 	void clearCTEs();
 	void checkUnusedCTEs();
-
-	// hvlad: each member of recursive CTE can refer to CTE itself (only once) via
-	// CTE name or via alias. We need to substitute this aliases when processing CTE
-	// member to resolve field names. Therefore we store all aliases in order of
-	// occurrence and later use it in backward order (since our parser is right-to-left).
-	// Also we put CTE name after all such aliases to distinguish aliases for
-	// different CTE's.
-	// We also need to repeat this process if main select expression contains union with
-	// recursive CTE
-	void addCTEAlias(const Firebird::string& alias)
-	{
-		thread_db* tdbb = JRD_get_thread_data();
-		fb_assert(currCteAlias == NULL);
-		cteAliases.add(FB_NEW_POOL(*tdbb->getDefaultPool()) Firebird::string(*tdbb->getDefaultPool(), alias));
-	}
+	void addCTEAlias(const Firebird::string& alias);
 
 	const Firebird::string* getNextCTEAlias()
 	{

src/jrd/Attachment.cpp

@@ -42,6 +42,7 @@
 #include "../jrd/tpc_proto.h"
 
 #include "../jrd/extds/ExtDS.h"
+#include "../jrd/met.h"
 
 #include "../jrd/replication/Applier.h"
 #include "../jrd/replication/Manager.h"
@@ -265,7 +266,6 @@ Jrd::Attachment::Attachment(MemoryPool* pool, Database* dbb, JProvider* provider
 	  att_utility(UTIL_NONE),
 	  att_dec_status(DecimalStatus::DEFAULT),
 	  att_pools(*pool),
-	  att_mdc(*pool),
 	  att_idle_timeout(0),
 	  att_stmt_timeout(0),
 	  att_batches(*pool),
@@ -462,7 +462,7 @@ void Jrd::Attachment::resetSession(thread_db* tdbb, jrd_tra** traHandle)
 	{
 		// Run ON DISCONNECT trigger before reset
 		if (!(att_flags & ATT_no_db_triggers))
-			att_mdc.runDBTriggers(tdbb, TRIGGER_DISCONNECT);
+			att_database->dbb_mdc->runDBTriggers(tdbb, TRIGGER_DISCONNECT);
 
 		// shutdown attachment on any error after this point
 		shutAtt = true;
@@ -500,11 +500,11 @@ void Jrd::Attachment::resetSession(thread_db* tdbb, jrd_tra** traHandle)
 			SCL_release_all(att_security_classes);
 
 		// reset GTT's
-		att_mdc.releaseGTTs(tdbb);
+		att_database->dbb_mdc->releaseGTTs(tdbb);
 
 		// Run ON CONNECT trigger after reset
 		if (!(att_flags & ATT_no_db_triggers))
-			att_mdc.runDBTriggers(tdbb, TRIGGER_CONNECT);
+			att_database->dbb_mdc->runDBTriggers(tdbb, TRIGGER_CONNECT);
 
 		if (oldTran)
 		{
@@ -623,7 +623,7 @@ void Jrd::Attachment::initLocks(thread_db* tdbb)
 
 void Jrd::Attachment::releaseLocks(thread_db* tdbb)
 {
-	att_mdc.releaseLocks(tdbb);
+	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! to database att_mdc.releaseLocks(tdbb);
 
 	// Release the DSQL cache locks
 
@@ -877,13 +877,13 @@ void Attachment::checkReplSetLock(thread_db* tdbb)
 	}
 }
 
-// Move to database level ????????
+// Move to database level ???????? !!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 void Attachment::invalidateReplSet(thread_db* tdbb, bool broadcast)
 {
 	att_flags |= ATT_repl_reset;
 
-	att_mdc.invalidateReplSet(tdbb);
+	att_database->dbb_mdc->invalidateReplSet(tdbb);
 
 	if (broadcast)
 	{

src/jrd/Attachment.h

@@ -48,7 +48,6 @@
 #include "../jrd/EngineInterface.h"
 #include "../jrd/sbm.h"
 #include "../jrd/HazardPtr.h"
-#include "../jrd/met.h"
 
 #include <atomic>
 
@@ -582,8 +581,6 @@ class Attachment : public pool_alloc<type_att>
 	MemoryPool* createPool();
 	void deletePool(MemoryPool* pool);
 
-	MetadataCache att_mdc;
-
 	/// former Database members - end
 
 	bool locksmith(thread_db* tdbb, SystemPrivilege sp) const;

src/jrd/Database.cpp

@@ -40,7 +40,7 @@
 #include "../jrd/CryptoManager.h"
 #include "../jrd/os/pio_proto.h"
 #include "../common/os/os_utils.h"
-//#include "../dsql/Parser.h"
+#include "../jrd/met.h"
 
 // Thread data block
 #include "../common/ThreadData.h"
@@ -569,6 +569,42 @@ namespace Jrd
 		return m_replMgr;
 	}
 
+	Database::Database(MemoryPool* p, Firebird::IPluginConfig* pConf, bool shared)
+	:	dbb_permanent(p),
+		dbb_page_manager(this, *p),
+		dbb_file_id(*p),
+		dbb_modules(*p),
+		dbb_extManager(nullptr),
+		dbb_flags(shared ? DBB_shared : 0),
+		dbb_filename(*p),
+		dbb_database_name(*p),
+#ifdef HAVE_ID_BY_NAME
+		dbb_id(*p),
+#endif
+		dbb_owner(*p),
+		dbb_pools(*p, 4),
+		dbb_sort_buffers(*p),
+		dbb_gc_fini(*p, garbage_collector, THREAD_medium),
+		dbb_stats(*p),
+		dbb_lock_owner_id(getLockOwnerId()),
+		dbb_tip_cache(NULL),
+		dbb_creation_date(Firebird::TimeZoneUtil::getCurrentGmtTimeStamp()),
+		dbb_external_file_directory_list(NULL),
+		dbb_init_fini(FB_NEW_POOL(*getDefaultMemoryPool()) ExistenceRefMutex()),
+		dbb_linger_seconds(0),
+		dbb_linger_end(0),
+		dbb_plugin_config(pConf),
+		dbb_repl_sequence(0),
+		dbb_replica_mode(REPLICA_NONE),
+		dbb_compatibility_index(~0U),
+		dbb_dic(*p),
+		dbb_mdc(FB_NEW_POOL(*p) MetadataCache(*p)),
+		dbb_delayed_delete(*p, *p)
+	{
+		dbb_pools.add(p);
+	}
+
+
 	GlobalPtr<Database::GlobalObjectHolder::DbIdHash>
 		Database::GlobalObjectHolder::g_hashTable;
 	GlobalPtr<Mutex> Database::GlobalObjectHolder::g_mutex;

src/jrd/Database.h

@@ -35,6 +35,7 @@
 #include "../common/gdsassert.h"
 #include "../common/dsc.h"
 #include "../jrd/btn.h"
+#include "../jrd/vec.h"
 #include "../jrd/jrd_proto.h"
 #include "../jrd/val.h"
 #include "../jrd/irq.h"
@@ -90,6 +91,7 @@ class MonitoringData;
 class GarbageCollector;
 class CryptoManager;
 class KeywordsMap;
+class MetadataCache;
 
 // allocator for keywords table
 class KeywordsMapAllocator
@@ -99,118 +101,6 @@ class KeywordsMapAllocator
 	static void destroy(KeywordsMap* inst);
 };
 
-// general purpose vector
-template <class T, BlockType TYPE = type_vec>
-class vec_base : protected pool_alloc<TYPE>
-{
-public:
-	typedef typename Firebird::Array<T>::iterator iterator;
-	typedef typename Firebird::Array<T>::const_iterator const_iterator;
-
-	/*
-	static vec_base* newVector(MemoryPool& p, int len)
-	{
-		return FB_NEW_POOL(p) vec_base<T, TYPE>(p, len);
-	}
-
-	static vec_base* newVector(MemoryPool& p, const vec_base& base)
-	{
-		return FB_NEW_POOL(p) vec_base<T, TYPE>(p, base);
-	}
-	*/
-
-	FB_SIZE_T count() const { return v.getCount(); }
-	T& operator[](FB_SIZE_T index) { return v[index]; }
-	const T& operator[](FB_SIZE_T index) const { return v[index]; }
-
-	iterator begin() { return v.begin(); }
-	iterator end() { return v.end(); }
-
-	const_iterator begin() const { return v.begin(); }
-	const_iterator end() const { return v.end(); }
-
-	void clear() { v.clear(); }
-
-	T* memPtr() { return &v[0]; }
-
-	void resize(FB_SIZE_T n, T val = T()) { v.resize(n, val); }
-
-	void operator delete(void* mem) { MemoryPool::globalFree(mem); }
-
-protected:
-	vec_base(MemoryPool& p, int len)
-		: v(p, len)
-	{
-		v.resize(len);
-	}
-
-	vec_base(MemoryPool& p, const vec_base& base)
-		: v(p)
-	{
-		v = base.v;
-	}
-
-private:
-	Firebird::Array<T> v;
-};
-
-template <typename T>
-class vec : public vec_base<T, type_vec>
-{
-public:
-	static vec* newVector(MemoryPool& p, int len)
-	{
-		return FB_NEW_POOL(p) vec<T>(p, len);
-	}
-
-	static vec* newVector(MemoryPool& p, const vec& base)
-	{
-		return FB_NEW_POOL(p) vec<T>(p, base);
-	}
-
-	static vec* newVector(MemoryPool& p, vec* base, int len)
-	{
-		if (!base)
-			base = FB_NEW_POOL(p) vec<T>(p, len);
-		else if (len > (int) base->count())
-			base->resize(len);
-		return base;
-	}
-
-private:
-	vec(MemoryPool& p, int len) : vec_base<T, type_vec>(p, len) {}
-	vec(MemoryPool& p, const vec& base) : vec_base<T, type_vec>(p, base) {}
-};
-
-class vcl : public vec_base<ULONG, type_vcl>
-{
-public:
-	static vcl* newVector(MemoryPool& p, int len)
-	{
-		return FB_NEW_POOL(p) vcl(p, len);
-	}
-
-	static vcl* newVector(MemoryPool& p, const vcl& base)
-	{
-		return FB_NEW_POOL(p) vcl(p, base);
-	}
-
-	static vcl* newVector(MemoryPool& p, vcl* base, int len)
-	{
-		if (!base)
-			base = FB_NEW_POOL(p) vcl(p, len);
-		else if (len > (int) base->count())
-			base->resize(len);
-		return base;
-	}
-
-private:
-	vcl(MemoryPool& p, int len) : vec_base<ULONG, type_vcl>(p, len) {}
-	vcl(MemoryPool& p, const vcl& base) : vec_base<ULONG, type_vcl>(p, base) {}
-};
-
-typedef vec<TraNumber> TransactionsVector;
-
 
 //
 // bit values for dbb_flags
@@ -546,7 +436,7 @@ class Database : public pool_alloc<type_dbb>
 	Dictionary dbb_dic;					// metanames dictionary
 	Firebird::InitInstance<KeywordsMap, KeywordsMapAllocator, Firebird::TraditionalDelete> dbb_keywords_map;
 
-	MetadataCache dbb_mdc;
+	MetadataCache* dbb_mdc;
 	HazardDelayedDelete dbb_delayed_delete;
 	Firebird::Mutex dbb_dd_mutex;
 
@@ -588,41 +478,7 @@ class Database : public pool_alloc<type_dbb>
 	}
 
 private:
-	Database(MemoryPool* p, Firebird::IPluginConfig* pConf, bool shared)
-	:	dbb_permanent(p),
-		dbb_page_manager(this, *p),
-		dbb_file_id(*p),
-		dbb_modules(*p),
-		dbb_extManager(nullptr),
-		dbb_flags(shared ? DBB_shared : 0),
-		dbb_filename(*p),
-		dbb_database_name(*p),
-#ifdef HAVE_ID_BY_NAME
-		dbb_id(*p),
-#endif
-		dbb_owner(*p),
-		dbb_pools(*p, 4),
-		dbb_sort_buffers(*p),
-		dbb_gc_fini(*p, garbage_collector, THREAD_medium),
-		dbb_stats(*p),
-		dbb_lock_owner_id(getLockOwnerId()),
-		dbb_tip_cache(NULL),
-		dbb_creation_date(Firebird::TimeZoneUtil::getCurrentGmtTimeStamp()),
-		dbb_external_file_directory_list(NULL),
-		dbb_init_fini(FB_NEW_POOL(*getDefaultMemoryPool()) ExistenceRefMutex()),
-		dbb_linger_seconds(0),
-		dbb_linger_end(0),
-		dbb_plugin_config(pConf),
-		dbb_repl_sequence(0),
-		dbb_replica_mode(REPLICA_NONE),
-		dbb_compatibility_index(~0U),
-		dbb_dic(*p),
-		dbb_mdc(*p),
-		dbb_delayed_delete(*p, *p)
-	{
-		dbb_pools.add(p);
-	}
-
+	Database(MemoryPool* p, Firebird::IPluginConfig* pConf, bool shared);
 	~Database();
 
 public:

src/jrd/ExtEngineManager.cpp

@@ -46,6 +46,7 @@
 #include "../jrd/Function.h"
 #include "../jrd/TimeZone.h"
 #include "../jrd/SystemPackages.h"
+#include "../jrd/met.h"
 #include "../common/isc_proto.h"
 #include "../common/classes/auto.h"
 #include "../common/classes/fb_string.h"