m_bmqstoragetool::RecordPrinter: Fix print bug (#663)

Signed-off-by: Yuan Jing Vincent Yan <[email protected]>

Author: kaikulimu

src/applications/bmqstoragetool/m_bmqstoragetool_printer.t.cpp

@@ -364,9 +364,9 @@ static void test3_humanReadableRecordsTest()
                        << "    Epoch           : 100\n"
                        << "    JournalOpType   : SYNCPOINT\n"
                        << "    SyncPointType   : REGULAR\n"
-                       << "    SyncPtPrimaryLeaseId: 25\n"
+                       << "    SyncPtPrimaryLeaseId: 121\n"
                        << "    SyncPtSequenceNumber: 1234567\n"
-                       << "    PrimaryNodeId   : 121\n"
+                       << "    PrimaryNodeId   : 25\n"
                        << "    DataFileOffsetDwords: 8800\n\n";
 
         BMQTST_ASSERT_EQ(expectedStream.str(), resultStream.str());
@@ -1128,9 +1128,9 @@ static void test11_jsonPrettyRecordsTest()
                 << "      \"Epoch\": \"100\",\n"
                 << "      \"JournalOpType\": \"SYNCPOINT\",\n"
                 << "      \"SyncPointType\": \"REGULAR\",\n"
-                << "      \"SyncPtPrimaryLeaseId\": \"25\",\n"
+                << "      \"SyncPtPrimaryLeaseId\": \"121\",\n"
                 << "      \"SyncPtSequenceNumber\": \"1234567\",\n"
-                << "      \"PrimaryNodeId\": \"121\",\n"
+                << "      \"PrimaryNodeId\": \"25\",\n"
                 << "      \"DataFileOffsetDwords\": \"8800\"\n"
                 << "    }\n"
                 << "  ]\n"
@@ -2006,9 +2006,9 @@ static void test19_jsonLineRecordsTest()
                            << "\"Epoch\": \"100\", "
                            << "\"JournalOpType\": \"SYNCPOINT\", "
                            << "\"SyncPointType\": \"REGULAR\", "
-                           << "\"SyncPtPrimaryLeaseId\": \"25\", "
+                           << "\"SyncPtPrimaryLeaseId\": \"121\", "
                            << "\"SyncPtSequenceNumber\": \"1234567\", "
-                           << "\"PrimaryNodeId\": \"121\", "
+                           << "\"PrimaryNodeId\": \"25\", "
                            << "\"DataFileOffsetDwords\": \"8800\"" << "}\n"
                            << "  ]\n"
                            << "}\n";

src/applications/bmqstoragetool/m_bmqstoragetool_recordprinter.h

@@ -267,8 +267,8 @@ void RecordDetailsPrinter<PRINTER_TYPE>::printRecord(
     d_fields.push_back("DataFileOffsetDwords");
 
     *d_printer_mp << rec.d_record.type() << rec.d_record.syncPointType()
-                  << rec.d_record.primaryNodeId() << rec.d_record.sequenceNum()
                   << rec.d_record.primaryLeaseId()
+                  << rec.d_record.sequenceNum() << rec.d_record.primaryNodeId()
                   << rec.d_record.dataFileOffsetDwords();
 }
 

src/groups/mqb/mqbs/mqbs_filestoreprotocolprinter.cpp

@@ -438,7 +438,7 @@ void printRecord(bsl::ostream& stream, const mqbs::JournalOpRecord& rec)
     }
 
     printer << epochValue << rec.type() << rec.syncPointType()
-            << rec.primaryNodeId() << rec.sequenceNum() << rec.primaryLeaseId()
+            << rec.primaryLeaseId() << rec.sequenceNum() << rec.primaryNodeId()
             << rec.dataFileOffsetDwords();
 
     stream << "\n";