fix(msgpack): correct map annotations and remove redundant defaults

farhan-syah · farhan-syah · commit e35f2cd7d32f · 2026-05-11T15:40:00.000+08:00
Add missing #[msgpack(map)] to InstallSnapshotRequest, StrictSchema,
NativeResponse, and MoveTenantJournalEntry so zerompk 0.5 serialises
them as named-field maps rather than arrays, matching the wire format.

Remove #[msgpack(default)] from Optional fields in the physical plan
types (columnar, timeseries, kv, query, document ops). zerompk 0.5
treats absent map keys as default for Option&lt;T&gt; unconditionally, so
the attribute is now redundant and its presence caused compile warnings.
diff --git a/nodedb-raft/src/message.rs b/nodedb-raft/src/message.rs
@@ -138,6 +138,7 @@ pub struct RequestVoteResponse {
     zerompk::ToMessagePack,
     zerompk::FromMessagePack,
 )]
+#[msgpack(map)]
 pub struct InstallSnapshotRequest {
     /// Leader's term.
     pub term: u64,
diff --git a/nodedb-types/src/columnar/schema.rs b/nodedb-types/src/columnar/schema.rs
@@ -43,6 +43,7 @@ pub trait SchemaOps {
     zerompk::ToMessagePack,
     zerompk::FromMessagePack,
 )]
+#[msgpack(map)]
 pub struct StrictSchema {
     pub columns: Vec<ColumnDef>,
     pub version: u32,
diff --git a/nodedb-types/src/protocol/frames.rs b/nodedb-types/src/protocol/frames.rs
@@ -58,6 +58,7 @@ impl<'a> zerompk::FromMessagePack<'a> for NativeRequest {
 #[derive(
     Debug, Clone, Serialize, Deserialize, zerompk::ToMessagePack, zerompk::FromMessagePack,
 )]
+#[msgpack(map)]
 pub struct NativeResponse {
     /// Echoed from the request for correlation.
     pub seq: u64,
diff --git a/nodedb/src/bridge/physical_plan/columnar.rs b/nodedb/src/bridge/physical_plan/columnar.rs
@@ -69,19 +69,16 @@ pub enum ColumnarOp {
         /// is ≤ this value. `None` = current-state read. Only populated
         /// for collections created `WITH BITEMPORAL`.
         #[serde(default)]
-        #[msgpack(default)]
         system_as_of_ms: Option<i64>,
         /// Bitemporal valid-time predicate: keep rows whose
         /// `[_ts_valid_from, _ts_valid_until)` interval contains this
         /// point. `None` = no valid-time filter.
         #[serde(default)]
-        #[msgpack(default)]
         valid_at_ms: Option<i64>,
         /// Optional surrogate prefilter injected by a cross-engine sub-plan.
         /// When present, the scan skips rows whose surrogate is absent from
         /// this bitmap. `None` = no prefilter; full collection is scanned.
         #[serde(default)]
-        #[msgpack(default)]
         prefilter: Option<SurrogateBitmap>,
     },
 
diff --git a/nodedb/src/bridge/physical_plan/document/op.rs b/nodedb/src/bridge/physical_plan/document/op.rs
@@ -92,7 +92,6 @@ pub enum DocumentOp {
         pk_bytes: Vec<u8>,
         /// When `Some`, return the pre-deletion document projected per spec.
         #[serde(default)]
-        #[msgpack(default)]
         returning: Option<ReturningSpec>,
     },
 
@@ -109,7 +108,6 @@ pub enum DocumentOp {
         updates: Vec<(String, UpdateValue)>,
         /// When `Some`, return the post-update document projected per spec.
         #[serde(default)]
-        #[msgpack(default)]
         returning: Option<ReturningSpec>,
     },
 
@@ -138,7 +136,6 @@ pub enum DocumentOp {
         /// When present, the scan skips rows whose surrogate is absent from
         /// this bitmap. `None` = no prefilter; full collection is scanned.
         #[serde(default)]
-        #[msgpack(default)]
         prefilter: Option<SurrogateBitmap>,
     },
 
@@ -295,7 +292,6 @@ pub enum DocumentOp {
         /// Additional WHERE predicates applying only to the target (msgpack).
         target_filters: Vec<u8>,
         #[serde(default)]
-        #[msgpack(default)]
         returning: Option<ReturningSpec>,
     },
 
@@ -306,7 +302,6 @@ pub enum DocumentOp {
         updates: Vec<(String, UpdateValue)>,
         /// When `Some`, return updated documents projected per spec.
         #[serde(default)]
-        #[msgpack(default)]
         returning: Option<ReturningSpec>,
         /// Optimistic pre-execution predicted matching surrogates (OLLP path).
         ///
@@ -315,7 +310,6 @@ pub enum DocumentOp {
         /// mismatch the executor returns `ErrorCode::OllpRetryRequired` without
         /// writing. `None` on the non-OLLP (static-set) path — no verification.
         #[serde(default)]
-        #[msgpack(default)]
         ollp_predicted_surrogates: Option<Vec<u32>>,
     },
 
@@ -325,7 +319,6 @@ pub enum DocumentOp {
         filters: Vec<u8>,
         /// When `Some`, return pre-deletion documents projected per spec.
         #[serde(default)]
-        #[msgpack(default)]
         returning: Option<ReturningSpec>,
         /// Optimistic pre-execution predicted matching surrogates (OLLP path).
         ///
@@ -334,7 +327,6 @@ pub enum DocumentOp {
         /// mismatch the executor returns `ErrorCode::OllpRetryRequired` without
         /// writing. `None` on the non-OLLP (static-set) path — no verification.
         #[serde(default)]
-        #[msgpack(default)]
         ollp_predicted_surrogates: Option<Vec<u32>>,
     },
 
@@ -358,7 +350,6 @@ pub enum DocumentOp {
         source_join_col: String,
         clauses: Vec<MergeClauseOp>,
         #[serde(default)]
-        #[msgpack(default)]
         returning: Option<ReturningSpec>,
     },
 
diff --git a/nodedb/src/bridge/physical_plan/kv.rs b/nodedb/src/bridge/physical_plan/kv.rs
@@ -32,7 +32,6 @@ pub enum KvOp {
         /// source allocated AFTER the clone's AS-OF must not leak
         /// through.  `None` for normal (non-clone-delegated) gets.
         #[serde(default)]
-        #[msgpack(default)]
         surrogate_ceiling: Option<u32>,
     },
 
@@ -114,7 +113,6 @@ pub enum KvOp {
         /// Sort keys: `(field, descending)` pairs applied to the scan result
         /// before encoding. Empty = unsorted (engine native order).
         #[serde(default)]
-        #[msgpack(default)]
         sort_keys: Vec<(String, bool)>,
         /// Clone snapshot-isolation ceiling: when set, scan results
         /// drop entries whose surrogate exceeds this value.  Populated
@@ -123,7 +121,6 @@ pub enum KvOp {
         /// allocated AFTER the clone's AS-OF must not leak through.
         /// `None` for normal (non-clone-delegated) scans.
         #[serde(default)]
-        #[msgpack(default)]
         surrogate_ceiling: Option<u32>,
     },
 
diff --git a/nodedb/src/bridge/physical_plan/query.rs b/nodedb/src/bridge/physical_plan/query.rs
@@ -70,7 +70,6 @@ pub enum QueryOp {
         /// for plain GROUP BY). The executor applies the sort after all
         /// groups are finalized and HAVING is filtered.
         #[serde(default)]
-        #[msgpack(default)]
         sort_keys: Vec<(String, bool)>,
     },
 
diff --git a/nodedb/src/bridge/physical_plan/timeseries.rs b/nodedb/src/bridge/physical_plan/timeseries.rs
@@ -48,13 +48,11 @@ pub enum TimeseriesOp {
         /// written after the given epoch-ms. Only populated for
         /// timeseries collections created `WITH BITEMPORAL`.
         #[serde(default)]
-        #[msgpack(default)]
         system_as_of_ms: Option<i64>,
         /// Bitemporal valid-time point. When `Some`, only rows whose
         /// `[_ts_valid_from, _ts_valid_until)` interval contains this
         /// point are returned.
         #[serde(default)]
-        #[msgpack(default)]
         valid_at_ms: Option<i64>,
     },
 
@@ -78,7 +76,6 @@ pub enum TimeseriesOp {
         /// CP-driven re-derivation pattern is owned by the timeseries
         /// engine integration.
         #[serde(default)]
-        #[msgpack(default)]
         surrogates: Vec<Surrogate>,
     },
 }
diff --git a/nodedb/src/control/server/pgwire/ddl/tenant/move_tenant/journal.rs b/nodedb/src/control/server/pgwire/ddl/tenant/move_tenant/journal.rs
@@ -40,6 +40,7 @@ pub enum MovePhase {
 
 /// Persisted state for a single in-progress `MOVE TENANT` operation.
 #[derive(zerompk::ToMessagePack, zerompk::FromMessagePack, Debug, Clone)]
+#[msgpack(map)]
 pub struct MoveTenantJournalEntry {
     pub tenant_id: u64,
     pub tenant_name: String,
