diff options
author | Minijackson <minijackson@riseup.net> | 2018-08-21 13:40:59 +0200 |
---|---|---|
committer | Minijackson <minijackson@riseup.net> | 2018-08-21 13:40:59 +0200 |
commit | 91f0b273fc2072a4d7c96ba83b37fe45b3cda1ef (patch) | |
tree | ad44891a5bb90cef9eed398f074cea979f057440 /common/storage_common.cpp | |
parent | 6ef0a29d8e468de50c9dcf260db45957d028a083 (diff) | |
download | sink-91f0b273fc2072a4d7c96ba83b37fe45b3cda1ef.tar.gz sink-91f0b273fc2072a4d7c96ba83b37fe45b3cda1ef.zip |
Refactor QByteArray ↔ size_t conversions into utils
Diffstat (limited to 'common/storage_common.cpp')
-rw-r--r-- | common/storage_common.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/storage_common.cpp b/common/storage_common.cpp index ac246b2..5b4d3ec 100644 --- a/common/storage_common.cpp +++ b/common/storage_common.cpp | |||
@@ -141,7 +141,7 @@ size_t DataStore::getLatestRevisionFromUid(DataStore::Transaction &t, const QByt | |||
141 | size_t revision; | 141 | size_t revision; |
142 | t.openDatabase("uidsToRevisions", {}, AllowDuplicates | IntegerValues) | 142 | t.openDatabase("uidsToRevisions", {}, AllowDuplicates | IntegerValues) |
143 | .findLatest(uid, [&revision](const QByteArray &key, const QByteArray &value) { | 143 | .findLatest(uid, [&revision](const QByteArray &key, const QByteArray &value) { |
144 | revision = *reinterpret_cast<const size_t *>(value.constData()); | 144 | revision = byteArrayToSizeT(value); |
145 | }); | 145 | }); |
146 | 146 | ||
147 | return revision; | 147 | return revision; |
@@ -152,7 +152,7 @@ QList<size_t> DataStore::getRevisionsUntilFromUid(DataStore::Transaction &t, con | |||
152 | QList<size_t> queriedRevisions; | 152 | QList<size_t> queriedRevisions; |
153 | t.openDatabase("uidsToRevisions", {}, AllowDuplicates | IntegerValues) | 153 | t.openDatabase("uidsToRevisions", {}, AllowDuplicates | IntegerValues) |
154 | .scan(uid, [&queriedRevisions, lastRevision](const QByteArray &, const QByteArray &value) { | 154 | .scan(uid, [&queriedRevisions, lastRevision](const QByteArray &, const QByteArray &value) { |
155 | size_t currentRevision = *reinterpret_cast<const size_t *>(value.constData()); | 155 | size_t currentRevision = byteArrayToSizeT(value); |
156 | if (currentRevision < lastRevision) { | 156 | if (currentRevision < lastRevision) { |
157 | queriedRevisions << currentRevision; | 157 | queriedRevisions << currentRevision; |
158 | return true; | 158 | return true; |
@@ -185,7 +185,7 @@ void DataStore::recordRevision(DataStore::Transaction &transaction, size_t revis | |||
185 | .openDatabase("revisions", /* errorHandler = */ {}, IntegerKeys) | 185 | .openDatabase("revisions", /* errorHandler = */ {}, IntegerKeys) |
186 | .write(revision, uid); | 186 | .write(revision, uid); |
187 | transaction.openDatabase("uidsToRevisions", /* errorHandler = */ {}, AllowDuplicates | IntegerValues) | 187 | transaction.openDatabase("uidsToRevisions", /* errorHandler = */ {}, AllowDuplicates | IntegerValues) |
188 | .write(uid, QByteArray::fromRawData(reinterpret_cast<const char *>(&revision), sizeof(revision))); | 188 | .write(uid, sizeTToByteArray(revision)); |
189 | transaction | 189 | transaction |
190 | .openDatabase("revisionType", /* errorHandler = */ {}, IntegerKeys) | 190 | .openDatabase("revisionType", /* errorHandler = */ {}, IntegerKeys) |
191 | .write(revision, type); | 191 | .write(revision, type); |
@@ -199,7 +199,7 @@ void DataStore::removeRevision(DataStore::Transaction &transaction, size_t revis | |||
199 | .openDatabase("revisions", /* errorHandler = */ {}, IntegerKeys) | 199 | .openDatabase("revisions", /* errorHandler = */ {}, IntegerKeys) |
200 | .remove(revision); | 200 | .remove(revision); |
201 | transaction.openDatabase("uidsToRevisions", /* errorHandler = */ {}, AllowDuplicates | IntegerValues) | 201 | transaction.openDatabase("uidsToRevisions", /* errorHandler = */ {}, AllowDuplicates | IntegerValues) |
202 | .remove(uid, QByteArray::fromRawData(reinterpret_cast<const char *>(&revision), sizeof(revision))); | 202 | .remove(uid, sizeTToByteArray(revision)); |
203 | transaction | 203 | transaction |
204 | .openDatabase("revisionType", /* errorHandler = */ {}, IntegerKeys) | 204 | .openDatabase("revisionType", /* errorHandler = */ {}, IntegerKeys) |
205 | .remove(revision); | 205 | .remove(revision); |