Skip to content

Commit d70f88e

Browse files
fix(meos): proto extra_fields + Werror unused-param in aggregations
Two adjacent compile-breakers found while validating the codegen output of PR MobilityDB#21 against the latest mariana/main: 1. SerializableAggregationFunction proto declares only {type, on_field, as_field}. The 5 MEOS aggregations landing in MobilityDB#16/MobilityDB#17 read additional fields out of the proto (vidA/vidB/dMeet/...), so they need the extra field. Adds: repeated SerializableFunction extra_fields = 4; Backwards-compatible (tag 4, new repeated). Aggregations whose extra fields are absent continue to deserialize unchanged. 2. CrossDistance/PairMeeting/TemporalLength aggregations carry an unused PipelineMemoryProvider& parameter on lower(). Werror=-Wunused-parameter turns that into a build failure. Annotates the parameter [[maybe_unused]] at the call site — no behavior change, intent stays visible to readers who later wire memory into the lowering. Verified locally on the mobilitynebula-v2 dev image (MEOS baked in): cmake --build build-w1 --target nes-physical-operators -j 4 → [110/111] Linking libnes-physical-operators-registry.a → [111/111] Linking libnes-physical-operators.a Stacks on MobilityDB#21 only because that is the active codegen branch where the breakage surfaced; the diff itself is independent of any codegen output.
1 parent 4f60e2e commit d70f88e

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

grpc/SerializableVariantDescriptor.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ message SerializableAggregationFunction {
6666
string type = 1;
6767
SerializableFunction on_field = 2;
6868
SerializableFunction as_field = 3;
69+
repeated SerializableFunction extra_fields = 4;
6970
}
7071

7172
message AggregationFunctionList {

nes-physical-operators/src/Aggregation/Function/Meos/CrossDistanceAggregationPhysicalFunction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void CrossDistanceAggregationPhysicalFunction::combine(
116116
}
117117

118118
Nautilus::Record CrossDistanceAggregationPhysicalFunction::lower(
119-
const nautilus::val<AggregationState*> aggregationState, PipelineMemoryProvider& pipelineMemoryProvider)
119+
const nautilus::val<AggregationState*> aggregationState, [[maybe_unused]] PipelineMemoryProvider& pipelineMemoryProvider)
120120
{
121121
MEOS::Meos::ensureMeosInitialized();
122122

nes-physical-operators/src/Aggregation/Function/Meos/PairMeetingAggregationPhysicalFunction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void PairMeetingAggregationPhysicalFunction::combine(
115115
}
116116

117117
Nautilus::Record PairMeetingAggregationPhysicalFunction::lower(
118-
const nautilus::val<AggregationState*> aggregationState, PipelineMemoryProvider& pipelineMemoryProvider)
118+
const nautilus::val<AggregationState*> aggregationState, [[maybe_unused]] PipelineMemoryProvider& pipelineMemoryProvider)
119119
{
120120
MEOS::Meos::ensureMeosInitialized();
121121

nes-physical-operators/src/Aggregation/Function/Meos/TemporalLengthAggregationPhysicalFunction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void TemporalLengthAggregationPhysicalFunction::combine(
109109
}
110110

111111
Nautilus::Record TemporalLengthAggregationPhysicalFunction::lower(
112-
const nautilus::val<AggregationState*> aggregationState, PipelineMemoryProvider& pipelineMemoryProvider)
112+
const nautilus::val<AggregationState*> aggregationState, [[maybe_unused]] PipelineMemoryProvider& pipelineMemoryProvider)
113113
{
114114
MEOS::Meos::ensureMeosInitialized();
115115

0 commit comments

Comments
 (0)