merge

Signed-off-by: dorjesinpo <129227380+dorjesinpo@users.noreply.github.com>
bloomberg · Sep 18, 2024 · 8a4e3ad · 8a4e3ad
1 parent 833a11c
commit 8a4e3ad
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/groups/mqb/mqbc/mqbc_clusterdata.cpp b/src/groups/mqb/mqbc/mqbc_clusterdata.cpp
@@ -145,10 +145,8 @@ ClusterData::ClusterData(
 {
     // PRECONDITIONS
     BSLS_ASSERT_SAFE(d_allocator_p);
-    BSLS_ASSERT_SAFE(d_scheduler_p);
-    BSLS_ASSERT_SAFE(d_bufferFactory_p);
-    BSLS_ASSERT_SAFE(d_blobSpPool_p);
     BSLS_ASSERT_SAFE(d_cluster_p);
+    BSLS_ASSERT_SAFE(d_transportManager_p);
     BSLS_ASSERT(resources.scheduler()->clockType() ==
                 bsls::SystemClockType::e_MONOTONIC);
 

diff --git a/src/groups/mqb/mqbc/mqbc_clusterdata.h b/src/groups/mqb/mqbc/mqbc_clusterdata.h
@@ -345,9 +345,19 @@ ClusterDataIdentity::identity() const
 // -----------------
 
 // MANIPULATORS
-inline ClusterData::BlobSpPool* ClusterData::blobSpPool()
+inline bdlmt::EventScheduler& ClusterData::scheduler()
 {
-    return d_resources.blobSpPool();
+    return *d_resources.scheduler();
+}
+
+inline bdlbb::BlobBufferFactory& ClusterData::bufferFactory()
+{
+    return *d_resources.bufferFactory();
+}
+
+inline ClusterData::BlobSpPool& ClusterData::blobSpPool()
+{
+    return *d_resources.blobSpPool();
 }
 
 inline mqbi::DispatcherClientData& ClusterData::dispatcherClientData()
@@ -415,17 +425,17 @@ inline ClusterData::StatContextMp& ClusterData::clusterNodesStatContext()
     return d_clusterNodesStatContext_mp;
 }
 
-// ACCESSORS
-inline bdlmt::EventScheduler* ClusterData::scheduler() const
+inline ClusterData::StateSpPool& ClusterData::stateSpPool()
 {
-    return d_resources.scheduler();
+    return d_stateSpPool;
 }
 
-inline bdlbb::BlobBufferFactory* ClusterData::bufferFactory() const
+inline bdlmt::FixedThreadPool& ClusterData::miscWorkThreadPool()
 {
-    return d_resources.bufferFactory();
+    return d_miscWorkThreadPool;
 }
 
+// ACCESSORS
 inline const mqbi::ClusterResources& ClusterData::resources() const
 {
     return d_resources;