Bump persistence files to version 3

They now contain sender info of publishes.

Bump persistence files to version 3
They now contain sender info of publishes.
Wiebe Cazemier
1 parent cd447414
Showing 4 changed files with 22 additions and 10 deletions
retainedmessagesdb.cpp
retainedmessagesdb.h
sessionsandsubscriptionsdb.cpp
sessionsandsubscriptionsdb.h
@@ -37,7 +37,7 @@ RetainedMessagesDB::RetainedMessagesDB(const std::string &amp;filePath) : Persistenc
 void RetainedMessagesDB::openWrite()
 {
-    PersistenceFile::openWrite(MAGIC_STRING_V2);
+    PersistenceFile::openWrite(MAGIC_STRING_V3);
 }
 void RetainedMessagesDB::openRead()
@@ -48,6 +48,8 @@ void RetainedMessagesDB::openRead()
         readVersion = ReadVersion::v1;
     else if (detectedVersionString == MAGIC_STRING_V2)
         readVersion = ReadVersion::v2;
+    else if (detectedVersionString == MAGIC_STRING_V3)
+        readVersion = ReadVersion::v3;
     else
         throw std::runtime_error("Unknown file version.");
 }
@@ -106,12 +108,14 @@ std::list&lt;RetainedMessage&gt; RetainedMessagesDB::readData()
     if (readVersion == ReadVersion::v1)
         logger->logf(LOG_WARNING, "File '%s' is version 1, an internal development version that was never finalized. Not reading.", getFilePath().c_str());
     if (readVersion == ReadVersion::v2)
-        return readDataV2();
+        logger->logf(LOG_WARNING, "File '%s' is version 2, an internal development version that was never finalized. Not reading.", getFilePath().c_str());
+    if (readVersion == ReadVersion::v3)
+        return readDataV3();
     return defaultResult;
 }
-std::list<RetainedMessage> RetainedMessagesDB::readDataV2()
+std::list<RetainedMessage> RetainedMessagesDB::readDataV3()
 {
     std::list<RetainedMessage> messages;
@@ -25,6 +25,7 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 #define MAGIC_STRING_V1 "FlashMQRetainedDBv1"
 #define MAGIC_STRING_V2 "FlashMQRetainedDBv2"
+#define MAGIC_STRING_V3 "FlashMQRetainedDBv3"
 #define RESERVED_SPACE_RETAINED_DB_V2 64
 /**
@@ -45,7 +46,8 @@ class RetainedMessagesDB : public PersistenceFile
     {
         unknown,
         v1,
-        v2
+        v2,
+        v3
     };
     struct RowHeader
@@ -56,7 +58,7 @@ class RetainedMessagesDB : public PersistenceFile
     ReadVersion readVersion = ReadVersion::unknown;
-    std::list<RetainedMessage> readDataV2();
+    std::list<RetainedMessage> readDataV3();
 public:
     RetainedMessagesDB(const std::string &filePath);
@@ -43,7 +43,7 @@ SessionsAndSubscriptionsDB::SessionsAndSubscriptionsDB(const std::string &amp;filePa
 void SessionsAndSubscriptionsDB::openWrite()
 {
-    PersistenceFile::openWrite(MAGIC_STRING_SESSION_FILE_V2);
+    PersistenceFile::openWrite(MAGIC_STRING_SESSION_FILE_V3);
 }
 void SessionsAndSubscriptionsDB::openRead()
@@ -54,11 +54,13 @@ void SessionsAndSubscriptionsDB::openRead()
         readVersion = ReadVersion::v1;
     else if (detectedVersionString == MAGIC_STRING_SESSION_FILE_V2)
         readVersion = ReadVersion::v2;
+    else if (detectedVersionString == MAGIC_STRING_SESSION_FILE_V3)
+        readVersion = ReadVersion::v3;
     else
         throw std::runtime_error("Unknown file version.");
 }
-SessionsAndSubscriptionsResult SessionsAndSubscriptionsDB::readDataV2()
+SessionsAndSubscriptionsResult SessionsAndSubscriptionsDB::readDataV3()
 {
     const Settings *settings = ThreadGlobals::getSettings();
@@ -388,7 +390,9 @@ SessionsAndSubscriptionsResult SessionsAndSubscriptionsDB::readData()
     if (readVersion == ReadVersion::v1)
         logger->logf(LOG_WARNING, "File '%s' is version 1, an internal development version that was never finalized. Not reading.", getFilePath().c_str());
     if (readVersion == ReadVersion::v2)
-        return readDataV2();
+        logger->logf(LOG_WARNING, "File '%s' is version 2, an internal development version that was never finalized. Not reading.", getFilePath().c_str());
+    if (readVersion == ReadVersion::v3)
+        return readDataV3();
     return defaultResult;
 }
@@ -26,6 +26,7 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 #define MAGIC_STRING_SESSION_FILE_V1 "FlashMQRetainedDBv1" // That this is called 'retained' was a bug...
 #define MAGIC_STRING_SESSION_FILE_V2 "FlashMQSessionDBv2"
+#define MAGIC_STRING_SESSION_FILE_V3 "FlashMQSessionDBv3"
 #define RESERVED_SPACE_SESSIONS_DB_V2 32
 /**
@@ -53,12 +54,13 @@ class SessionsAndSubscriptionsDB : public PersistenceFile
     {
         unknown,
         v1,
-        v2
+        v2,
+        v3
     };
     ReadVersion readVersion = ReadVersion::unknown;
-    SessionsAndSubscriptionsResult readDataV2();
+    SessionsAndSubscriptionsResult readDataV3();
     void writeRowHeader();
 public:
     SessionsAndSubscriptionsDB(const std::string &filePath);