Merge commit 'ebdb89b8bb482bbb5ecd544c3d38bef35fc7d820'v0.4.0

1 files changed, 75 insertions, 4 deletions

diff --git a/sinksh/syntax_modules/sink_inspect.cpp b/sinksh/syntax_modules/sink_inspect.cpp
index a8a3805..da62250 100644
--- a/sinksh/syntax_modules/sink_inspect.cpp
+++ b/sinksh/syntax_modules/sink_inspect.cpp
@@ -19,8 +19,6 @@
 
 #include <QDebug>
 #include <QObject> // tr()
-#include <QTimer>
-#include <QDir>
 
 #include "common/resource.h"
 #include "common/storage.h"
@@ -30,6 +28,7 @@
 #include "common/definitions.h"
 #include "common/entitybuffer.h"
 #include "common/metadata_generated.h"
+#include "common/bufferutils.h"
 
 #include "sinksh_utils.h"
 #include "state.h"
@@ -41,7 +40,7 @@ namespace SinkInspect
 bool inspect(const QStringList &args, State &state)
 {
     if (args.isEmpty()) {
-        state.printError(QObject::tr("Options: $type [--resource $resource] [--db $db] [--filter $id] [--showinternal]"));
+        state.printError(QObject::tr("Options: [--resource $resource] ([--db $db] [--filter $id] [--showinternal] | [--validaterids $type])"));
     }
     auto options = SyntaxTree::parseOptions(args);
     auto resource = options.options.value("resource").value(0);
@@ -49,6 +48,75 @@ bool inspect(const QStringList &args, State &state)
     Sink::Storage::DataStore storage(Sink::storageLocation(), resource, Sink::Storage::DataStore::ReadOnly);
     auto transaction = storage.createTransaction(Sink::Storage::DataStore::ReadOnly);
 
+    bool validateRids = options.options.contains("validaterids");
+    if (validateRids) {
+        if (options.options.value("validaterids").isEmpty()) {
+            state.printError(QObject::tr("Specify a type to validate."));
+            return false;
+        }
+        auto type = options.options.value("validaterids").first().toUtf8();
+        /*
+         * Try to find all rid's for all uid's.
+         * If we have entities without rid's that either means we have only created it locally or that we have a problem.
+         */
+        Sink::Storage::DataStore syncStore(Sink::storageLocation(), resource + ".synchronization", Sink::Storage::DataStore::ReadOnly);
+        auto syncTransaction = syncStore.createTransaction(Sink::Storage::DataStore::ReadOnly);
+
+        auto db = transaction.openDatabase(type + ".main",
+                [&] (const Sink::Storage::DataStore::Error &e) {
+                    Q_ASSERT(false);
+                    state.printError(e.message);
+                }, false);
+
+        auto ridMap = syncTransaction.openDatabase("localid.mapping." + type,
+                [&] (const Sink::Storage::DataStore::Error &e) {
+                    Q_ASSERT(false);
+                    state.printError(e.message);
+                }, false);
+
+        QHash<QByteArray, QByteArray> hash;
+
+        ridMap.scan("", [&] (const QByteArray &key, const QByteArray &data) {
+                    hash.insert(key, data);
+                    return true;
+                },
+                [&](const Sink::Storage::DataStore::Error &e) {
+                    state.printError(e.message);
+                },
+                false);
+
+        QSet<QByteArray> uids;
+        db.scan("", [&] (const QByteArray &key, const QByteArray &data) {
+                    uids.insert(Sink::Storage::DataStore::uidFromKey(key));
+                    return true;
+                },
+                [&](const Sink::Storage::DataStore::Error &e) {
+                    state.printError(e.message);
+                },
+                false);
+
+        int missing = 0;
+        for (const auto &uid : uids) {
+            if (!hash.remove(uid)) {
+                missing++;
+                qWarning() << "Failed to find RID for " << uid;
+            }
+        }
+        if (missing) {
+            qWarning() << "Found a total of " << missing << " missing rids";
+        }
+
+        //If we still have items in the hash it means we have rid mappings for entities
+        //that no longer exist.
+        if (!hash.isEmpty()) {
+            qWarning() << "Have rids left: " << hash.size();
+        } else if (!missing) {
+            qWarning() << "Everything is in order.";
+        }
+
+        return false;
+    }
+
     auto dbs = options.options.value("db");
     auto idFilter = options.options.value("filter");
     bool showInternal = options.options.contains("showinternal");
@@ -96,7 +164,10 @@ bool inspect(const QStringList &args, State &state)
                             state.printError("Read invalid buffer from disk: " + key);
                         } else {
                             const auto metadata = flatbuffers::GetRoot<Sink::Metadata>(buffer.metadataBuffer());
-                            state.printLine("Key: " + key + " Operation: " + QString::number(metadata->operation()));
+                            state.printLine("Key: " + key
+                                          + " Operation: " + QString::number(metadata->operation())
+                                          + " Replay: " + (metadata->replayToSource() ? "true" : "false")
+                                          + ((metadata->modifiedProperties() && metadata->modifiedProperties()->size() != 0) ? (" [" + Sink::BufferUtils::fromVector(*metadata->modifiedProperties()).join(", ")) + "]": ""));
                         }
                     } else {
                         state.printLine("Key: " + key + " Value: " + QString::fromUtf8(data));