Check for simple (trivially copyable) type in Array, some more or less related fixes around

Author: AlexPeshkoff

src/common/classes/MetaString.h

@@ -60,7 +60,7 @@ class MetaString
 	MetaString() { init(); count = 0; }
 	MetaString(const char* s) { assign(s); }
 	MetaString(const char* s, FB_SIZE_T l) { assign(s, l); }
-	MetaString(const MetaString& m) { set(m); }
+	MetaString(const MetaString& m) = default;	//{ set(m); }
 	MetaString(const AbstractString& s) { assign(s.c_str(), s.length()); }
 	explicit MetaString(MemoryPool&) { init(); count = 0; }
 	MetaString(MemoryPool&, const char* s) { assign(s); }
@@ -72,7 +72,7 @@ class MetaString
 	MetaString& assign(const char* s) { return assign(s, s ? fb_strlen(s) : 0); }
 	MetaString& operator=(const char* s) { return assign(s); }
 	MetaString& operator=(const AbstractString& s) { return assign(s.c_str(), s.length()); }
-	MetaString& operator=(const MetaString& m) { return set(m); }
+	MetaString& operator=(const MetaString& m) = default;	//{ return set(m); }
 	char* getBuffer(const FB_SIZE_T l);
 
 	FB_SIZE_T length() const { return count; }

src/common/classes/Nullable.h

@@ -129,12 +129,12 @@ template <typename T> class Nullable : public BaseNullable<T>
 		this->specified = true;
 	}
 
-	Nullable<T>(const Nullable<T>& o)
-	{
+	Nullable<T>(const Nullable<T>& o) = default;
+/*	{
 		this->value = o.value;
 		this->specified = o.specified;
 	}
-
+*/
 	Nullable<T>()
 	{
 		invalidate();

src/common/classes/array.h

@@ -29,6 +29,7 @@
 
 #include "../common/gdsassert.h"
 #include <initializer_list>
+#include <type_traits>
 #include <string.h>
 #include "../common/classes/vector.h"
 #include "../common/classes/alloc.h"
@@ -71,6 +72,8 @@ class EmptyStorage : public AutoStorage
 template <typename T, typename Storage = EmptyStorage<T> >
 class Array : protected Storage
 {
+	static_assert(std::is_trivially_copyable<T>(), "Only simple (trivially copyable) types supported in array");
+
 public:
 	typedef FB_SIZE_T size_type;
 	typedef FB_SSIZE_T difference_type;

src/common/classes/fb_pair.h

@@ -47,6 +47,7 @@ template<typename parLeft, typename parRight>
 			: first(v1), second(v2) { }
 		explicit NonPooled(MemoryPool&, const NonPooled& lp)
 			: first(lp.first), second(lp.second) { }
+		NonPooled(const NonPooled& lp) = default;
 		parLeft first;
 		parRight second;
 	};
@@ -64,6 +65,8 @@ template<typename parLeft, typename parRight>
 			: first(v1), second(p, v2) { }
 		explicit Right(MemoryPool& p, const Right& lp)
 			: first(lp.first), second(p, lp.second) { }
+		Right(const Right& lp)
+			: first(lp.first), second(AutoStorage::getAutoMemoryPool(), lp.second) { }
 		parLeft first;
 		parRight second;
 	};
@@ -81,6 +84,8 @@ template<typename parLeft, typename parRight>
 			: first(p, v1), second(v2) { }
 		explicit Left(MemoryPool& p, const Left& lp)
 			: first(p, lp.first), second(lp.second) { }
+		Left(const Left& lp)
+			: first(AutoStorage::getAutoMemoryPool(), lp.first), second(lp.second) { }
 		parLeft first;
 		parRight second;
 	};
@@ -97,6 +102,9 @@ template<typename parLeft, typename parRight>
 			: first(p, v1), second(p, v2) { }
 		explicit Full(MemoryPool& p, const Full& lp)
 			: first(p, lp.first), second(p, lp.second) { }
+		Full(const Full& lp)
+			: first(AutoStorage::getAutoMemoryPool(), lp.first),
+			  second(AutoStorage::getAutoMemoryPool(), lp.second) { }
 		parLeft first;
 		parRight second;
 	};
@@ -116,8 +124,7 @@ template<typename BasePair>
 		Pair() : BasePair(AutoStorage::getAutoMemoryPool()) { }
 		Pair(const Pair_first_type& v1, const Pair_second_type& v2)
 			: BasePair(AutoStorage::getAutoMemoryPool(), v1, v2) { }
-		Pair(const Pair& lp)
-			: BasePair(AutoStorage::getAutoMemoryPool(), lp) { }
+		Pair(const Pair& lp) = default;
 		bool operator==(const Pair& v) const
 		{
 			return this->first == v.first && this->second == v.second;

src/dsql/dsql.cpp

@@ -53,6 +53,7 @@
 #include "../dsql/movd_proto.h"
 #include "../dsql/pass1_proto.h"
 #include "../dsql/metd_proto.h"
+#include "../jrd/Database.h"
 #include "../jrd/DataTypeUtil.h"
 #include "../jrd/blb_proto.h"
 #include "../jrd/cmp_proto.h"
@@ -113,6 +114,16 @@ dsql_dbb::~dsql_dbb()
 {
 }
 
+MemoryPool* dsql_dbb::createPool()
+{
+	return dbb_attachment->att_database->createPool();
+}
+
+void dsql_dbb::deletePool(MemoryPool* pool)
+{
+	dbb_attachment->att_database->deletePool(pool);
+}
+
 
 // Execute a dynamic SQL statement.
 void DSQL_execute(thread_db* tdbb,
@@ -410,7 +421,7 @@ static dsql_dbb* init(thread_db* tdbb, Jrd::Attachment* attachment)
 	if (attachment->att_dsql_instance)
 		return attachment->att_dsql_instance;
 
-	MemoryPool& pool = *attachment->createPool();
+	MemoryPool& pool = *attachment->att_database->createPool();
 	dsql_dbb* const database = FB_NEW_POOL(pool) dsql_dbb(pool);
 	database->dbb_attachment = attachment;
 	attachment->att_dsql_instance = database;

src/dsql/dsql.h

@@ -149,16 +149,8 @@ class dsql_dbb : public pool_alloc<dsql_type_dbb>
 	{}
 
 	~dsql_dbb();
-
-	MemoryPool* createPool()
-	{
-		return dbb_attachment->createPool();
-	}
-
-	void deletePool(MemoryPool* pool)
-	{
-		dbb_attachment->deletePool(pool);
-	}
+	MemoryPool* createPool();
+	void deletePool(MemoryPool* pool);
 };
 
 //! Relation block

src/jrd/Attachment.cpp

@@ -43,6 +43,7 @@
 
 #include "../jrd/extds/ExtDS.h"
 #include "../jrd/met.h"
+#include "../jrd/Statement.h"
 
 #include "../jrd/replication/Applier.h"
 #include "../jrd/replication/Manager.h"
@@ -150,42 +151,6 @@ void Jrd::Attachment::destroy(Attachment* const attachment)
 }
 
 
-MemoryPool* Jrd::Attachment::createPool()
-{
-	MemoryPool* const pool = MemoryPool::createPool(att_pool, att_memory_stats);
-	att_pools.add(pool);
-	return pool;
-}
-
-
-void Jrd::Attachment::deletePool(MemoryPool* pool)
-{
-	if (pool)
-	{
-		FB_SIZE_T pos;
-		if (att_pools.find(pool, pos))
-			att_pools.remove(pos);
-
-#ifdef DEBUG_LCK_LIST
-		// hvlad: this could be slow, use only when absolutely necessary
-		for (Lock* lock = att_long_locks; lock; )
-		{
-			Lock* next = lock->lck_next;
-			if (BtrPageGCLock::checkPool(lock, pool))
-			{
-				gds__log("DEBUG_LCK_LIST: found not detached lock 0x%p in deleting pool 0x%p", lock, pool);
-
-				//delete lock;
-				lock->setLockAttachment(NULL);
-			}
-			lock = next;
-		}
-#endif
-		MemoryPool::deletePool(pool);
-	}
-}
-
-
 bool Jrd::Attachment::backupStateWriteLock(thread_db* tdbb, SSHORT wait)
 {
 	if (att_backup_state_counter++)
@@ -267,7 +232,6 @@ Jrd::Attachment::Attachment(MemoryPool* pool, Database* dbb, JProvider* provider
 	  att_repl_appliers(*pool),
 	  att_utility(UTIL_NONE),
 	  att_dec_status(DecimalStatus::DEFAULT),
-	  att_pools(*pool),
 	  att_idle_timeout(0),
 	  att_stmt_timeout(0),
 	  att_batches(*pool),
@@ -290,9 +254,6 @@ Jrd::Attachment::~Attachment()
 	for (unsigned n = 0; n < att_batches.getCount(); ++n)
 		att_batches[n]->resetHandle();
 
-	while (att_pools.hasData())
-		deletePool(att_pools.pop());
-
 	// For normal attachments that happens in release_attachment(),
 	// but for special ones like GC should be done also in dtor -
 	// they do not (and should not) call release_attachment().

src/jrd/Attachment.h

@@ -577,15 +577,6 @@ class Attachment : public pool_alloc<type_att>
 	static int blockingAstMonitor(void*);
 	static int blockingAstReplSet(void*);
 
-	/// former Database members - start
-
-	Firebird::Array<MemoryPool*>	att_pools;		// pools
-
-	MemoryPool* createPool();
-	void deletePool(MemoryPool* pool);
-
-	/// former Database members - end
-
 	bool locksmith(thread_db* tdbb, SystemPrivilege sp) const;
 	jrd_tra* getSysTransaction();
 	void setSysTransaction(jrd_tra* trans);	// used only by TRA_init

src/jrd/Function.epp

@@ -47,6 +47,7 @@
 #include "../common/utils_proto.h"
 #include "../jrd/DebugInterface.h"
 #include "../jrd/QualifiedName.h"
+#include "../jrd/Statement.h"
 
 #include "../jrd/Function.h"
 
@@ -328,7 +329,7 @@ HazardPtr<Function> Function::loadMetadata(thread_db* tdbb, USHORT id, bool nosc
 				{
 					function->setDefaultCount(function->getDefaultCount() + 1);
 
-					MemoryPool* const csb_pool = attachment->createPool();
+					MemoryPool* const csb_pool = dbb->createPool();
 					Jrd::ContextPoolHolder context(tdbb, csb_pool);
 
 					try
@@ -338,7 +339,7 @@ HazardPtr<Function> Function::loadMetadata(thread_db* tdbb, USHORT id, bool nosc
 					}
 					catch (const Exception&)
 					{
-						attachment->deletePool(csb_pool);
+						dbb->deletePool(csb_pool);
 						throw; // an explicit error message would be better
 					}
 				}
@@ -396,7 +397,7 @@ HazardPtr<Function> Function::loadMetadata(thread_db* tdbb, USHORT id, bool nosc
 			}
 			else if (!X.RDB$ENGINE_NAME.NULL || !X.RDB$FUNCTION_BLR.NULL)
 			{
-				MemoryPool* const csb_pool = attachment->createPool();
+				MemoryPool* const csb_pool = dbb->createPool();
 				Jrd::ContextPoolHolder context(tdbb, csb_pool);
 
 				try
@@ -442,7 +443,7 @@ HazardPtr<Function> Function::loadMetadata(thread_db* tdbb, USHORT id, bool nosc
 				}
 				catch (const Exception&)
 				{
-					attachment->deletePool(csb_pool);
+					dbb->deletePool(csb_pool);
 					throw;
 				}
 
@@ -525,7 +526,7 @@ void Function::releaseLocks(thread_db* tdbb)
 	{
 		LCK_release(tdbb, existenceLock);
 		flags |= Routine::FLAG_CHECK_EXISTENCE;
-		useCount = 0;
+		// !!!!!!!!!!!!!! useCount = 0;
 	}
 }
 
@@ -544,6 +545,7 @@ bool Function::reload(thread_db* tdbb)
 	fb_assert(this->flags & Routine::FLAG_RELOAD);
 
 	Attachment* attachment = tdbb->getAttachment();
+	Database* dbb = tdbb->getDatabase();
 	AutoCacheRequest request(tdbb, irq_l_funct_blr, IRQ_REQUESTS);
 
 	FOR(REQUEST_HANDLE request)
@@ -553,7 +555,7 @@ bool Function::reload(thread_db* tdbb)
 		if (X.RDB$FUNCTION_BLR.NULL)
 			continue;
 
-		MemoryPool* const csb_pool = attachment->createPool();
+		MemoryPool* const csb_pool = dbb->createPool();
 		Jrd::ContextPoolHolder context(tdbb, csb_pool);
 
 		try
@@ -580,7 +582,7 @@ bool Function::reload(thread_db* tdbb)
 		}
 		catch (const Exception&)
 		{
-			attachment->deletePool(csb_pool);
+			dbb->deletePool(csb_pool);
 			throw;
 		}
 	}

src/jrd/MetaName.h

@@ -171,17 +171,12 @@ class MetaName
 		: word(get(s, l))
 	{ }
 
-	MetaName(const MetaName& m)
-		: word(m.word)
-	{
-		test();
-	}
+	MetaName(const MetaName& m) = default;
 
 	MetaName(const Firebird::AbstractString& s)
 		: word(get(s.c_str(), s.length()))
 	{ }
 
-
 	explicit MetaName(MemoryPool&)
 		: word(nullptr)
 	{ }
@@ -229,12 +224,7 @@ class MetaName
 		return *this;
 	}
 
-	MetaName& operator=(const MetaName& m)
-	{
-		word = m.word;
-		test();
-		return *this;
-	}
+	MetaName& operator=(const MetaName& m) = default;
 
 	MetaName& operator=(const Firebird::MetaString& s);