From 6aadc6cc17326e03d02767a556e56c796cab2973 Mon Sep 17 00:00:00 2001
From: Leonid Fedorov <leonid.fedorov@mariadb.com>
Date: Fri, 29 Apr 2022 01:20:56 +0000
Subject: [PATCH] boost::interprocess::vector instead of std::vector

---
 versioning/BRM/extentmap.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/versioning/BRM/extentmap.h b/versioning/BRM/extentmap.h
index 805a37c35..8452d822e 100644
--- a/versioning/BRM/extentmap.h
+++ b/versioning/BRM/extentmap.h
@@ -36,12 +36,13 @@
 
 //#define NDEBUG
 #include <cassert>
-#include <boost/interprocess/shared_memory_object.hpp>
-#include <boost/interprocess/mapped_region.hpp>
-#include <boost/interprocess/managed_shared_memory.hpp>
-#include <boost/interprocess/allocators/allocator.hpp>
-#include <boost/unordered_map.hpp>
 #include <boost/functional/hash.hpp>  //boost::hash
+#include <boost/interprocess/allocators/allocator.hpp>
+#include <boost/interprocess/containers/vector.hpp>
+#include <boost/interprocess/managed_shared_memory.hpp>
+#include <boost/interprocess/mapped_region.hpp>
+#include <boost/interprocess/shared_memory_object.hpp>
+#include <boost/unordered_map.hpp>
 
 #include "shmkeys.h"
 #include "brmtypes.h"
@@ -337,7 +338,7 @@ using ShmVoidAllocator = bi::allocator<void, ShmSegmentManagerT>;
 using ExtentMapIdxT = size_t;
 using ExtentMapIdxTAlloc = bi::allocator<ExtentMapIdxT, ShmSegmentManagerT>;
 using PartitionNumberTAlloc = bi::allocator<PartitionNumberT, ShmSegmentManagerT>;
-using ExtentMapIndicesT = std::vector<ExtentMapIdxT, ExtentMapIdxTAlloc>;
+using ExtentMapIndicesT = bi::vector<ExtentMapIdxT, ExtentMapIdxTAlloc>;
 
 using PartitionIndexContainerKeyT = PartitionNumberT;
 using PartitionIndexContainerValT = std::pair<const PartitionIndexContainerKeyT, ExtentMapIndicesT>;
@@ -357,9 +358,9 @@ using OIDIndexContainerT =
                          std::equal_to<OIDIndexContainerKeyT>, OIDIndexContainerValTAlloc>;
 
 using DBRootIndexTAlloc = bi::allocator<OIDIndexContainerT, ShmSegmentManagerT>;
-using DBRootIndexContainerT = std::vector<OIDIndexContainerT, DBRootIndexTAlloc>;
+using DBRootIndexContainerT = bi::vector<OIDIndexContainerT, DBRootIndexTAlloc>;
 using ExtentMapIndex = DBRootIndexContainerT;
-using ExtentMapIndexFindResult = std::vector<ExtentMapIdxT>;
+using ExtentMapIndexFindResult = bi::vector<ExtentMapIdxT>;
 using InsertUpdateShmemKeyPair = std::pair<bool, bool>;
 
 class ExtentMapIndexImpl