Reduce fastos.h dependency.

5 files changed, 54 insertions, 115 deletions

diff --git a/searchcore/src/apps/proton/downpersistence.cpp b/searchcore/src/apps/proton/downpersistence.cpp
index 3509d59d635..b7872286246 100644
--- a/searchcore/src/apps/proton/downpersistence.cpp
+++ b/searchcore/src/apps/proton/downpersistence.cpp
@@ -1,16 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
+#include "downpersistence.h"
+
 #include <vespa/persistence/spi/persistenceprovider.h>
 #include <vespa/searchlib/util/statefile.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/update/documentupdate.h>
-#include "downpersistence.h"
-#include <vespa/log/log.h>
-LOG_SETUP(".downpersistence");
-
-namespace storage {
 
-namespace spi {
+namespace storage::spi {
 
 namespace {
 
@@ -18,18 +14,15 @@ Result errorResult(Result::FATAL_ERROR, "Node is down");
 
 }
 
-
 DownPersistence::DownPersistence(const vespalib::string &downReason)
     : _downReason(downReason)
 {
 }
 
-
 DownPersistence::~DownPersistence()
 {
 }
 
-
 Result
 DownPersistence::initialize()
 {
@@ -63,7 +56,6 @@ DownPersistence:: setActiveState(const Bucket&, BucketInfo::ActiveState)
     return errorResult;
 }
 
-
 BucketInfoResult
 DownPersistence:: getBucketInfo(const Bucket&) const
 {
@@ -77,7 +69,6 @@ DownPersistence::put(const Bucket&, Timestamp, const Document::SP&, Context&)
     return errorResult;
 }
 
-
 RemoveResult
 DownPersistence:: remove(const Bucket&, Timestamp,
                          const DocumentId&, Context&)
@@ -86,7 +77,6 @@ DownPersistence:: remove(const Bucket&, Timestamp,
                         errorResult.getErrorMessage());
 }
 
-
 RemoveResult
 DownPersistence::removeIfFound(const Bucket&, Timestamp,
                                const DocumentId&, Context&)
@@ -95,14 +85,12 @@ DownPersistence::removeIfFound(const Bucket&, Timestamp,
                         errorResult.getErrorMessage());
 }
 
-
 Result
 DownPersistence::removeEntry(const Bucket&, Timestamp, Context&)
 {
     return errorResult;
 }
 
-
 UpdateResult DownPersistence::update(const Bucket&, Timestamp,
                                      const DocumentUpdate::SP&, Context&)
 {
@@ -110,7 +98,6 @@ UpdateResult DownPersistence::update(const Bucket&, Timestamp,
                         errorResult.getErrorMessage());
 }
 
-
 Result
 DownPersistence::flush(const Bucket&, Context&)
 {
@@ -195,5 +182,3 @@ DownPersistence::move(const Bucket&, PartitionId, Context&)
 }
 
 }
-
-}
diff --git a/searchcore/src/apps/proton/downpersistence.h b/searchcore/src/apps/proton/downpersistence.h
index 4eeb301e617..27083a07d6b 100644
--- a/searchcore/src/apps/proton/downpersistence.h
+++ b/searchcore/src/apps/proton/downpersistence.h
@@ -1,8 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+#pragma once
 
-namespace storage {
+#include <vespa/persistence/spi/persistenceprovider.h>
 
-namespace spi {
+namespace storage::spi {
 
 /*
  * Persistence provider that returns error code for all operations
@@ -23,83 +24,34 @@ public:
 
     typedef std::unique_ptr<PersistenceProvider> UP;
 
-    virtual ~DownPersistence();
-
-    virtual Result initialize() override;
-
-    virtual PartitionStateListResult getPartitionStates() const override;
-
-    virtual BucketIdListResult listBuckets(PartitionId) const override;
-
-    virtual Result setClusterState(const ClusterState&) override;
-
-    virtual Result setActiveState(const Bucket&,
-                                  BucketInfo::ActiveState) override;
-
-    virtual BucketInfoResult getBucketInfo(const Bucket&) const override;
-
-    virtual Result put(const Bucket&, Timestamp, const Document::SP&, Context&) override;
-
-    virtual RemoveResult remove(const Bucket&,
-                                Timestamp timestamp,
-                                const DocumentId& id,
-                                Context&) override;
-
-    virtual RemoveResult removeIfFound(const Bucket&,
-                                       Timestamp timestamp,
-                                       const DocumentId& id,
-                                       Context&) override;
-
-    virtual Result removeEntry(const Bucket&, Timestamp, Context&) override;
-
-    virtual UpdateResult update(const Bucket&,
-                                Timestamp timestamp,
-                                const DocumentUpdate::SP& update,
-                                Context&) override;
-
-    virtual Result flush(const Bucket&, Context&) override;
-
-    virtual GetResult get(const Bucket&,
-                          const document::FieldSet& fieldSet,
-                          const DocumentId& id,
-                          Context&) const override;
-
-    virtual CreateIteratorResult createIterator(
-            const Bucket&,
-            const document::FieldSet& fieldSet,
-            const Selection& selection, //TODO: Make AST
-            IncludedVersions versions,
-            Context&) override;
-
-    virtual IterateResult iterate(IteratorId id,
-                                  uint64_t maxByteSize,
-                                  Context&) const override;
-
-    virtual Result destroyIterator(IteratorId id, Context&) override;
-
-    virtual Result createBucket(const Bucket&, Context&) override;
-
-    virtual Result deleteBucket(const Bucket&, Context&) override;
-
-    virtual BucketIdListResult getModifiedBuckets() const override;
-
-    virtual Result maintain(const Bucket&,
-                            MaintenanceLevel level) override;
-
-    virtual Result split(const Bucket& source,
-                         const Bucket& target1,
-                         const Bucket& target2,
-                         Context&) override;
-
-    virtual Result join(const Bucket& source1,
-                        const Bucket& source2,
-                        const Bucket& target,
-                        Context&) override;
-
-    virtual Result move(const Bucket&, PartitionId target, Context&) override;
-
+    ~DownPersistence() override;
+
+    Result initialize() override;
+    PartitionStateListResult getPartitionStates() const override;
+    BucketIdListResult listBuckets(PartitionId) const override;
+    Result setClusterState(const ClusterState&) override;
+    Result setActiveState(const Bucket&, BucketInfo::ActiveState) override;
+    BucketInfoResult getBucketInfo(const Bucket&) const override;
+    Result put(const Bucket&, Timestamp, const DocumentSP&, Context&) override;
+    RemoveResult remove(const Bucket&, Timestamp timestamp, const DocumentId& id, Context&) override;
+    RemoveResult removeIfFound(const Bucket&, Timestamp timestamp, const DocumentId& id, Context&) override;
+    Result removeEntry(const Bucket&, Timestamp, Context&) override;
+    UpdateResult update(const Bucket&, Timestamp timestamp, const DocumentUpdateSP& update, Context&) override;
+    Result flush(const Bucket&, Context&) override;
+    GetResult get(const Bucket&, const document::FieldSet& fieldSet, const DocumentId& id, Context&) const override;
+
+    CreateIteratorResult createIterator(const Bucket&, const document::FieldSet& fieldSet,
+                                        const Selection& selection, IncludedVersions versions, Context&) override;
+
+    IterateResult iterate(IteratorId id, uint64_t maxByteSize, Context&) const override;
+    Result destroyIterator(IteratorId id, Context&) override;
+    Result createBucket(const Bucket&, Context&) override;
+    Result deleteBucket(const Bucket&, Context&) override;
+    BucketIdListResult getModifiedBuckets() const override;
+    Result maintain(const Bucket&, MaintenanceLevel level) override;
+    Result split(const Bucket& source, const Bucket& target1, const Bucket& target2, Context&) override;
+    Result join(const Bucket& source1, const Bucket& source2, const Bucket& target, Context&) override;
+    Result move(const Bucket&, PartitionId target, Context&) override;
 };
 
 }
-
-}
diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
index 87c85f99752..5731700a55f 100644
--- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
+++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
@@ -1,7 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("verify_ranksetup");
 
 #include <vespa/config-attributes.h>
 #include <vespa/config-imported-fields.h>
@@ -19,6 +16,10 @@ LOG_SETUP("verify_ranksetup");
 #include <vespa/searchlib/features/setup.h>
 #include <vespa/searchlib/fef/fef.h>
 #include <vespa/searchlib/fef/test/plugin/setup.h>
+#include <vespa/fastos/app.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("verify_ranksetup");
 
 using config::ConfigContext;
 using config::ConfigHandle;
diff --git a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
index d9f6857754f..835c06db3cf 100644
--- a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
+++ b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
@@ -1,17 +1,19 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("vespa-gen-testdocs");
-#include <algorithm>
-#include <string>
+
 #include <vespa/searchlib/util/rand48.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/stllike/hash_set.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/fastlib/io/bufferedfile.h>
+#include <vespa/fastos/app.h>
 #include <iostream>
+#include <algorithm>
+#include <string>
 #include <openssl/sha.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("vespa-gen-testdocs");
+
 typedef vespalib::hash_set<vespalib::string> StringSet;
 typedef vespalib::hash_set<uint32_t> UIntSet;
 typedef std::vector<vespalib::string> StringArray;
diff --git a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
index 2dbd1e9c19b..bfbe27cb26c 100644
--- a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
+++ b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
@@ -1,18 +1,18 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("vespa-proton-cmd");
-#include <vespa/fnet/frt/frt.h>
-#include <algorithm>
-#include <string>
+
 #include <vespa/slobrok/sbmirror.h>
 #include <vespa/config-slobroks.h>
-#include <vespa/vespalib/util/host_name.h>
 #include <vespa/config/common/configsystem.h>
+#include <vespa/fnet/frt/frt.h>
+#include <vespa/vespalib/util/host_name.h>
+#include <vespa/fastos/app.h>
+#include <algorithm>
+#include <string>
 
+#include <vespa/log/log.h>
+LOG_SETUP("vespa-proton-cmd");
 
-namespace pandora {
-namespace rtc_cmd {
+namespace pandora::rtc_cmd {
 
 class App : public FastOS_Application
 {
@@ -405,7 +405,6 @@ App::monitorLoop()
 }
 
 } // namespace pandora::rtc_cmd
-} // namespace pandora
 
 
 int main(int argc, char **argv)