Merge branch 'main' into add-depends-on

.github/workflows/build.yaml

@@ -221,6 +221,14 @@ jobs:
             --reruns=3                          \
             -n 4 -v
 
+      - name: Upload failure-logs as artifacts
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: failure_logs_${{ matrix.mode }}_${{ matrix.cluster }}
+          path: ${{ github.workspace }}/src/integration-tests/failure-logs
+          retention-days: 5
+
   fuzz_tests_ubuntu:
     name: Fuzz test [${{ matrix.request }}]
     strategy:

.github/workflows/documentation.yaml

@@ -0,0 +1,52 @@
+name: Generate documentation
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  documentation-main:
+    name: Build Doxygen documentation on `main`
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      # Let the default GITHUB_TOKEN commit and push.
+      contents: write
+
+    steps:
+      - name: Checkout `main`
+        uses: actions/checkout@v4
+
+      - name: Clear out `docs/` subdirectory
+        run: rm -rf docs
+
+      - name: Checkout `gh-pages` into `docs/`
+        uses: actions/checkout@v4
+        with:
+          path: docs
+          ref: gh-pages
+
+      - name: Set up dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -qy doxygen
+
+      - name: Build documentation
+        # Best way to pass Doxygen config overrides on the command line is
+        # using stdin.
+        run: |
+          ( cat Doxyfile ; echo "PROJECT_NUMBER=${{ github.sha }}" ) | doxygen -
+
+      - name: Commit new API documentation to `gh-pages`
+        run: |
+          cd docs/
+          git config --global user.name "${{ github.actor }}"
+          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
+          git add docs/apidocs/cpp_apidocs/ && git commit -s -am "Update C++ API docs from commit ${{ github.sha }} on main" && git push || true

.gitignore

@@ -27,6 +27,9 @@ settings.json
 .cache/
 .venv/
 
+# fuzz-test output folder
+**/boofuzz-results
+
 # Symlink from 'src/applications/bmqbrkr/run'
 src/applications/bmqbrkr/etc/etc
 

src/groups/bmq/CMakeLists.txt

@@ -49,10 +49,10 @@ set(BMQ_PRIVATE_PACKAGES
   bmqst
   bmqstm
   bmqsys
-  bmqt
   bmqtsk
   bmqtst
   bmqu
+  bmqvt
 )
 target_bmq_style_uor( bmq PRIVATE_PACKAGES ${BMQ_PRIVATE_PACKAGES} )
 

src/groups/bmq/bmqa/bmqa_messageeventbuilder.h

@@ -85,7 +85,7 @@
 ///     // Session start up logic omitted for brevity.
 ///
 /// // Obtain a valid instance of message properties.
-/// bmqt::MessageProperties properties;
+/// bmqa::MessageProperties properties;
 /// session.loadMessageProperties(&properties);
 ///
 /// // Set common properties that will be applicable to all messages sent by
@@ -160,7 +160,7 @@
 /// // Session start up logic omitted for brevity.
 ///
 /// // Obtain a valid instance of message properties.
-/// bmqt::MessageProperties properties;
+/// bmqa::MessageProperties properties;
 /// session.loadMessageProperties(&properties);
 ///
 /// // Set common properties that will be applicable to all messages sent by

src/groups/bmq/bmqa/bmqa_mocksession.cpp

@@ -36,6 +36,7 @@
 #include <bmqp_protocol.h>
 #include <bmqp_protocolutil.h>
 #include <bmqp_pusheventbuilder.h>
+#include <bmqst_statcontext.h>
 #include <bmqsys_time.h>
 #include <bmqt_messageguid.h>
 #include <bmqt_uri.h>
@@ -742,7 +743,7 @@ void MockSession::initializeStats()
     start.setLevel(0).setIndex(0);
     end.setLevel(0).setIndex(1);
     bmqimp::QueueStatsUtil::initializeStats(d_queuesStats_sp.get(),
-                                            &d_rootStatContext,
+                                            d_rootStatContext_mp.get(),
                                             start,
                                             end,
                                             d_allocator_p);
@@ -961,8 +962,9 @@ MockSession::MockSession(const bmqt::SessionOptions& options,
                                bslma::Default::allocator(allocator)),
                        bslma::Default::allocator(allocator))
 , d_postedEvents(bslma::Default::allocator(allocator))
-, d_rootStatContext(bmqst::StatContextConfiguration("MockSession", allocator),
-                    allocator)
+, d_rootStatContext_mp(bslma::ManagedPtrUtil::makeManaged<bmqst::StatContext>(
+      bmqst::StatContextConfiguration("MockSession", allocator),
+      allocator))
 , d_queuesStats_sp(new(*bslma::Default::allocator(allocator))
                        bmqimp::Stat(bslma::Default::allocator(allocator)),
                    bslma::Default::allocator(allocator))
@@ -1004,8 +1006,9 @@ MockSession::MockSession(bslma::ManagedPtr<SessionEventHandler> eventHandler,
                                bslma::Default::allocator(allocator)),
                        bslma::Default::allocator(allocator))
 , d_postedEvents(bslma::Default::allocator(allocator))
-, d_rootStatContext(bmqst::StatContextConfiguration("MockSession", allocator),
-                    allocator)
+, d_rootStatContext_mp(bslma::ManagedPtrUtil::makeManaged<bmqst::StatContext>(
+      bmqst::StatContextConfiguration("MockSession", allocator),
+      allocator))
 , d_queuesStats_sp(new(*bslma::Default::allocator(allocator))
                        bmqimp::Stat(bslma::Default::allocator(allocator)),
                    bslma::Default::allocator(allocator))

src/groups/bmq/bmqa/bmqa_mocksession.h

@@ -393,7 +393,7 @@
 ///       `emitting` on the @ref BMQA_EXPECT_CALL macro in synchronous mode is
 ///       meaningless.
 ///
-///```
+/// ```
 /// void unitTest()
 /// {
 ///     // MockSession created without an eventHandler.
@@ -548,7 +548,6 @@
 #include <bmqa_openqueuestatus.h>
 #include <bmqa_queueid.h>
 #include <bmqa_session.h>  // for 'bmqa::SessionEventHandler'
-#include <bmqst_statcontext.h>
 #include <bmqt_queueoptions.h>
 #include <bmqt_sessionoptions.h>
 
@@ -586,6 +585,9 @@ class MessageCorrelationIdContainer;
 namespace bmqimp {
 struct Stat;
 }
+namespace bmqst {
+class StatContext;
+}
 
 namespace bmqa {
 
@@ -1040,7 +1042,7 @@ class MockSession : public AbstractSession {
     mutable bslmt::Mutex d_mutex;
 
     /// Top level stat context for this mocked Session.
-    bmqst::StatContext d_rootStatContext;
+    bslma::ManagedPtr<bmqst::StatContext> d_rootStatContext_mp;
 
     /// Stats for all queues
     StatImplSp d_queuesStats_sp;

src/groups/bmq/bmqp/bmqp_puteventbuilder.cpp

@@ -49,16 +49,31 @@ bool isWordAligned(const bdlbb::Blob& blob)
 #endif
 }  // close unnamed namespace
 
+// ---------------------------------
+// class PutEventBuilder::ResetGuard
+// ---------------------------------
+
+inline PutEventBuilder::ResetGuard::ResetGuard(
+    PutEventBuilder& putEventBuilder)
+: d_putEventBuilder(putEventBuilder)
+{
+    // NOTHING
+}
+
+inline PutEventBuilder::ResetGuard::~ResetGuard()
+{
+    d_putEventBuilder.resetFields();
+}
+
 // ---------------------
 // class PutEventBuilder
 // ---------------------
 
-void PutEventBuilder::resetFields(void* ptr)
+void PutEventBuilder::resetFields()
 {
-    PutEventBuilder* builder = static_cast<PutEventBuilder*>(ptr);
-    builder->d_flags         = 0;
-    builder->d_messageGUID   = bmqt::MessageGUID();
-    builder->d_crc32c        = 0;
+    d_flags       = 0;
+    d_messageGUID = bmqt::MessageGUID();
+    d_crc32c      = 0;
 }
 
 bmqt::EventBuilderResult::Enum
@@ -219,9 +234,7 @@ PutEventBuilder::packMessageInOldStyle(int queueId)
 
     // Guid and flags need to be reset after this method (irrespective of its
     // success or failure).  Create a proctor to auto reset them.
-    const bsl::function<void()> f =
-        bdlf::BindUtil::bind(&PutEventBuilder::resetFields, this);
-    bdlb::ScopeExitAny resetter(f);
+    const ResetGuard guard(*this);
 
     // Calculate length of entire application data (includes payload, message
     // properties and padding, if any).
@@ -304,12 +317,9 @@ bmqt::EventBuilderResult::Enum PutEventBuilder::packMessage(int queueId)
 
     typedef bmqt::EventBuilderResult Result;
 
-    // CorrelationId, guid and flags need to be reset after this method
-    // (irrespective of its success or failure).  Create a proctor to auto
-    // reset them.
-    const bsl::function<void()> f =
-        bdlf::BindUtil::bind(&PutEventBuilder::resetFields, this);
-    bdlb::ScopeExitAny resetter(f);
+    // Guid and flags need to be reset after this method (irrespective of its
+    // success or failure).  Create a proctor to auto reset them.
+    const ResetGuard guard(*this);
 
     // Calculate length of entire application data (includes payload, message
     // properties and padding, if any).
@@ -398,9 +408,7 @@ bmqt::EventBuilderResult::Enum PutEventBuilder::packMessageRaw(int queueId)
 
     // Guid and flags need to be reset after this method (irrespective of its
     // success or failure).  Create a proctor to auto reset them.
-    const bsl::function<void()> f =
-        bdlf::BindUtil::bind(&PutEventBuilder::resetFields, this);
-    bdlb::ScopeExitAny resetter(f);
+    const ResetGuard guard(*this);
 
     // Note that the 'd_blobPayload_p' has the entire application data.
     return packMessageInternal(*d_blobPayload_p, queueId);

src/groups/bmq/bmqp/bmqp_puteventbuilder.h

@@ -61,7 +61,6 @@
 //
 
 // BMQ
-
 #include <bmqp_messageproperties.h>
 #include <bmqp_protocol.h>
 #include <bmqt_compressionalgorithmtype.h>
@@ -92,6 +91,18 @@ class PutEventBuilder {
     typedef bdlb::NullableValue<bmqp::Protocol::MsgGroupId> NullableMsgGroupId;
 
   private:
+    // TYPES
+    /// Mechanism to automatically reset PutEventBuilder on a built message
+    struct ResetGuard {
+        // DATA
+        PutEventBuilder& d_putEventBuilder;
+
+        // CREATORS
+        explicit ResetGuard(PutEventBuilder& putEventBuilder);
+
+        ~ResetGuard();
+    };
+
     // DATA
     bdlbb::BlobBufferFactory* d_bufferFactory_p;
 
@@ -169,13 +180,10 @@ class PutEventBuilder {
     PutEventBuilder& operator=(const PutEventBuilder&) BSLS_CPP11_DELETED;
 
   private:
-    // CLASS LEVEL METHODS
-
-    /// Reset flags and message guid of PutEventBuilder instance pointed by
-    /// the specified `ptr`.
-    static void resetFields(void* ptr);
-
     // PRIVATE MANIPULATORS
+    /// Reset flags and message guid of this object.
+    void resetFields();
+
     bmqt::EventBuilderResult::Enum
     packMessageInternal(const bdlbb::Blob& appData, int queueId);
 

src/groups/mqb/mqba/mqba_adminsession.cpp

@@ -206,6 +206,8 @@ void AdminSession::finalizeAdminCommand(
 
     response.choice().adminCommandResponse().text() = commandExecResults;
 
+    BALL_LOG_INFO << description() << ": Send response message: " << response;
+
     int rc = d_state.d_schemaEventBuilder.setMessage(
         response,
         bmqp::EventType::e_CONTROL);

src/groups/mqb/mqbblp/mqbblp_cluster.cpp

@@ -2209,27 +2209,16 @@ void Cluster::onRecoveryStatusDispatched(
                 const bmqt::Uri uri(itMp->uri().canonical());
                 BSLS_ASSERT_SAFE(itMp->storage()->partitionId() ==
                                  static_cast<int>(pid));
-                if (isCSLModeEnabled()) {
-                    AppIdKeyPairs appIdKeyPairs;
-                    itMp->storage()->loadVirtualStorageDetails(&appIdKeyPairs);
-                    AppIdInfos appIdInfos(appIdKeyPairs.cbegin(),
-                                          appIdKeyPairs.cend());
-
-                    d_clusterOrchestrator.registerQueueInfo(
-                        uri,
-                        pid,
-                        itMp->storage()->queueKey(),
-                        appIdInfos,
-                        false);  // Force-update?
-                }
-                else {
-                    d_clusterOrchestrator.registerQueueInfo(
-                        uri,
-                        pid,
-                        itMp->storage()->queueKey(),
-                        AppIdInfos(),
-                        false);  // Force-update?
-                }
+
+                AppInfos appIdInfos;
+                itMp->storage()->loadVirtualStorageDetails(&appIdInfos);
+
+                d_clusterOrchestrator.registerQueueInfo(
+                    uri,
+                    pid,
+                    itMp->storage()->queueKey(),
+                    appIdInfos,
+                    false);  // Force-update?
 
                 ++(*itMp);
             }
@@ -2844,18 +2833,22 @@ void Cluster::onDomainReconfigured(const mqbi::Domain&     domain,
     }
 
     // Compute list of added and removed App IDs.
-    bsl::vector<bsl::string> oldCfgAppIds(oldDefn.mode().fanout().appIDs(),
-                                          d_allocator_p);
-    bsl::vector<bsl::string> newCfgAppIds(newDefn.mode().fanout().appIDs(),
-                                          d_allocator_p);
-
-    bsl::vector<bsl::string> addedIds, removedIds;
+    bsl::unordered_set<bsl::string> oldCfgAppIds(
+        oldDefn.mode().fanout().appIDs().cbegin(),
+        oldDefn.mode().fanout().appIDs().cend(),
+        d_allocator_p);
+    bsl::unordered_set<bsl::string> newCfgAppIds(
+        newDefn.mode().fanout().appIDs().cbegin(),
+        newDefn.mode().fanout().appIDs().cend(),
+        d_allocator_p);
+
+    bsl::unordered_set<bsl::string> addedIds, removedIds;
     mqbc::StorageUtil::loadAddedAndRemovedEntries(&addedIds,
                                                   &removedIds,
                                                   oldCfgAppIds,
                                                   newCfgAppIds);
 
-    bsl::vector<bsl::string>::const_iterator it = addedIds.begin();
+    bsl::unordered_set<bsl::string>::const_iterator it = addedIds.cbegin();
     for (; it != addedIds.cend(); ++it) {
         dispatcher()->execute(
             bdlf::BindUtil::bind(&ClusterOrchestrator::registerAppId,

src/groups/mqb/mqbblp/mqbblp_cluster.h

@@ -137,11 +137,9 @@ class Cluster : public mqbi::Cluster,
 
   private:
     // PRIVATE TYPES
-    typedef mqbi::Storage::AppIdKeyPairs AppIdKeyPairs;
-
     typedef mqbc::ClusterStatePartitionInfo ClusterStatePartitionInfo;
 
-    typedef mqbc::ClusterStateQueueInfo::AppIdInfos AppIdInfos;
+    typedef mqbc::ClusterStateQueueInfo::AppInfos AppInfos;
 
     typedef mqbc::ClusterMembership::ClusterNodeSessionSp ClusterNodeSessionSp;