Update the flush and snapshot interface to deal with the changed interface of hashtable_mcmp_op_get_by_index

Author: danielealbano

src/storage/db/storage_db.c

@@ -1632,13 +1632,16 @@ bool storage_db_op_flush_sync(
         transaction_acquire(&transaction);
 
         storage_db_entry_index_t *entry_index = NULL;
+        storage_db_database_number_t entry_database_number;
         if (hashtable_mcmp_op_get_by_index(
                 db->hashtable,
-                database_number,
                 &transaction,
                 bucket_index,
+                &entry_database_number,
                 (void *) &entry_index)) {
-            if (entry_index->created_time_ms <= deletion_start_ms) {
+            // Ensure that the entry is from the correct database and that it's older than the deletion start time, to
+            // avoid deleting entries that have been created after the flush has started
+            if (database_number == entry_database_number && entry_index->created_time_ms <= deletion_start_ms) {
                 storage_db_op_delete_by_index(
                         db,
                         database_number,

src/storage/db/storage_db_snapshot.c

@@ -964,9 +964,9 @@ bool storage_db_snapshot_rdb_process_block(
         storage_db_entry_index_t *entry_index = NULL;
         if (!hashtable_mcmp_op_get_by_index(
                 db->hashtable,
-                database_number,
                 &transaction,
                 bucket_index,
+                &database_number,
                 (void *) &entry_index)) {
             goto loop_end;
         }