diff --git a/src/cluster/backend/zeromq/ZeroMQ.cc b/src/cluster/backend/zeromq/ZeroMQ.cc index 2b739c905b..ac70d927cd 100644 --- a/src/cluster/backend/zeromq/ZeroMQ.cc +++ b/src/cluster/backend/zeromq/ZeroMQ.cc @@ -366,9 +366,6 @@ void ZeroMQBackend::Run() { using MultipartMessage = std::vector; auto HandleLogMessages = [this](const std::vector& msgs) { - QueueMessages qmsgs; - qmsgs.reserve(msgs.size()); - for ( const auto& msg : msgs ) { // sender, format, type, payload if ( msg.size() != 4 ) { @@ -377,11 +374,11 @@ void ZeroMQBackend::Run() { } detail::byte_buffer payload{msg[3].data(), msg[3].data() + msg[3].size()}; - qmsgs.emplace_back(LogMessage{.format = std::string(msg[2].data(), msg[2].size()), - .payload = std::move(payload)}); - } + LogMessage lm{.format = std::string(msg[2].data(), msg[2].size()), + .payload = std::move(payload)}; - QueueForProcessing(std::move(qmsgs)); + QueueForProcessing(std::move(lm)); + } }; auto HandleInprocMessages = [this](std::vector& msgs) { @@ -434,9 +431,6 @@ void ZeroMQBackend::Run() { }; auto HandleXPubMessages = [this](const std::vector& msgs) { - QueueMessages qmsgs; - qmsgs.reserve(msgs.size()); - for ( const auto& msg : msgs ) { if ( msg.size() != 1 ) { ZEROMQ_THREAD_PRINTF("xpub: error: expected 1 part, have %zu!\n", msg.size()); @@ -462,17 +456,12 @@ void ZeroMQBackend::Run() { continue; } - qmsgs.emplace_back(std::move(qm)); + QueueForProcessing(std::move(qm)); } } - - QueueForProcessing(std::move(qmsgs)); }; auto HandleXSubMessages = [this](const std::vector& msgs) { - QueueMessages qmsgs; - qmsgs.reserve(msgs.size()); - for ( const auto& msg : msgs ) { if ( msg.size() != 4 ) { ZEROMQ_THREAD_PRINTF("xsub: error: expected 4 parts, have %zu!\n", msg.size()); @@ -485,12 +474,12 @@ void ZeroMQBackend::Run() { continue; detail::byte_buffer payload{msg[3].data(), msg[3].data() + msg[3].size()}; - qmsgs.emplace_back(EventMessage{.topic = std::string(msg[0].data(), msg[0].size()), - .format = std::string(msg[2].data(), msg[2].size()), - .payload = std::move(payload)}); - } + EventMessage em{.topic = std::string(msg[0].data(), msg[0].size()), + .format = std::string(msg[2].data(), msg[2].size()), + .payload = std::move(payload)}; - QueueForProcessing(std::move(qmsgs)); + QueueForProcessing(std::move(em)); + } }; // Helper class running at destruction.