summaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2017-11-16 12:10:35 +0100
committerGitHub <noreply@github.com>2017-11-16 12:10:35 +0100
commit4aa88ea8cc5ca86d5eba9191a04c1524ce1a926d (patch)
tree07bc9a0f4eabb1cc18a16a772f6c0156381f726c /document
parent6cbb1a411c97475ad7a47457411ce2aa458e301f (diff)
parentf2821062b6d9ff52aa138dc8565f6672671eb8a2 (diff)
Merge pull request #4131 from vespa-engine/vekterli/make-merge-throttler-bucket-space-aware
Make merge throttler bucket space aware
Diffstat (limited to 'document')
-rw-r--r--document/src/vespa/document/bucket/bucket.cpp5
-rw-r--r--document/src/vespa/document/bucket/bucket.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/document/src/vespa/document/bucket/bucket.cpp b/document/src/vespa/document/bucket/bucket.cpp
index d2855c0b3a1..b79d45eee34 100644
--- a/document/src/vespa/document/bucket/bucket.cpp
+++ b/document/src/vespa/document/bucket/bucket.cpp
@@ -23,4 +23,9 @@ vespalib::asciistream& operator<<(vespalib::asciistream& os, const Bucket& id)
return os << "Bucket(" << id.getBucketSpace() << ", " << id.getBucketId() << ")";
}
+std::ostream& operator<<(std::ostream& os, const Bucket& id)
+{
+ return os << id.toString();
+}
+
}
diff --git a/document/src/vespa/document/bucket/bucket.h b/document/src/vespa/document/bucket/bucket.h
index 5aa9b360c42..44068e1c443 100644
--- a/document/src/vespa/document/bucket/bucket.h
+++ b/document/src/vespa/document/bucket/bucket.h
@@ -45,5 +45,6 @@ private:
};
vespalib::asciistream& operator<<(vespalib::asciistream&, const Bucket&);
+std::ostream& operator<<(std::ostream&, const Bucket&);
}