From f57a1263d4c3ab2c5811e31ffd282de7cf2bf08e Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 15 Aug 2025 21:33:52 +0200 Subject: [PATCH] cluster/serializer/broker: Do not special case Broker::Data anymore The previous approach ignored the fact that nested / inner values might also be Broker::Data values. I'm not super sure about the validity of the test, because it's essentially demonstrating any-nesting, but it's not leading to extra Broker::Data encoding. --- src/cluster/serializer/broker/Serializer.cc | 13 ++----------- .../..manager..stdout | 7 +++++++ .../..worker-1..stdout | 3 +++ testing/btest/cluster/generic/publish-any.zeek | 17 ++++++++++++----- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/cluster/serializer/broker/Serializer.cc b/src/cluster/serializer/broker/Serializer.cc index e17ea9a38d..5bbb8a2bcd 100644 --- a/src/cluster/serializer/broker/Serializer.cc +++ b/src/cluster/serializer/broker/Serializer.cc @@ -59,19 +59,10 @@ std::optional detail::to_broker_event(const zeek::cluster:: xs.reserve(ev.Args().size()); for ( const auto& a : ev.Args() ) { - if ( a->GetType() == zeek::BifType::Record::Broker::Data ) { - // When encountering a Broker::Data instance within args, pick out - // the broker::data directly to avoid double encoding, Broker::Data. - const auto& val = a->AsRecordVal()->GetField(0); - auto* data_val = static_cast(val.get()); - xs.emplace_back(data_val->data); - } - else if ( auto res = zeek::Broker::detail::val_to_data(a.get()) ) { + if ( auto res = zeek::Broker::detail::val_to_data(a.get(), /*flatten_broker_dataval=*/true) ) xs.emplace_back(std::move(res.value())); - } - else { + else return std::nullopt; - } } // Convert metadata from the cluster::detail::Event event to broker's event metadata format. diff --git a/testing/btest/Baseline/cluster.generic.publish-any/..manager..stdout b/testing/btest/Baseline/cluster.generic.publish-any/..manager..stdout index 1bb58756f0..f8a26eff5b 100644 --- a/testing/btest/Baseline/cluster.generic.publish-any/..manager..stdout +++ b/testing/btest/Baseline/cluster.generic.publish-any/..manager..stdout @@ -35,3 +35,10 @@ got pong, 27, with, 4, time (cluster publish), Broker::Data, [data=broker::data{ got pong, 28, with, 4, time (cluster event ), Broker::Data, [data=broker::data{42000000000ns}] got pong, 29, with, 4, time (cluster publish), Broker::Data, [data=broker::data{42000000000ns}] got pong, 30, with, 4, time (cluster event ), Broker::Data, [data=broker::data{42000000000ns}] +sending pings, 5, R, [c=42, a=[[c=42, a=hello]]] +got pong, 31, with, 5, R (cluster publish), Broker::Data, [data=broker::data{(42, ((42, hello)))}] +got pong, 32, with, 5, R (cluster event ), Broker::Data, [data=broker::data{(42, ((42, hello)))}] +got pong, 33, with, 5, R (cluster publish), Broker::Data, [data=broker::data{(42, ((42, hello)))}] +got pong, 34, with, 5, R (cluster event ), Broker::Data, [data=broker::data{(42, ((42, hello)))}] +got pong, 35, with, 5, R (cluster publish), Broker::Data, [data=broker::data{(42, ((42, hello)))}] +got pong, 36, with, 5, R (cluster event ), Broker::Data, [data=broker::data{(42, ((42, hello)))}] diff --git a/testing/btest/Baseline/cluster.generic.publish-any/..worker-1..stdout b/testing/btest/Baseline/cluster.generic.publish-any/..worker-1..stdout index 805fd81613..eae3c74d8c 100644 --- a/testing/btest/Baseline/cluster.generic.publish-any/..worker-1..stdout +++ b/testing/btest/Baseline/cluster.generic.publish-any/..worker-1..stdout @@ -14,4 +14,7 @@ got ping, 3, vector of count, Broker::Data, [data=broker::data{(1, 2, 3)}] got ping, 4, time, Broker::Data, [data=broker::data{42000000000ns}] got ping, 4, time, Broker::Data, [data=broker::data{42000000000ns}] got ping, 4, time, Broker::Data, [data=broker::data{42000000000ns}] +got ping, 5, R, Broker::Data, [data=broker::data{(42, ((42, hello)))}] +got ping, 5, R, Broker::Data, [data=broker::data{(42, ((42, hello)))}] +got ping, 5, R, Broker::Data, [data=broker::data{(42, ((42, hello)))}] got finish! diff --git a/testing/btest/cluster/generic/publish-any.zeek b/testing/btest/cluster/generic/publish-any.zeek index 3866bd9812..5a09dc7687 100644 --- a/testing/btest/cluster/generic/publish-any.zeek +++ b/testing/btest/cluster/generic/publish-any.zeek @@ -34,9 +34,14 @@ global pong: event(c: count, what: string, val: any) &is_used; global i = 0; global pongs = 0; +type R: record { + c: count; + a: any; +}; + event send_any() { - if ( i > 4 ) + if ( i > 5 ) return; local val: any; @@ -48,8 +53,10 @@ event send_any() val = 42/tcp; else if ( i == 3 ) val = vector(1, 2, 3); - else + else if ( i == 4 ) val = double_to_time(42.0); + else + val = R($c=42, $a=vector(R($c=42, $a="hello"))); print "sending pings", i, type_name(val), val; Cluster::publish_hrw(Cluster::worker_pool, cat(i), ping, i, type_name(val), val); @@ -64,10 +71,10 @@ event pong(c: count, what: string, val: any) ++pongs; print "got pong", pongs, "with", c, what, type_name(val), val; - # The manager sends 5 types of pings, in 3 different ways. The worker - # answers each ping in two ways, for a total of 30 expected pongs at the + # The manager sends 6 types of pings, in 3 different ways. The worker + # answers each ping in two ways, for a total of 36 expected pongs at the # manager. Every batch of pings involves 6 pongs. - if ( pongs == 30 ) + if ( pongs == 36 ) Cluster::publish(Cluster::worker_topic, finish); else if ( pongs > 0 && pongs % 6 == 0 ) {