Store affected keys as QByteArrays to prevent data loss

Author: uglide

src/modules/bulk-operations/operations/abstractoperation.cpp

@@ -1,4 +1,5 @@
 #include "abstractoperation.h"
+#include <qredisclient/utils/text.h>
 
 BulkOperations::AbstractOperation::AbstractOperation(
     QSharedPointer<RedisClient::Connection> connection, int dbIndex,
@@ -22,11 +23,14 @@ void BulkOperations::AbstractOperation::getAffectedKeys(
 
         m_affectedKeys.clear();
 
-        for (QByteArray k : keys) {
-          m_affectedKeys.append(QString::fromUtf8(k));
+        QStringList keyNames;
+
+        for (const QByteArray &k : keys) {
+          m_affectedKeys.append(k);
+          keyNames.append(printableString(k, true));
         }
 
-        return callback(QVariant(m_affectedKeys), "");
+        return callback(QVariant(keyNames), "");
       };
 
   try {

src/modules/bulk-operations/operations/abstractoperation.h

@@ -69,8 +69,8 @@ class AbstractOperation : public QObject {
   QRegExp m_keyPattern;
   State m_currentState;
   int m_progress;
-  QStringList m_affectedKeys;
-  QStringList m_keysWithErrors;
+  QList<QByteArray> m_affectedKeys;
+  QList<QByteArray> m_keysWithErrors;
   QVariantMap m_metadata;
   OperationCallback m_callback;
   QStringList m_errors;

src/modules/bulk-operations/operations/copyoperation.cpp

@@ -44,7 +44,7 @@ void BulkOperations::CopyOperation::performOperation(
 
       auto getRestoreCmd = [this, r, replace, ttl](const QByteArray& dump) {
         QList<QByteArray> restoreCmd{
-            "RESTORE", m_affectedKeys[m_dumpedKeys].toUtf8(), ttl, dump};
+            "RESTORE", m_affectedKeys[m_dumpedKeys], ttl, dump};
         if (!replace.isEmpty()) {
           restoreCmd.append(replace);
         }
@@ -107,8 +107,8 @@ void BulkOperations::CopyOperation::performOperation(
   auto processKeys = [this, processKeyDumps]() {
     QList<QList<QByteArray>> rawCmds;
 
-    for (QString k : m_affectedKeys) {
-      rawCmds.append({"DUMP", k.toUtf8()});
+    for (const QByteArray &k : qAsConst(m_affectedKeys)) {
+      rawCmds.append({"DUMP", k});
     }
 
     m_connection->pipelinedCmd(rawCmds, this, -1, processKeyDumps);

src/modules/bulk-operations/operations/deleteoperation.cpp

@@ -38,7 +38,7 @@ void BulkOperations::DeleteOperation::performOperation(
                             // Retry on keys with errors
                             if (m_keysWithErrors.size() > 0) {
                               m_errors.clear();
-                              deleteKeys(QStringList(m_keysWithErrors),
+                              deleteKeys(m_keysWithErrors,
                                          removalCmd, returnResults);
                             } else {
                               returnResults();
@@ -48,12 +48,12 @@ void BulkOperations::DeleteOperation::performOperation(
 }
 
 void BulkOperations::DeleteOperation::deleteKeys(
-    const QStringList &keys, const QByteArray &rmCmd,
+    const QList<QByteArray> &keys, const QByteArray &rmCmd,
     std::function<void()> callback) {
   QList<QList<QByteArray>> rawCmds;
 
-  for (QString k : keys) {
-    rawCmds.append({rmCmd, k.toUtf8()});
+  for (const QByteArray& k : keys) {
+    rawCmds.append({rmCmd, k});
   }
 
   int expectedResponses = rawCmds.size();

src/modules/bulk-operations/operations/deleteoperation.h

@@ -24,7 +24,7 @@ class DeleteOperation : public AbstractOperation {
       QSharedPointer<RedisClient::Connection> targetConnection,
       int targetDbIndex) override;
 
-  void deleteKeys(const QStringList& keys,
+  void deleteKeys(const QList<QByteArray> &keys,
                   const QByteArray& rmCmd,
                   std::function<void()> callback);
 };

src/modules/bulk-operations/operations/rdbimport.cpp

@@ -1,6 +1,7 @@
 #include "rdbimport.h"
 
 #include <qpython.h>
+#include <qredisclient/utils/text.h>
 
 #include <QFileInfo>
 #include <QtConcurrent>
@@ -40,12 +41,14 @@ void BulkOperations::RDBImportOperation::getAffectedKeys(
         }
 
         QVariantList keys = v.toList();
+        QStringList keyNames;
 
         for (const QVariant &k : qAsConst(keys)) {
-          m_affectedKeys.append(QString::fromUtf8(k.toByteArray()));
+          m_affectedKeys.append(k.toByteArray());
+          keyNames.append(printableString(k.toByteArray(), true));
         }
 
-        return callback(QVariant(m_affectedKeys), "");
+        return callback(QVariant(keyNames), "");
       });
 }
 

src/modules/bulk-operations/operations/ttloperation.cpp

@@ -31,21 +31,21 @@ void BulkOperations::TtlOperation::performOperation(
                       // Retry on keys with errors
                       if (m_keysWithErrors.size() > 0) {
                         m_errors.clear();
-                        setTtl(QStringList(m_keysWithErrors), ttl,
+                        setTtl(m_keysWithErrors, ttl,
                                returnResults);
                       } else {
                         returnResults();
                       }
                     });
 }
 
-void BulkOperations::TtlOperation::setTtl(const QStringList& keys,
+void BulkOperations::TtlOperation::setTtl(const QList<QByteArray>& keys,
                                           const QByteArray& ttl,
                                           std::function<void()> callback) {
   QList<QList<QByteArray>> rawCmds;
 
-  for (QString k : keys) {
-    rawCmds.append({"EXPIRE", k.toUtf8(), ttl});
+  for (const QByteArray& k : keys) {
+    rawCmds.append({"EXPIRE", k, ttl});
   }
 
   int expectedResponses = rawCmds.size();

src/modules/bulk-operations/operations/ttloperation.h

@@ -27,6 +27,6 @@ class TtlOperation : public AbstractOperation {
       int targetDbIndex) override;
 
 
-  void setTtl(const QStringList& keys, const QByteArray &ttl, std::function<void()> callback);
+  void setTtl(const QList<QByteArray> &keys, const QByteArray &ttl, std::function<void()> callback);
 };
 }  // namespace BulkOperations