3 files changed, 136 insertions, 21 deletions

diff --git a/sinksh/syntax_modules/sink_info.cpp b/sinksh/syntax_modules/sink_info.cpp
new file mode 100644
index 0000000..aa515e6
--- /dev/null
+++ b/sinksh/syntax_modules/sink_info.cpp
@@ -0,0 +1,51 @@
+/*
+ *   Copyright (C) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+
+#include <QDebug>
+#include <QObject> // tr()
+
+#include "common/definitions.h"
+
+#include "sinksh_utils.h"
+#include "state.h"
+#include "syntaxtree.h"
+#include "sink_version.h"
+
+namespace SinkInfo
+{
+
+bool info(const QStringList &args, State &state)
+{
+    state.printLine(QString("Sink version: %1").arg(sink_VERSION_STRING));
+    state.printLine(QString("Storage location: %1").arg(Sink::storageLocation()));
+    state.printLine(QString("Data location: %1").arg(Sink::dataLocation()));
+    state.printLine(QString("Config location: %1").arg(Sink::configLocation()));
+    state.printLine(QString("Temporary file location: %1").arg(Sink::temporaryFileLocation()));
+    state.printLine(QString("Resource storage location: %1").arg(Sink::resourceStorageLocation("$RESOURCE")));
+    return false;
+}
+
+Syntax::List syntax()
+{
+    return Syntax::List() << Syntax{"info", QObject::tr("Shows general system info"), &SinkInfo::info, Syntax::NotInteractive};
+}
+
+REGISTER_SYNTAX(SinkInfo)
+
+}
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));
diff --git a/sinksh/syntax_modules/sink_show.cpp b/sinksh/syntax_modules/sink_show.cpp
index 391505a..7a4166f 100644
--- a/sinksh/syntax_modules/sink_show.cpp
+++ b/sinksh/syntax_modules/sink_show.cpp
@@ -18,18 +18,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
  */
 
-#include <QCoreApplication>
 #include <QDebug>
 #include <QObject> // tr()
 #include <QModelIndex>
 #include <QTime>
 
-#include "common/resource.h"
 #include "common/storage.h"
-#include "common/resourceconfig.h"
-#include "common/log.h"
-#include "common/storage.h"
-#include "common/definitions.h"
 
 #include "sinksh_utils.h"
 #include "state.h"
@@ -41,25 +35,24 @@ namespace SinkShow
 bool show(const QStringList &args, State &state)
 {
     if (args.isEmpty()) {
-        state.printError(QObject::tr("Please provide at least one type to show (e.g. resource, .."));
+        state.printError(QObject::tr("Options: $type --resource $resource --id $id"));
         return false;
     }
 
-    auto argList = args;
-    if (argList.size() < 2 || !SinkshUtils::isValidStoreType(argList.at(0))) {
+    auto options = SyntaxTree::parseOptions(args);
+
+    auto type = options.positionalArguments.isEmpty() ? QString{} : options.positionalArguments.first();
+    auto resource = options.options.value("resource");
+    auto id = options.options.value("id");
+
+    if (id.isEmpty() || resource.isEmpty() || !SinkshUtils::isValidStoreType(type)) {
         state.printError(QObject::tr("Invalid command syntax. Supply type and resource at least."));
         return false;
     }
-    auto type = argList.takeFirst();
-    auto resource = argList.takeFirst();
-    bool queryForResourceOrAgent = argList.isEmpty();
 
     Sink::Query query;
-    if (queryForResourceOrAgent) {
-        query.filter(resource.toLatin1());
-    } else {
-        query.resourceFilter(resource.toLatin1());
-    }
+    query.resourceFilter(resource.first().toLatin1());
+    query.filter(id.first().toLatin1());
 
     QTime time;
     time.start();