use derive_from_json_struct

src/meta/model_v2/src/compaction_config.rs

@@ -32,5 +32,4 @@ pub enum Relation {}
 
 impl ActiveModelBehavior for ActiveModel {}
 
-#[derive(Clone, Debug, PartialEq, Eq, FromJsonQueryResult, Serialize, Deserialize, Default)]
-pub struct CompactionConfig(pub PbCompactionConfig);
+crate::derive_from_json_struct!(CompactionConfig, PbCompactionConfig);

src/meta/model_v2/src/compaction_status.rs

@@ -32,5 +32,4 @@ pub enum Relation {}
 
 impl ActiveModelBehavior for ActiveModel {}
 
-#[derive(Clone, Debug, PartialEq, Eq, FromJsonQueryResult, Serialize, Deserialize, Default)]
-pub struct LevelHandlers(pub Vec<PbLevelHandler>);
+crate::derive_from_json_struct!(LevelHandlers, Vec<PbLevelHandler>);

src/meta/model_v2/src/compaction_task.rs

@@ -33,8 +33,7 @@ pub enum Relation {}
 
 impl ActiveModelBehavior for ActiveModel {}
 
-#[derive(Clone, Debug, PartialEq, Eq, FromJsonQueryResult, Serialize, Deserialize, Default)]
-pub struct CompactionTask(pub PbCompactTask);
+crate::derive_from_json_struct!(CompactionTask, PbCompactTask);
 
 impl From<Model> for CompactTaskAssignment {
     fn from(value: Model) -> Self {

src/meta/model_v2/src/hummock_version_delta.rs

@@ -39,11 +39,9 @@ pub enum Relation {}
 
 impl ActiveModelBehavior for ActiveModel {}
 
-#[derive(Clone, Debug, PartialEq, Eq, FromJsonQueryResult, Serialize, Deserialize, Default)]
-pub struct SstableObjectIds(pub Vec<HummockSstableObjectId>);
+crate::derive_from_json_struct!(SstableObjectIds, Vec<HummockSstableObjectId>);
 
-#[derive(Clone, Debug, PartialEq, Eq, FromJsonQueryResult, Serialize, Deserialize, Default)]
-pub struct GroupDeltas(pub HashMap<CompactionGroupId, Vec<PbGroupDelta>>);
+crate::derive_from_json_struct!(GroupDeltas, HashMap<CompactionGroupId, Vec<PbGroupDelta>>);
 
 impl From<Model> for HummockVersionDelta {
     fn from(value: Model) -> Self {

src/meta/model_v2/src/lib.rs

@@ -126,6 +126,8 @@ macro_rules! derive_from_json_struct {
     };
 }
 
+pub(crate) use derive_from_json_struct;
+
 derive_from_json_struct!(I32Array, Vec<i32>);
 derive_from_json_struct!(U32Array, Vec<u32>);
 

src/meta/src/backup_restore/meta_snapshot_builder_v2.rs

@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![allow(dead_code)]
-#![allow(unused_variables)]
+#![expect(dead_code, reason = "WIP")]
 
 use std::future::Future;