From 254f9dad6377311b8115221c252b20726acad0c5 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 11 May 2017 17:47:54 +0200 Subject: Upgrade job that we can eventually use to upgrade the storage --- common/store.cpp | 13 ++++++++++ common/store.h | 12 +++++++++ sinksh/CMakeLists.txt | 1 + sinksh/syntax_modules/sink_upgrade.cpp | 47 ++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) create mode 100644 sinksh/syntax_modules/sink_upgrade.cpp diff --git a/common/store.cpp b/common/store.cpp index d266098..0eefe69 100644 --- a/common/store.cpp +++ b/common/store.cpp @@ -277,6 +277,19 @@ KAsync::Job Store::removeDataFromDisk(const QByteArray &identifier) }); } +KAsync::Job Store::upgrade() +{ + SinkLog() << "Upgrading..."; + return fetchAll({}) + .template each([](const ApplicationDomain::SinkResource::Ptr &resource) -> KAsync::Job { + SinkLog() << "Removing caches for " << resource->identifier(); + return removeDataFromDisk(resource->identifier()); + }) + .then([] { + SinkLog() << "Upgrade complete."; + }); +} + static KAsync::Job synchronize(const QByteArray &resource, const Sink::SyncScope &scope) { SinkLog() << "Synchronizing " << resource << scope; diff --git a/common/store.h b/common/store.h index fae76e5..34e14df 100644 --- a/common/store.h +++ b/common/store.h @@ -122,6 +122,18 @@ KAsync::Job SINK_EXPORT synchronize(const Sink::SyncScope &query); */ KAsync::Job SINK_EXPORT removeDataFromDisk(const QByteArray &resourceIdentifier); +/** + * Run upgrade jobs. + * + * Run this to upgrade your local database to a new version. + * Note that this may: + * * take a while + * * remove some/all of your local caches + * + * Note: The initial implementation simply calls removeDataFromDisk for all resources. + */ +KAsync::Job SINK_EXPORT upgrade(); + template KAsync::Job SINK_EXPORT fetchOne(const Sink::Query &query); diff --git a/sinksh/CMakeLists.txt b/sinksh/CMakeLists.txt index 82839ab..bc487c1 100644 --- a/sinksh/CMakeLists.txt +++ b/sinksh/CMakeLists.txt @@ -18,6 +18,7 @@ set(sink_cli_SRCS syntax_modules/sink_trace.cpp syntax_modules/sink_inspect.cpp syntax_modules/sink_drop.cpp + syntax_modules/sink_upgrade.cpp sinksh_utils.cpp repl/repl.cpp repl/replStates.cpp diff --git a/sinksh/syntax_modules/sink_upgrade.cpp b/sinksh/syntax_modules/sink_upgrade.cpp new file mode 100644 index 0000000..c399048 --- /dev/null +++ b/sinksh/syntax_modules/sink_upgrade.cpp @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2017 Christian Mollekopf + * + * 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 +#include // tr() +#include + +#include "common/store.h" + +#include "state.h" +#include "syntaxtree.h" + +namespace SinkUpgrade +{ + +bool upgrade(const QStringList &args, State &state) +{ + state.print(QObject::tr("Upgrading...")); + Sink::Store::upgrade().exec().waitForFinished(); + state.printLine(QObject::tr("done")); + return true; +} + +Syntax::List syntax() +{ + return Syntax::List() << Syntax{"upgrade", QObject::tr("Upgrades your storage to the latest version (be careful!)"), &SinkUpgrade::upgrade, Syntax::NotInteractive}; +} + +REGISTER_SYNTAX(SinkUpgrade) + +} -- cgit v1.2.3