Move Key API into own files + some fixes

1 files changed, 0 insertions, 148 deletions

diff --git a/common/storage.h b/common/storage.h
index 3cc5adf..25d0fa6 100644
--- a/common/storage.h
+++ b/common/storage.h
@@ -40,151 +40,6 @@ struct SINK_EXPORT DbLayout {
     Databases tables;
 };
 
-class Identifier
-{
-public:
-    // RFC 4122 Section 4.1.2 says 128 bits -> 16 bytes
-    static const constexpr size_t INTERNAL_REPR_SIZE = 16;
-    static const constexpr size_t DISPLAY_REPR_SIZE = 38;
-
-    Identifier() : uid(QUuid::createUuid()) {};
-
-    QByteArray toInternalByteArray() const
-    {
-        return uid.toRfc4122();
-    }
-
-    static Identifier fromInternalByteArray(const QByteArray &bytes)
-    {
-        Q_ASSERT(bytes.size() == INTERNAL_REPR_SIZE);
-        return Identifier(QUuid::fromRfc4122(bytes));
-    }
-
-    QString toDisplayString() const
-    {
-        return uid.toString();
-    }
-
-    QByteArray toDisplayByteArray() const
-    {
-        return uid.toByteArray();
-    }
-
-    static Identifier fromDisplayByteArray(const QByteArray &bytes)
-    {
-        Q_ASSERT(bytes.size() == DISPLAY_REPR_SIZE);
-        return Identifier(QUuid::fromString(QString::fromUtf8(bytes)));
-    }
-
-private:
-    explicit Identifier(const QUuid &uid) : uid(uid) {}
-    QUuid uid;
-};
-
-class Revision
-{
-public:
-    // qint64 has a 19 digit decimal representation
-    static const constexpr size_t INTERNAL_REPR_SIZE = 19;
-    static const constexpr size_t DISPLAY_REPR_SIZE = 19;
-
-    Revision(qint64 rev) : rev(rev) {}
-
-    QByteArray toInternalByteArray() const
-    {
-        return padNumber(rev);
-    }
-
-    static Revision fromInternalByteArray(const QByteArray &bytes)
-    {
-        Q_ASSERT(bytes.size() == INTERNAL_REPR_SIZE);
-        return Revision(bytes.toLongLong());
-    }
-
-    QString toDisplayString() const
-    {
-        return QString::fromUtf8(toInternalByteArray());
-    }
-
-    QByteArray toDisplayByteArray() const
-    {
-        return toInternalByteArray();
-    }
-
-    static Revision fromDisplayByteArray(const QByteArray &bytes)
-    {
-        Q_ASSERT(bytes.size() == DISPLAY_REPR_SIZE);
-        return fromInternalByteArray(bytes);
-    }
-
-    qint64 toQint64() const
-    {
-        return rev;
-    }
-
-private:
-    qint64 rev;
-};
-
-class Key
-{
-public:
-    static const constexpr size_t INTERNAL_REPR_SIZE = Identifier::INTERNAL_REPR_SIZE + Revision::INTERNAL_REPR_SIZE;
-    static const constexpr size_t DISPLAY_REPR_SIZE = Identifier::DISPLAY_REPR_SIZE + Revision::DISPLAY_REPR_SIZE;
-
-    Key(const Identifier &id, const Revision &rev) : id(id), rev(rev) {}
-
-    QByteArray toInternalByteArray() const
-    {
-        return id.toInternalByteArray() + rev.toInternalByteArray();
-    }
-
-    static Key fromInternalByteArray(const QByteArray &bytes)
-    {
-        Q_ASSERT(bytes.size() == INTERNAL_REPR_SIZE);
-        auto idBytes = bytes.mid(0, Identifier::INTERNAL_REPR_SIZE);
-        auto revBytes = bytes.mid(Identifier::INTERNAL_REPR_SIZE);
-        return Key(Identifier::fromInternalByteArray(idBytes), Revision::fromInternalByteArray(revBytes));
-    }
-
-    QString toDisplayString() const
-    {
-        return id.toDisplayString() + rev.toDisplayString();
-    }
-
-    QByteArray toDisplayByteArray() const
-    {
-        return id.toDisplayByteArray() + rev.toDisplayByteArray();
-    }
-
-    static Key fromDisplayByteArray(const QByteArray &bytes)
-    {
-        Q_ASSERT(bytes.size() == DISPLAY_REPR_SIZE);
-        auto idBytes = bytes.mid(0, Identifier::DISPLAY_REPR_SIZE);
-        auto revBytes = bytes.mid(Identifier::DISPLAY_REPR_SIZE);
-        return Key(Identifier::fromDisplayByteArray(idBytes), Revision::fromDisplayByteArray(revBytes));
-    }
-
-    const Identifier &identifier() const
-    {
-        return id;
-    }
-
-    const Revision &revision() const
-    {
-        return rev;
-    }
-
-    void setRevision(const Revision &newRev)
-    {
-        rev = newRev;
-    }
-
-private:
-    Identifier id;
-    Revision rev;
-};
-
 class SINK_EXPORT DataStore
 {
 public:
@@ -407,6 +262,3 @@ private:
 } // namespace Sink
 
 SINK_EXPORT QDebug& operator<<(QDebug &dbg, const Sink::Storage::DataStore::Error &error);
-SINK_EXPORT QDebug& operator<<(QDebug &dbg, const Sink::Storage::Identifier &);
-SINK_EXPORT QDebug& operator<<(QDebug &dbg, const Sink::Storage::Revision &);
-SINK_EXPORT QDebug& operator<<(QDebug &dbg, const Sink::Storage::Key &);