Follow @AlexPeshkoff suggestions:

hvlad · hvlad · commit 9aea53e91d15 · 2025-02-10T13:31:01.000+02:00
removed Allocator from template arguments,
  removed pointer based ctor in favor of reference based one.
diff --git a/src/common/classes/GenericMap.h b/src/common/classes/GenericMap.h
@@ -97,7 +97,7 @@ class GenericMap : public AutoStorage
 	typedef typename KeyValuePair::first_type KeyType;
 	typedef typename KeyValuePair::second_type ValueType;
 
-	typedef BePlusTree<KeyValuePair*, KeyType, MemoryPool, FirstObjectKey<KeyValuePair>, KeyComparator> ValuesTree;
+	typedef BePlusTree<KeyValuePair*, KeyType, FirstObjectKey<KeyValuePair>, KeyComparator> ValuesTree;
 	typedef typename ValuesTree::Accessor TreeAccessor;
 	typedef typename ValuesTree::ConstAccessor ConstTreeAccessor;
 
@@ -139,10 +139,10 @@ class GenericMap : public AutoStorage
 	friend class Accessor;
 	friend class ConstAccessor;
 
-	GenericMap() : tree(&getPool()), mCount(0) { }
+	GenericMap() : tree(getPool()), mCount(0) { }
 
 	explicit GenericMap(MemoryPool& a_pool)
-		: AutoStorage(a_pool), tree(&getPool()), mCount(0)
+		: AutoStorage(a_pool), tree(getPool()), mCount(0)
 	{ }
 
 	~GenericMap()
diff --git a/src/common/classes/sparse_bitmap.h b/src/common/classes/sparse_bitmap.h
@@ -60,12 +60,12 @@ class SparseBitmap : public AutoStorage
 public:
 	// Default constructor, stack placement
 	SparseBitmap() :
-		singular(false), singular_value(0), tree(&getPool()), defaultAccessor(this)
+		singular(false), singular_value(0), tree(getPool()), defaultAccessor(this)
 	{ }
 
 	// Pooled constructor
 	explicit SparseBitmap(MemoryPool& p) :
-		AutoStorage(p), singular(false), singular_value(0), tree(&getPool()), defaultAccessor(this)
+		AutoStorage(p), singular(false), singular_value(0), tree(getPool()), defaultAccessor(this)
 	{ }
 
 	// Default accessor methods
@@ -225,7 +225,7 @@ class SparseBitmap : public AutoStorage
 		}
 	};
 
-	typedef BePlusTree<Bucket, T, MemoryPool, Bucket> BitmapTree;
+	typedef BePlusTree<Bucket, T, Bucket> BitmapTree;
 	typedef typename BitmapTree::Accessor BitmapTreeAccessor;
 
 	// Set if bitmap contains a single value only
diff --git a/src/common/classes/tree.h b/src/common/classes/tree.h
@@ -93,24 +93,20 @@ enum LocType { locEqual, locLess, locGreat, locGreatEqual, locLessEqual };
 // an indexed dynamic array without increase of algorithm calculation costs (this is one
 // more classical B+ tree feature). This is also not done to improve tree performance a little
 //
-template <typename Value, typename Key = Value, typename Allocator = Firebird::MemoryPool,
-	typename KeyOfValue = DefaultKeyValue<Value>,
-	typename Cmp = DefaultComparator<Key> >
+template <typename Value, typename Key = Value,
+		  typename KeyOfValue = DefaultKeyValue<Value>,
+		  typename Cmp = DefaultComparator<Key> >
 class BePlusTree
 {
 	static const FB_SIZE_T LEAF_COUNT = LEAF_PAGE_SIZE / sizeof(Value);
 	static const FB_SIZE_T NODE_COUNT = NODE_PAGE_SIZE / sizeof(void*);
 public:
-	explicit BePlusTree(Allocator *_pool)
-		: pool(_pool), level(0), defaultAccessor(this)
-	{ }
-
-	explicit BePlusTree(Allocator& _pool)
+	explicit BePlusTree(Firebird::MemoryPool& _pool)
 		: pool(&_pool), level(0), defaultAccessor(this)
 	{ }
 
-	BePlusTree(Allocator *_pool, const BePlusTree& from)
-		: pool(_pool), level(0), defaultAccessor(this)
+	BePlusTree(Firebird::MemoryPool& _pool, const BePlusTree& from)
+		: pool(&_pool), level(0), defaultAccessor(this)
 	{
 		append(from);
 	}
@@ -283,9 +279,6 @@ class BePlusTree
 	}
 
 private:
-	BePlusTree(Allocator *_pool, void *rootPage) : 	pool(_pool), level(0),
-		root(new(rootPage) ItemList()), defaultAccessor(this) {}
-
 	class NodeList;
 
     class ItemList : public SortedVector<Value, LEAF_COUNT, Key, KeyOfValue, Cmp>
@@ -641,22 +634,18 @@ class BePlusTree
 	}; // class Accessor
 
 private:
-	Allocator* pool;
+	Firebird::MemoryPool* const pool;
 	int level;
 	NodePtr root;
 	Accessor defaultAccessor;
 
 	void _removePage(int level, NodePtr node);
-
-	friend class MemoryPool;
-	friend class NodeList;
-	friend class Accessor;
 };
 
 // ************************ BePlusTree implementation ******************
 
-template <typename Value, typename Key, typename Allocator, typename KeyOfValue, typename Cmp>
-bool BePlusTree<Value, Key, Allocator, KeyOfValue, Cmp>::add(const Value& item, Accessor* accessor)
+template <typename Value, typename Key, typename KeyOfValue, typename Cmp>
+bool BePlusTree<Value, Key, KeyOfValue, Cmp>::add(const Value& item, Accessor* accessor)
 {
 	// Finish initialization of the tree if necessary
 	if (!root)
@@ -894,8 +883,8 @@ bool BePlusTree<Value, Key, Allocator, KeyOfValue, Cmp>::add(const Value& item,
 	return true;
 }
 
-template <typename Value, typename Key, typename Allocator, typename KeyOfValue, typename Cmp>
-void BePlusTree<Value, Key, Allocator, KeyOfValue, Cmp>::_removePage(const int nodeLevel, NodePtr node)
+template <typename Value, typename Key, typename KeyOfValue, typename Cmp>
+void BePlusTree<Value, Key, KeyOfValue, Cmp>::_removePage(const int nodeLevel, NodePtr node)
 {
 	NodeList *list;
 	// Get parent and adjust the links
diff --git a/src/jrd/GarbageCollector.h b/src/jrd/GarbageCollector.h
@@ -70,7 +70,7 @@ class GarbageCollector
 			return item.pageno;
 		}
 	};
-	typedef Firebird::BePlusTree<PageTran, ULONG, MemoryPool, PageTran> PageTranMap;
+	typedef Firebird::BePlusTree<PageTran, ULONG, PageTran> PageTranMap;
 
 
 	class RelationData
diff --git a/src/jrd/Savepoint.h b/src/jrd/Savepoint.h
@@ -73,7 +73,7 @@ namespace Jrd
 		const Format* m_format;
 	};
 
-	typedef Firebird::BePlusTree<UndoItem, SINT64, MemoryPool, UndoItem> UndoItemTree;
+	typedef Firebird::BePlusTree<UndoItem, SINT64, UndoItem> UndoItemTree;
 
 	class VerbAction
 	{
diff --git a/src/jrd/TempSpace.h b/src/jrd/TempSpace.h
@@ -209,7 +209,7 @@ class TempSpace : public Firebird::File
 	Firebird::Array<UCHAR> initialBuffer;
 	bool initiallyDynamic;
 
-	typedef Firebird::BePlusTree<Segment, offset_t, MemoryPool, Segment> FreeSegmentTree;
+	typedef Firebird::BePlusTree<Segment, offset_t, Segment> FreeSegmentTree;
 	FreeSegmentTree freeSegments;
 
 	static Firebird::GlobalPtr<Firebird::Mutex> initMutex;
diff --git a/src/jrd/extds/ExtDS.h b/src/jrd/extds/ExtDS.h
@@ -262,8 +262,7 @@ class Provider : public Firebird::GlobalStorage
 		}
 	};
 
-	typedef Firebird::BePlusTree<AttToConn, AttToConn, Firebird::MemoryPool,
-								 AttToConn, AttToConn>
+	typedef Firebird::BePlusTree<AttToConn, AttToConn, AttToConn, AttToConn>
 		AttToConnMap;
 
 	AttToConnMap m_connections;
diff --git a/src/jrd/nbak.cpp b/src/jrd/nbak.cpp
@@ -638,7 +638,7 @@ bool BackupManager::actualizeAlloc(thread_db* tdbb, bool haveGlobalLock)
 		// For SuperServer this routine is really executed only at database startup when
 		// it has exlock or when exclusive access to database is enabled
 		if (!alloc_table)
-			alloc_table = FB_NEW_POOL(*database->dbb_permanent) AllocItemTree(database->dbb_permanent);
+			alloc_table = FB_NEW_POOL(*database->dbb_permanent) AllocItemTree(*database->dbb_permanent);
 
 		while (true)
 		{
diff --git a/src/jrd/nbak.h b/src/jrd/nbak.h
@@ -82,7 +82,7 @@ class AllocItem
 	}
 };
 
-typedef Firebird::BePlusTree<AllocItem, ULONG, MemoryPool, AllocItem> AllocItemTree;
+typedef Firebird::BePlusTree<AllocItem, ULONG, AllocItem> AllocItemTree;
 
 // Class to synchronize access to backup state
 
diff --git a/src/jrd/req.h b/src/jrd/req.h
@@ -142,7 +142,7 @@ const USHORT RPB_CLEAR_FLAGS	= (RPB_UNDO_FLAGS | RPB_just_deleted);
 
 // List of active blobs controlled by request
 
-typedef Firebird::BePlusTree<ULONG, ULONG, MemoryPool> TempBlobIdTree;
+typedef Firebird::BePlusTree<ULONG, ULONG> TempBlobIdTree;
 
 // Affected rows counter class
 
@@ -315,7 +315,7 @@ class Request : public pool_alloc<type_req>
 		: statement(aStatement),
 		  req_pool(pool),
 		  req_memory_stats(&aStatement->pool->getStatsGroup()),
-		  req_blobs(req_pool),
+		  req_blobs(*req_pool),
 		  req_stats(*req_pool),
 		  req_base_stats(*req_pool),
 		  req_ext_stmt(NULL),
diff --git a/src/jrd/scl.h b/src/jrd/scl.h
@@ -62,12 +62,7 @@ class SecurityClass
 	}
 };
 
-typedef Firebird::BePlusTree<
-	SecurityClass*,
-	MetaNamePair,
-	Firebird::MemoryPool,
-	SecurityClass
-> SecurityClassList;
+typedef Firebird::BePlusTree<SecurityClass*, MetaNamePair, SecurityClass> SecurityClassList;
 
 
 const SecurityClass::flags_t SCL_select			= 1;		// SELECT access
diff --git a/src/jrd/tpc_proto.h b/src/jrd/tpc_proto.h
@@ -279,7 +279,7 @@ class TipCache
 		const char* getName() const override { return "TipCache:TranBlock"; }
 	};
 
-	typedef Firebird::BePlusTree<StatusBlockData*, TpcBlockNumber, Firebird::MemoryPool, StatusBlockData> BlocksMemoryMap;
+	typedef Firebird::BePlusTree<StatusBlockData*, TpcBlockNumber, StatusBlockData> BlocksMemoryMap;
 
 	static const ULONG TPC_VERSION = 2;
 	static const int SAFETY_GAP_BLOCKS = 1;
diff --git a/src/jrd/tra.h b/src/jrd/tra.h
@@ -103,8 +103,8 @@ struct BlobIndex
 	{ }
 };
 
-typedef Firebird::BePlusTree<BlobIndex, ULONG, MemoryPool, BlobIndex> BlobIndexTree;
-typedef Firebird::BePlusTree<bid, bid, MemoryPool> FetchedBlobIdTree;
+typedef Firebird::BePlusTree<BlobIndex, ULONG, BlobIndex> BlobIndexTree;
+typedef Firebird::BePlusTree<bid, bid> FetchedBlobIdTree;
 
 // Transaction block
 
@@ -171,9 +171,9 @@ class jrd_tra : public pool_alloc<type_tra>
 	:	tra_attachment(attachment),
 		tra_pool(p),
 		tra_memory_stats(parent_stats),
-		tra_blobs_tree(p),
+		tra_blobs_tree(*p),
 		tra_blobs(outer ? outer->tra_blobs : &tra_blobs_tree),
-		tra_fetched_blobs(p),
+		tra_fetched_blobs(*p),
 		tra_repl_blobs(*p),
 		tra_blob_util_map(*p),
 		tra_arrays(NULL),
diff --git a/src/remote/remote.h b/src/remote/remote.h
@@ -227,7 +227,7 @@ struct Rdb : public Firebird::GlobalStorage, public TypedHandle<rem_type_rdb>
 
 struct Rtr : public Firebird::GlobalStorage, public TypedHandle<rem_type_rtr>
 {
-	using BlobsTree = Firebird::BePlusTree<struct Rbl*, SQUAD, MemoryPool, struct Rbl>;
+	using BlobsTree = Firebird::BePlusTree<struct Rbl*, SQUAD, struct Rbl>;
 
 	Rdb*			rtr_rdb;
 	Rtr*			rtr_next;
diff --git a/src/utilities/ntrace/TracePluginImpl.cpp b/src/utilities/ntrace/TracePluginImpl.cpp
@@ -94,10 +94,10 @@ TracePluginImpl::TracePluginImpl(IPluginBase* plugin,
 	logWriter(initInfo->getLogWriter()),
 	config(configuration),
 	record(*getDefaultMemoryPool()),
-	connections(getDefaultMemoryPool()),
-	transactions(getDefaultMemoryPool()),
-	statements(getDefaultMemoryPool()),
-	services(getDefaultMemoryPool()),
+	connections(*getDefaultMemoryPool()),
+	transactions(*getDefaultMemoryPool()),
+	statements(*getDefaultMemoryPool()),
+	services(*getDefaultMemoryPool()),
 	routines(*getDefaultMemoryPool()),
 	include_codes(*getDefaultMemoryPool()),
 	exclude_codes(*getDefaultMemoryPool())
diff --git a/src/utilities/ntrace/TracePluginImpl.h b/src/utilities/ntrace/TracePluginImpl.h
@@ -67,8 +67,7 @@ class TracePluginImpl final :
 		}
 	};
 
-	typedef Firebird::BePlusTree<ConnectionData, AttNumber, Firebird::MemoryPool, ConnectionData>
-		ConnectionsTree;
+	typedef Firebird::BePlusTree<ConnectionData, AttNumber, ConnectionData> ConnectionsTree;
 
 	// Data for tracked (active) transactions
 	struct TransactionData
@@ -89,8 +88,7 @@ class TracePluginImpl final :
 		}
 	};
 
-	typedef Firebird::BePlusTree<TransactionData, TraNumber, Firebird::MemoryPool, TransactionData>
-		TransactionsTree;
+	typedef Firebird::BePlusTree<TransactionData, TraNumber, TransactionData> TransactionsTree;
 
 	// Data for tracked (active) statements
 	struct StatementData
@@ -104,8 +102,7 @@ class TracePluginImpl final :
 		}
 	};
 
-	typedef Firebird::BePlusTree<StatementData, StmtNumber, Firebird::MemoryPool, StatementData>
-		StatementsTree;
+	typedef Firebird::BePlusTree<StatementData, StmtNumber, StatementData> StatementsTree;
 
 	typedef void* ServiceId;
 	struct ServiceData
@@ -127,8 +124,7 @@ class TracePluginImpl final :
 		}
 	};
 
-	typedef Firebird::BePlusTree<ServiceData, ServiceId, Firebird::MemoryPool, ServiceData>
-		ServicesTree;
+	typedef Firebird::BePlusTree<ServiceData, ServiceId, ServiceData> ServicesTree;
 
 	template <class C>
 	struct RoutineHelper

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class GarbageCollector`
`70`	`70`	`return item.pageno;`
`71`	`71`	`}`
`72`	`72`	`};`
`73`		`- typedef Firebird::BePlusTree<PageTran, ULONG, MemoryPool, PageTran> PageTranMap;`
	`73`	`+ typedef Firebird::BePlusTree<PageTran, ULONG, PageTran> PageTranMap;`
`74`	`74`
`75`	`75`
`76`	`76`	`class RelationData`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ namespace Jrd`
`73`	`73`	`const Format* m_format;`
`74`	`74`	`};`
`75`	`75`
`76`		`- typedef Firebird::BePlusTree<UndoItem, SINT64, MemoryPool, UndoItem> UndoItemTree;`
	`76`	`+ typedef Firebird::BePlusTree<UndoItem, SINT64, UndoItem> UndoItemTree;`
`77`	`77`
`78`	`78`	`class VerbAction`
`79`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,7 @@ class Provider : public Firebird::GlobalStorage`
`262`	`262`	`}`
`263`	`263`	`};`
`264`	`264`
`265`		`- typedef Firebird::BePlusTree<AttToConn, AttToConn, Firebird::MemoryPool,`
`266`		`- AttToConn, AttToConn>`
	`265`	`+ typedef Firebird::BePlusTree<AttToConn, AttToConn, AttToConn, AttToConn>`
`267`	`266`	`AttToConnMap;`
`268`	`267`
`269`	`268`	`AttToConnMap m_connections;`
Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ bool BackupManager::actualizeAlloc(thread_db* tdbb, bool haveGlobalLock)`
`638`	`638`	`// For SuperServer this routine is really executed only at database startup when`
`639`	`639`	`// it has exlock or when exclusive access to database is enabled`
`640`	`640`	`if (!alloc_table)`
`641`		`- alloc_table = FB_NEW_POOL(*database->dbb_permanent) AllocItemTree(database->dbb_permanent);`
	`641`	`+ alloc_table = FB_NEW_POOL(database->dbb_permanent) AllocItemTree(database->dbb_permanent);`
`642`	`642`
`643`	`643`	`while (true)`
`644`	`644`	`{`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class AllocItem`
`82`	`82`	`}`
`83`	`83`	`};`
`84`	`84`
`85`		`-typedef Firebird::BePlusTree<AllocItem, ULONG, MemoryPool, AllocItem> AllocItemTree;`
	`85`	`+typedef Firebird::BePlusTree<AllocItem, ULONG, AllocItem> AllocItemTree;`
`86`	`86`
`87`	`87`	`// Class to synchronize access to backup state`
`88`	`88`