diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-01 17:41:12 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:43 +0100 |
commit | 383d8c8c0d5ac613d59bff7edcb32ba3f1fbdf65 (patch) | |
tree | c0fcdeecc0f391f7695d1a0b49c5bbe744d15f18 /storage | |
parent | e2d35ebcf9378671e4dec6f6388587a00761a4ef (diff) |
Include asciistream in implementation only.
Diffstat (limited to 'storage')
6 files changed, 29 insertions, 10 deletions
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt b/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt index 5073d222f94..57933edf88b 100644 --- a/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt +++ b/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt @@ -9,6 +9,7 @@ vespa_add_library(storage_distributoroperationidealstate OBJECT setbucketstateoperation.cpp garbagecollectionoperation.cpp mergelimiter.cpp + mergemetadata.cpp DEPENDS AFTER storage_storageconfig diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.cpp new file mode 100644 index 00000000000..52da0239ddb --- /dev/null +++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.cpp @@ -0,0 +1,16 @@ +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +#include "mergemetadata.h" +#include <vespa/vespalib/stllike/asciistream.h> + +namespace storage { +namespace distributor { + +vespalib::asciistream& operator<<(vespalib::asciistream& out, const MergeMetaData& e) +{ + return out << "MergeMetaData(" << e._nodeIndex << ")"; +} + +} // distributor +} // storage + diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.h b/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.h index 77f3ff6b678..dfefcabce73 100644 --- a/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.h +++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.h @@ -3,7 +3,6 @@ #pragma once #include <vespa/storage/bucketdb/bucketcopy.h> -#include <vespa/vespalib/stllike/asciistream.h> namespace storage { namespace distributor { @@ -27,11 +26,7 @@ struct MergeMetaData { } }; -inline vespalib::asciistream& operator<<(vespalib::asciistream& out, - const MergeMetaData& e) -{ - return out << "MergeMetaData(" << e._nodeIndex << ")"; -} +vespalib::asciistream& operator<<(vespalib::asciistream& out, const MergeMetaData& e); } // distributor } // storage diff --git a/storage/src/vespa/storage/distributor/operationtargetresolver.cpp b/storage/src/vespa/storage/distributor/operationtargetresolver.cpp index 12cf8e0ca85..68f8f6b116c 100644 --- a/storage/src/vespa/storage/distributor/operationtargetresolver.cpp +++ b/storage/src/vespa/storage/distributor/operationtargetresolver.cpp @@ -1,10 +1,10 @@ // 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 <map> #include <queue> #include <vespa/storage/distributor/operationtargetresolver.h> #include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/stllike/hash_set.h> namespace storage { @@ -82,6 +82,12 @@ private: } +void +OperationTargetResolver::print(vespalib::asciistream& out, const PrintProperties&) const { + out << "OperationTarget(" << _bucket << ", " << _node + << (_newCopy ? ", new copy" : ", existing copy") << ")"; +} + document::BucketId OperationTargetResolver::bestBucketToCreate( const document::BucketId& target) const diff --git a/storage/src/vespa/storage/distributor/operationtargetresolver.h b/storage/src/vespa/storage/distributor/operationtargetresolver.h index aaf416954b2..380ce3ae1e6 100644 --- a/storage/src/vespa/storage/distributor/operationtargetresolver.h +++ b/storage/src/vespa/storage/distributor/operationtargetresolver.h @@ -9,7 +9,6 @@ #include <vespa/document/bucket/bucketid.h> #include <vespa/vdslib/state/node.h> #include <vespa/vespalib/util/printable.h> -#include <vespa/vespalib/stllike/asciistream.h> namespace storage { namespace distributor { diff --git a/storage/src/vespa/storage/persistence/bucketprocessor.cpp b/storage/src/vespa/storage/persistence/bucketprocessor.cpp index 4923f1d1977..d185d94f11e 100644 --- a/storage/src/vespa/storage/persistence/bucketprocessor.cpp +++ b/storage/src/vespa/storage/persistence/bucketprocessor.cpp @@ -1,7 +1,9 @@ // 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/storage/persistence/bucketprocessor.h> + +#include "bucketprocessor.h" #include <vespa/document/fieldset/fieldsets.h> +#include <vespa/vespalib/stllike/asciistream.h> + #include <stdexcept> namespace storage { |