Updates in performance and quality

#950

Author: teusbenschop

database/notes.cpp

@@ -56,7 +56,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  In older versions the notes were stored as a bundle of separate files.
  In newer versions each note is stored as one JSON file.
  This uses less space on disk.
- In older versions, on a Linux server, one notes took 32 kbytes.
+ In older versions, on a Linux server, one note took 32 kbytes.
  A lot of that space is wasted.
  In newer versions one notes takes only 4 kbytes.
  That is a difference of 8 times.
@@ -184,21 +184,21 @@ bool Database_Notes::checkup_checksums ()
 void Database_Notes::trim ()
 {
   // Clean empty directories.
-  std::string message = "Deleting empty notes folder ";
-  std::string main_folder = main_folder_path ();
-  std::vector <std::string> bits1 = filter_url_scandir (main_folder);
-  for (auto bit1 : bits1) {
+  const std::string message = "Deleting empty notes folder ";
+  const std::string main_folder = main_folder_path ();
+  const std::vector <std::string> bits1 = filter_url_scandir (main_folder);
+  for (const auto& bit1 : bits1) {
     if (bit1.length () == 3) {
-      std::string folder1 = filter_url_create_path ({main_folder, bit1});
-      std::vector <std::string> bits2 = filter_url_scandir (folder1);
+      const std::string folder1 = filter_url_create_path ({main_folder, bit1});
+      const std::vector <std::string> bits2 = filter_url_scandir (folder1);
       if (bits2.empty ()) {
         Database_Logs::log (message + folder1);
         remove (folder1.c_str ());
       }
-      for (auto bit2 : bits2) {
+      for (const auto& bit2 : bits2) {
         if (bit2.length () == 3) {
-          std::string folder2 = filter_url_create_path ({main_folder, bit1, bit2});
-          std::vector <std::string> bits3 = filter_url_scandir (folder2);
+          const std::string folder2 = filter_url_create_path ({main_folder, bit1, bit2});
+          const std::vector <std::string> bits3 = filter_url_scandir (folder2);
           if (bits3.empty ()) {
             Database_Logs::log (message + folder2);
             remove (folder2.c_str());
@@ -214,11 +214,9 @@ void Database_Notes::trim_server ()
 {
   // Notes expiry.
   touch_marked_for_deletion ();
-  /// Storage for notes to be deleted.
-  std::vector <int> identifiers;
-  // Deal with new notes storage in JSON.
-  identifiers = get_due_for_deletion ();
-  for (auto & identifier : identifiers) {
+  // Storage for notes to be deleted.
+  const std::vector <int> identifiers = get_due_for_deletion ();
+  for (const auto identifier : identifiers) {
     trash_consultation_note (m_webserver_request, identifier);
     erase (identifier);
   }
@@ -233,35 +231,35 @@ void Database_Notes::optimize ()
 }
 
 
-void Database_Notes::sync ()
+void Database_Notes::sync () // Todo
 {
-  std::string main_folder = main_folder_path ();
+  const std::string main_folder = main_folder_path ();
 
   // List of notes in the filesystem.
   std::vector <int> identifiers;
 
-  std::vector <std::string> bits1 = filter_url_scandir (main_folder);
-  for (auto & bit1 : bits1) {
+  const std::vector <std::string> bits1 = filter_url_scandir (main_folder);
+  for (const auto& bit1 : bits1) {
     // Bit 1 / 2 / 3 may start with a 0, so conversion to int cannot be used, rather use a length of 3.
     // It used conversion to int before to determine it was a real note,
     // with the result that it missed 10% of the notes, which subsequently got deleted, oops!
     if (bit1.length () == 3) {
-      std::vector <std::string> bits2 = filter_url_scandir (filter_url_create_path ({main_folder, bit1}));
-      for (auto & bit2 : bits2) {
+      const std::vector <std::string> bits2 = filter_url_scandir (filter_url_create_path ({main_folder, bit1}));
+      for (const auto& bit2 : bits2) {
         // Old storage mechanism, e.g. folder "425".
         if (bit2.length () == 3) {
-          std::vector <std::string> bits3 = filter_url_scandir (filter_url_create_path ({main_folder, bit1, bit2}));
-          for (auto & bit3 : bits3) {
+          const std::vector <std::string> bits3 = filter_url_scandir (filter_url_create_path ({main_folder, bit1, bit2}));
+          for (const auto& bit3 : bits3) {
             if (bit3.length () == 3) {
-              int identifier = filter::strings::convert_to_int (bit1 + bit2 + bit3);
+              const int identifier = filter::strings::convert_to_int (bit1 + bit2 + bit3);
               identifiers.push_back (identifier);
               update_search_fields (identifier);
             }
           }
         }
-        // New JSON storage mechanism, e.g. file "894093.json".
+        // New JSON storage mechanism, e.g. file "894093.json". Todo
         if ((bit2.length () == 11) && bit2.find (".json") != std::string::npos) {
-          int identifier = filter::strings::convert_to_int (bit1 + bit2.substr (0,6));
+          const int identifier = filter::strings::convert_to_int (bit1 + bit2.substr (0,6));
           identifiers.push_back (identifier);
           update_database (identifier);
           update_search_fields (identifier);
@@ -404,9 +402,9 @@ std::string Database_Notes::note_file (int identifier)
 {
   // The maximum number of folders a folder may contain is constrained by the filesystem.
   // To overcome this, the notes will be stored in a folder structure.
-  std::string sidentifier = std::to_string (identifier);
-  std::string folder = sidentifier.substr (0, 3);
-  std::string file = sidentifier.substr (3, 6) + ".json";
+  const std::string id_path = std::to_string (identifier);
+  const std::string folder = id_path.substr (0, 3);
+  const std::string file = id_path.substr (3, 6) + ".json";
   return filter_url_create_path ({main_folder_path (), folder, file});
 }
 
@@ -1882,15 +1880,15 @@ std::vector <std::string> Database_Notes::set_bulk (std::string json)
 
 
 // Gets a field from a note in JSON format.
-std::string Database_Notes::get_field (int identifier, std::string key)
+std::string Database_Notes::get_field (int identifier, const std::string& key) // Todo
 {
-  std::string file = note_file (identifier);
-  std::string json = filter_url_file_get_contents (file);
+  const std::string file = note_file (identifier);
+  const std::string json = filter_url_file_get_contents (file);
   jsonxx::Object note;
   note.parse (json);
-  std::string value;
-  if (note.has<jsonxx::String> (key)) value = note.get<jsonxx::String> (key);
-  return value;
+  if (note.has<jsonxx::String> (key))
+    return note.get<jsonxx::String> (key);
+  return std::string();
 }
 
 

database/notes.h

@@ -213,7 +213,7 @@ class Database_Notes
   friend void test_database_notes ();
 
 private:
-  std::string get_field (int identifier, std::string key);
+  std::string get_field (int identifier, const std::string& key);
   void set_field (int identifier, std::string key, std::string value);
 
 };

search/renotes.cpp

@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <database/config/general.h>
 
 
-bool search_reindex_notes_running = false;
+static bool search_reindex_notes_running = false;
 
 
 void search_reindex_notes ()

unittests/notes.cpp

@@ -953,26 +953,23 @@ void test_database_notes ()
     checksum = database_notes.get_checksum (newidentifier);
     EXPECT_EQ (outdated_checksum, checksum);
     database_notes.sync ();
-    // Sometimes something strange happens:
-    // At times the checksum gets erased as the sync routine cannot find the original note.
-    // The sync (2) call did not make any difference.
     checksum = database_notes.get_checksum (oldidentifier);
-    if (!checksum.empty()) EXPECT_EQ (good_checksum_old, checksum);
+    EXPECT_EQ (good_checksum_old, checksum);
     database_notes.set_checksum (oldidentifier, outdated_checksum);
     checksum = database_notes.get_checksum (newidentifier);
-    if (!checksum.empty()) EXPECT_EQ (good_checksum_new, checksum);
+    EXPECT_EQ (good_checksum_new, checksum);
     database_notes.set_checksum (newidentifier, outdated_checksum);
 
-    // Test that saving a note updates the checksum in most cases.
-    database_notes.set_checksum (oldidentifier, "");
+    // Test that saving a note updates the checksum.
+    database_notes.set_checksum (oldidentifier, std::string());
     checksum = database_notes.get_checksum (oldidentifier);
-    EXPECT_EQ ("", checksum);
+    EXPECT_EQ (std::string(), checksum);
     database_notes.set_modified (oldidentifier, 1234567);
     checksum = database_notes.get_checksum (oldidentifier);
     EXPECT_EQ (false, checksum.empty());
-    database_notes.set_checksum (newidentifier, "");
+    database_notes.set_checksum (newidentifier, std::string());
     checksum = database_notes.get_checksum (newidentifier);
-    EXPECT_EQ ("", checksum);
+    EXPECT_EQ (std::string(), checksum);
     database_notes.set_modified (newidentifier, 1234567);
     checksum = database_notes.get_checksum (newidentifier);
     EXPECT_EQ (false, checksum.empty());