Fix Uri ctor and clusterutil print bug

Signed-off-by: Emelia Lei <[email protected]>
bloomberg · Jan 21, 2025 · a456bee · a456bee
1 parent 005a33d
commit a456bee
Show file tree

Hide file tree

Showing 3 changed files with 372 additions and 15 deletions.
diff --git a/src/groups/bmq/bmqt/bmqt_uri.cpp b/src/groups/bmq/bmqt/bmqt_uri.cpp
@@ -96,27 +96,36 @@ Uri::Uri(const bslstl::StringRef& uri, bslma::Allocator* allocator)
 : d_uri(allocator)
 , d_wasParserInitialized(false)
 {
-    UriParser::initialize();
+    UriParser::initialize(allocator);
     d_wasParserInitialized = true;
-    UriParser::parse(this, 0, uri);
+    const int rc           = UriParser::parse(this, 0, uri);
+    if (rc != 0) {
+        BALL_LOG_ERROR << "Uri '" << uri << "' failed to parse, rc = " << rc;
+    }
 }
 
 Uri::Uri(const char* uri, bslma::Allocator* allocator)
 : d_uri(allocator)
 , d_wasParserInitialized(false)
 {
-    UriParser::initialize();
+    UriParser::initialize(allocator);
     d_wasParserInitialized = true;
-    UriParser::parse(this, 0, uri);
+    const int rc           = UriParser::parse(this, 0, uri);
+    if (rc != 0) {
+        BALL_LOG_ERROR << "Uri '" << uri << "' failed to parse, rc = " << rc;
+    }
 }
 
 Uri::Uri(const bsl::string& uri, bslma::Allocator* allocator)
 : d_uri(allocator)
 , d_wasParserInitialized(false)
 {
-    UriParser::initialize();
+    UriParser::initialize(allocator);
     d_wasParserInitialized = true;
-    UriParser::parse(this, 0, uri);
+    const int rc           = UriParser::parse(this, 0, uri);
+    if (rc != 0) {
+        BALL_LOG_ERROR << "Uri '" << uri << "' failed to parse, rc = " << rc;
+    }
 }
 
 Uri::~Uri()

diff --git a/src/groups/mqb/mqbc/mqbc_clusterutil.cpp b/src/groups/mqb/mqbc/mqbc_clusterutil.cpp
@@ -1675,11 +1675,11 @@ int ClusterUtil::validateState(bsl::ostream&       errorDescription,
     // Validate partition information
     bsl::vector<ClusterStatePartitionInfo> incorrectPartitions;
     for (size_t pid = 0; pid < state.partitions().size(); ++pid) {
-        const ClusterStatePartitionInfo& stateInfo = state.partitions()[pid];
+        const ClusterStatePartitionInfo& stateInfo = state.partition(pid);
         BSLS_ASSERT_SAFE(stateInfo.partitionId() == pid);
 
-        const ClusterStatePartitionInfo& referenceInfo =
-            reference.partitions()[pid];
+        const ClusterStatePartitionInfo& referenceInfo = reference.partition(
+            pid);
         BSLS_ASSERT_SAFE(referenceInfo.partitionId() == pid);
         if (stateInfo.primaryLeaseId() != referenceInfo.primaryLeaseId()) {
             // Partition information mismatch.  Note that we don't compare
@@ -1699,7 +1699,7 @@ int ClusterUtil::validateState(bsl::ostream&       errorDescription,
         bdlb::Print::newlineAndIndent(out, level);
         out << "---------------------------";
         bdlb::Print::newlineAndIndent(out, level);
-        out << "Incorrect Partition Infos :";
+        out << "Incorrect Partition Infos:";
         bdlb::Print::newlineAndIndent(out, level);
         out << "---------------------------";
         for (bsl::vector<ClusterStatePartitionInfo>::const_iterator citer =
@@ -1791,9 +1791,9 @@ int ClusterUtil::validateState(bsl::ostream&       errorDescription,
              citer != incorrectQueues.cend();
              ++citer) {
             bdlb::Print::newlineAndIndent(out, level + 1);
-            out << citer->first;
+            out << *citer->first;
             bdlb::Print::newlineAndIndent(out, level + 1);
-            out << "(correct queue info) " << citer->second;
+            out << "(correct queue info) " << *citer->second;
         }
     }
 
@@ -1809,7 +1809,7 @@ int ClusterUtil::validateState(bsl::ostream&       errorDescription,
              citer != extraQueues.cend();
              ++citer) {
             bdlb::Print::newlineAndIndent(out, level + 1);
-            out << *citer;
+            out << **citer;
         }
     }
 
@@ -1862,7 +1862,7 @@ int ClusterUtil::validateState(bsl::ostream&       errorDescription,
              citer != missingQueues.cend();
              ++citer) {
             bdlb::Print::newlineAndIndent(out, level + 1);
-            out << *citer;
+            out << **citer;
         }
     }
 
@@ -1885,7 +1885,7 @@ int ClusterUtil::validateState(bsl::ostream&       errorDescription,
                  citer != domCit->second->queuesInfo().cend();
                  ++citer) {
                 bdlb::Print::newlineAndIndent(out, level + 1);
-                out << citer->second;
+                out << *citer->second;
             }
         }
     }