Fix issue #3518: Fix score in zsets

Author: uglide

src/app/models/key-models/sortedsetkey.cpp

@@ -32,12 +32,12 @@ QVariant SortedSetKeyModel::getData(int rowIndex, int dataRole)
     if (!isRowLoaded(rowIndex))
         return QVariant();
 
-    QPair<QByteArray, double> row = m_rowsCache[rowIndex];
+    QPair<QByteArray, QByteArray> row = m_rowsCache[rowIndex];
 
     if (dataRole == Roles::Value)
         return row.first;
     else if (dataRole ==Roles::Score)
-        return QString::number(row.second);
+        return row.second;
     else if (dataRole == Roles::RowNumber)
         return QString::number(rowIndex+1);    
 
@@ -49,14 +49,14 @@ void SortedSetKeyModel::updateRow(int rowIndex, const QVariantMap &row)
     if (!isRowLoaded(rowIndex) || !isRowValid(row))
         throw Exception("Invalid row");
 
-    QPair<QByteArray, double> cachedRow = m_rowsCache[rowIndex];
+    QPair<QByteArray, QByteArray> cachedRow = m_rowsCache[rowIndex];
 
     bool valueChanged = cachedRow.first != row["value"].toString();
-    bool scoreChanged = cachedRow.second != row["score"].toDouble();
+    bool scoreChanged = cachedRow.second != row["score"].toString();
 
-    QPair<QByteArray, double> newRow(
+    QPair<QByteArray, QByteArray> newRow(
                     (valueChanged) ? row["value"].toByteArray() : cachedRow.first,
-                    (scoreChanged) ? row["score"].toDouble() : cachedRow.second
+                    (scoreChanged) ? row["score"].toByteArray() : cachedRow.second
                 );
 
     // TODO (uglide): Update only score if value not changed
@@ -71,9 +71,9 @@ void SortedSetKeyModel::addRow(const QVariantMap &row)
     if (!isRowValid(row))
         throw Exception("Invalid row");
 
-    QPair<QByteArray, double> cachedRow(
+    QPair<QByteArray, QByteArray> cachedRow(
                 row["value"].toByteArray(),
-                row["score"].toDouble());
+                row["score"].toByteArray());
 
     if (addSortedSetRow(cachedRow.first, cachedRow.second)) {
         m_rowsCache.push_back(cachedRow);
@@ -99,12 +99,12 @@ void SortedSetKeyModel::removeRow(int i)
     setRemovedIfEmpty();
 }
 
-bool SortedSetKeyModel::addSortedSetRow(const QByteArray &value, double score)
+bool SortedSetKeyModel::addSortedSetRow(const QByteArray &value, QByteArray score)
 {
     RedisClient::Response result;
     try {
         result = m_connection->commandSync(
-        {"ZADD", m_keyFullPath, QString::number(score).toLatin1(), value}, m_dbIndex);
+        {"ZADD", m_keyFullPath, score, value}, m_dbIndex);
     } catch (const RedisClient::Connection::Exception& e) {
         throw Exception("Connection error: " + QString(e.what()));
     }
@@ -123,19 +123,19 @@ void SortedSetKeyModel::deleteSortedSetRow(const QByteArray &value)
 
 void SortedSetKeyModel::addLoadedRowsToCache(const QVariantList &rows, int rowStart)
 {
-    QList<QPair<QByteArray, double>> result;
+    QList<QPair<QByteArray, QByteArray>> result;
 
     for (QVariantList::const_iterator item = rows.begin();
          item != rows.end(); ++item) {
 
-        QPair<QByteArray, double> value;
+        QPair<QByteArray, QByteArray> value;
         value.first = item->toByteArray();
         ++item;
 
         if (item == rows.end())
             throw Exception("Partial data loaded from server");
 
-        value.second = item->toDouble();
+        value.second = item->toByteArray();
         result.push_back(value);
     }
 

src/app/models/key-models/sortedsetkey.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "abstractkey.h"
 
-class SortedSetKeyModel : public KeyModel<QPair<QByteArray, double>>
+class SortedSetKeyModel : public KeyModel<QPair<QByteArray, QByteArray>>
 {    
 public:
     SortedSetKeyModel(QSharedPointer<RedisClient::Connection> connection,
@@ -22,6 +22,6 @@ class SortedSetKeyModel : public KeyModel<QPair<QByteArray, double>>
 private:
     enum Roles { Value = Qt::UserRole + 1, Score, RowNumber};
 
-    bool addSortedSetRow(const QByteArray &value, double score);
+    bool addSortedSetRow(const QByteArray &value, QByteArray score);
     void deleteSortedSetRow(const QByteArray& value);
 };

src/resources/qml/ValueTabs.qml

@@ -228,8 +228,7 @@ Repeater {
                                             return ""
 
                                         if (styleData.column === 2 && keyType == "zset") {
-                                            var locale = Qt.locale("C")
-                                            return Number(styleData.value).toLocaleString(locale, "f")
+                                            return parseFloat(Number(styleData.value).toFixed(20))
                                         }
 
                                         return binaryUtils.printable(styleData.value)

src/resources/qml/editors/SortedSetItemEditor.qml

@@ -40,7 +40,7 @@ AbstractEditor {
 
     function setValue(rowValue) {
         scoreText.originalValue = rowValue['score']
-        scoreText.text = Number(rowValue['score']).toFixed(20)
+        scoreText.text = parseFloat(Number(rowValue['score']).toFixed(20))
         textArea.originalValue = rowValue['value']
         textArea.setValue(rowValue['value'])
     }