diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-24 00:12:41 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-24 19:16:27 +0000 |
commit | 347dee4b2c6b14485af2ce8e2e6d5385fc14d605 (patch) | |
tree | 5742153bf097a9f1dc2b7be52a8594f3cc62382f /persistence | |
parent | 49781d0ce6c8598b37970299adf93b919b65733e (diff) |
Now make all works
Diffstat (limited to 'persistence')
9 files changed, 34 insertions, 2 deletions
diff --git a/persistence/src/tests/proxy/mockprovider.h b/persistence/src/tests/proxy/mockprovider.h index c2fd844a010..42d21d393b8 100644 --- a/persistence/src/tests/proxy/mockprovider.h +++ b/persistence/src/tests/proxy/mockprovider.h @@ -2,6 +2,7 @@ #pragma once #include <vespa/persistence/spi/persistenceprovider.h> +#include <vespa/document/fieldvalue/document.h> namespace storage { namespace spi { @@ -56,7 +57,7 @@ struct MockProvider : PersistenceProvider { BucketInfo::ACTIVE)); } - virtual Result put(const Bucket &, Timestamp, const Document::SP&, Context&) { + virtual Result put(const Bucket &, Timestamp, const DocumentSP&, Context&) { last_called = PUT; return Result(); } @@ -80,7 +81,7 @@ struct MockProvider : PersistenceProvider { } virtual UpdateResult update(const Bucket &, Timestamp timestamp, - const DocumentUpdate::SP&, Context&) { + const DocumentUpdateSP&, Context&) { last_called = UPDATE; return UpdateResult(Timestamp(timestamp - 10)); } diff --git a/persistence/src/tests/proxy/providerproxy_test.cpp b/persistence/src/tests/proxy/providerproxy_test.cpp index 34537b170e6..ab21750c28f 100644 --- a/persistence/src/tests/proxy/providerproxy_test.cpp +++ b/persistence/src/tests/proxy/providerproxy_test.cpp @@ -10,6 +10,8 @@ LOG_SETUP("providerproxy_test"); #include <vespa/document/bucket/bucketid.h> #include <vespa/document/datatype/datatype.h> #include <vespa/document/repo/documenttyperepo.h> +#include <vespa/document/fieldvalue/document.h> +#include <vespa/document/update/documentupdate.h> #include <vespa/persistence/proxy/providerproxy.h> #include <vespa/persistence/proxy/providerstub.h> #include <vespa/persistence/spi/abstractpersistenceprovider.h> @@ -19,6 +21,8 @@ LOG_SETUP("providerproxy_test"); #include <vespa/vespalib/util/sync.h> #include <vespa/vespalib/util/threadstackexecutor.h> #include <vespa/document/fieldset/fieldsets.h> +#include <vespa/vdslib/state/clusterstate.h> +#include <vespa/vdslib/distribution/distribution.h> using document::BucketId; using document::DataType; diff --git a/persistence/src/tests/proxy/providerstub_test.cpp b/persistence/src/tests/proxy/providerstub_test.cpp index 07eed26db19..3d66cc6d77c 100644 --- a/persistence/src/tests/proxy/providerstub_test.cpp +++ b/persistence/src/tests/proxy/providerstub_test.cpp @@ -9,11 +9,15 @@ LOG_SETUP("providerstub_test"); #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/serialization/vespadocumentserializer.h> #include <vespa/document/util/bytebuffer.h> +#include <vespa/document/fieldvalue/document.h> +#include <vespa/document/update/documentupdate.h> #include <vespa/persistence/proxy/buildid.h> #include <vespa/persistence/proxy/providerstub.h> #include <vespa/persistence/spi/abstractpersistenceprovider.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vdslib/distribution/distribution.h> +#include <vespa/vdslib/state/clusterstate.h> using document::BucketId; using document::ByteBuffer; diff --git a/persistence/src/tests/spi/clusterstatetest.cpp b/persistence/src/tests/spi/clusterstatetest.cpp index d89c99b912d..87e2a8de163 100644 --- a/persistence/src/tests/spi/clusterstatetest.cpp +++ b/persistence/src/tests/spi/clusterstatetest.cpp @@ -5,6 +5,8 @@ #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/persistence/conformancetest/conformancetest.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> +#include <vespa/vdslib/distribution/distribution.h> +#include <vespa/vdslib/state/clusterstate.h> LOG_SETUP(".test.dummyimpl"); diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp index 4de66da599f..0fadb300173 100644 --- a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp +++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp @@ -6,6 +6,13 @@ #include <vespa/persistence/conformancetest/conformancetest.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/document/fieldset/fieldsets.h> +#include <vespa/document/update/documentupdate.h> +#include <vespa/document/update/assignvalueupdate.h> +#include <vespa/vdslib/state/state.h> +#include <vespa/vdslib/state/node.h> +#include <vespa/vdslib/state/nodestate.h> +#include <vespa/vdslib/state/clusterstate.h> +#include <vespa/vdslib/distribution/distribution.h> LOG_SETUP(".test.conformance"); diff --git a/persistence/src/vespa/persistence/spi/docentry.cpp b/persistence/src/vespa/persistence/spi/docentry.cpp index 542c773f6aa..a4b297ffb69 100644 --- a/persistence/src/vespa/persistence/spi/docentry.cpp +++ b/persistence/src/vespa/persistence/spi/docentry.cpp @@ -120,6 +120,11 @@ DocEntry::prettyPrint(std::ostream& out) const out << flags << ")"; } +std::ostream & +operator << (std::ostream & os, const DocEntry & r) { + return os << r.toString(); +} + bool DocEntry::operator==(const DocEntry& entry) const { if (_timestamp != entry._timestamp) { diff --git a/persistence/src/vespa/persistence/spi/docentry.h b/persistence/src/vespa/persistence/spi/docentry.h index 1648a56a522..69c65465d8e 100644 --- a/persistence/src/vespa/persistence/spi/docentry.h +++ b/persistence/src/vespa/persistence/spi/docentry.h @@ -93,6 +93,8 @@ public: bool operator==(const DocEntry& entry) const; }; +std::ostream & operator << (std::ostream & os, const DocEntry & r); + } // spi } // storage diff --git a/persistence/src/vespa/persistence/spi/result.cpp b/persistence/src/vespa/persistence/spi/result.cpp index 2991b51d6ad..4734a669c6e 100644 --- a/persistence/src/vespa/persistence/spi/result.cpp +++ b/persistence/src/vespa/persistence/spi/result.cpp @@ -14,6 +14,11 @@ Result::toString() const { return os.str(); } +std::ostream & +operator << (std::ostream & os, const Result & r) { + return os << r.toString(); +} + GetResult::GetResult(Document::UP doc, Timestamp timestamp) : Result(), _timestamp(timestamp), diff --git a/persistence/src/vespa/persistence/spi/result.h b/persistence/src/vespa/persistence/spi/result.h index 14956feddf5..3cda34f33e0 100644 --- a/persistence/src/vespa/persistence/spi/result.h +++ b/persistence/src/vespa/persistence/spi/result.h @@ -62,6 +62,8 @@ private: vespalib::string _errorMessage; }; +std::ostream & operator << (std::ostream & os, const Result & r); + class BucketInfoResult : public Result { public: /** |