diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-09 13:34:18 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-09 14:38:18 +0000 |
commit | 840aacbbae61a4d0162d2decb534a6fe5fae030a (patch) | |
tree | 5077bdbf21edac80543673cca052b46ec108db18 /storageapi | |
parent | 247c57f87631a684fa72f410a8c896900c01e303 (diff) |
Remove visitor ordering and order selection.
Diffstat (limited to 'storageapi')
4 files changed, 5 insertions, 14 deletions
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp index 47b77af74a5..aeb6d382997 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp @@ -604,7 +604,7 @@ ProtocolSerialization5_0::onEncode(GBBuf& buf, const api::CreateVisitorCommand& { ProtocolSerialization4_2::onEncode(buf, cmd); - buf.putInt(cmd.getVisitorOrdering()); + buf.putInt(0); // Unused buf.putInt(cmd.getMaxBucketsPerVisitor()); } @@ -612,9 +612,7 @@ api::StorageCommand::UP ProtocolSerialization5_0::onDecodeCreateVisitorCommand(BBuf& buf) const { api::StorageCommand::UP cvc = ProtocolSerialization4_2::onDecodeCreateVisitorCommand(buf); - - static_cast<api::CreateVisitorCommand*>(cvc.get())->setVisitorOrdering( - (document::OrderingSpecification::Order)SH::getInt(buf)); + SH::getInt(buf); // Unused static_cast<api::CreateVisitorCommand*>(cvc.get())->setMaxBucketsPerVisitor(SH::getInt(buf)); @@ -622,4 +620,4 @@ ProtocolSerialization5_0::onDecodeCreateVisitorCommand(BBuf& buf) const return cvc; } -}
\ No newline at end of file +} diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp index b5c066eef7d..32680b24683 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp @@ -141,7 +141,7 @@ ProtocolSerialization5_1::onEncode( onEncodeCommand(buf, msg); - buf.putInt(msg.getVisitorOrdering()); + buf.putInt(0); // Unused buf.putInt(msg.getMaxBucketsPerVisitor()); } @@ -185,8 +185,7 @@ ProtocolSerialization5_1::onDecodeCreateVisitorCommand(BBuf& buf) const msg->getParameters().deserialize(getTypeRepo(), buf); onDecodeCommand(buf, *msg); - msg->setVisitorOrdering( - (document::OrderingSpecification::Order)SH::getInt(buf)); + SH::getInt(buf); // Unused msg->setMaxBucketsPerVisitor(SH::getInt(buf)); msg->setVisitorDispatcherVersion(50); return api::StorageCommand::UP(msg.release()); diff --git a/storageapi/src/vespa/storageapi/message/visitor.cpp b/storageapi/src/vespa/storageapi/message/visitor.cpp index 8adec61a34e..dbda2d0d0c2 100644 --- a/storageapi/src/vespa/storageapi/message/visitor.cpp +++ b/storageapi/src/vespa/storageapi/message/visitor.cpp @@ -37,7 +37,6 @@ CreateVisitorCommand::CreateVisitorCommand(document::BucketSpace bucketSpace, _queueTimeout(2000), _maxPendingReplyCount(2), _version(50), - _ordering(document::OrderingSpecification::ASCENDING), _maxBucketsPerVisitor(1) { } @@ -62,7 +61,6 @@ CreateVisitorCommand::CreateVisitorCommand(const CreateVisitorCommand& o) _queueTimeout(o._queueTimeout), _maxPendingReplyCount(o._maxPendingReplyCount), _version(o._version), - _ordering(o._ordering), _maxBucketsPerVisitor(o._maxBucketsPerVisitor) { } @@ -111,7 +109,6 @@ CreateVisitorCommand::print(std::ostream& out, bool verbose, } out << "\n" << indent << " "; _params.print(out, verbose, indent + " "); - out << "\n" << indent << " " << "ordering(" << _ordering << ")"; out << "\n" << indent << " Max buckets: '" << _maxBucketsPerVisitor << "'"; out << "\n" << indent << "} : "; diff --git a/storageapi/src/vespa/storageapi/message/visitor.h b/storageapi/src/vespa/storageapi/message/visitor.h index 0019488b583..4475e1c5614 100644 --- a/storageapi/src/vespa/storageapi/message/visitor.h +++ b/storageapi/src/vespa/storageapi/message/visitor.h @@ -49,7 +49,6 @@ private: uint32_t _maxPendingReplyCount; uint32_t _version; - document::OrderingSpecification::Order _ordering; uint32_t _maxBucketsPerVisitor; public: @@ -110,8 +109,6 @@ public: void setVisitorDispatcherVersion(uint32_t version) { _version = version; } uint32_t getVisitorDispatcherVersion() const { return _version; } - void setVisitorOrdering(document::OrderingSpecification::Order ordering) { _ordering = ordering; } - document::OrderingSpecification::Order getVisitorOrdering() const { return _ordering; } void setMaxBucketsPerVisitor(uint32_t max) { _maxBucketsPerVisitor = max; } uint32_t getMaxBucketsPerVisitor() const { return _maxBucketsPerVisitor; } |