1 files changed, 4 insertions, 3 deletions

diff --git a/common/storage_common.cpp b/common/storage_common.cpp
index 78d4c84..057dce4 100644
--- a/common/storage_common.cpp
+++ b/common/storage_common.cpp
@@ -35,6 +35,7 @@ namespace Storage {
 
 static const char *s_internalPrefix = "__internal";
 static const int s_internalPrefixSize = strlen(s_internalPrefix);
+static const int s_lengthOfUid = 38;
 
 DbLayout::DbLayout()
 {
@@ -196,18 +197,18 @@ bool DataStore::isInternalKey(const QByteArray &key)
 QByteArray DataStore::assembleKey(const QByteArray &key, qint64 revision)
 {
     Q_ASSERT(revision <= 9223372036854775807);
-    Q_ASSERT(key.size() == 38);
+    Q_ASSERT(key.size() == s_lengthOfUid);
     return key + QByteArray::number(revision).rightJustified(19, '0', false);
 }
 
 QByteArray DataStore::uidFromKey(const QByteArray &key)
 {
-    return key.mid(0, 38);
+    return key.mid(0, s_lengthOfUid);
 }
 
 qint64 DataStore::revisionFromKey(const QByteArray &key)
 {
-    return key.mid(39).toLongLong();
+    return key.mid(s_lengthOfUid + 1).toLongLong();
 }
 
 QByteArray DataStore::generateUid()