marker info flag

Author: robertbastian

provider/blob/src/blob_schema.rs

@@ -171,9 +171,16 @@ impl<'data, LocaleVecFormat: VarZeroVecFormat> BlobSchemaV3<'data, LocaleVecForm
             .ok_or_else(|| DataError::custom("Invalid blob bytes").with_req(marker, req))?;
         Ok((
             buffer,
-            ZeroTrieSimpleAscii::from_store(zerotrie)
-                .get(CHECKSUM_KEY)
-                .and_then(|cs| Some(u64::from_le_bytes(self.buffers.get(cs)?.try_into().ok()?))),
+            marker
+                .has_checksum
+                .then(|| {
+                    ZeroTrieSimpleAscii::from_store(zerotrie)
+                        .get(CHECKSUM_KEY)
+                        .and_then(|cs| {
+                            Some(u64::from_le_bytes(self.buffers.get(cs)?.try_into().ok()?))
+                        })
+                })
+                .flatten(),
         ))
     }
 

provider/core/src/marker.rs

@@ -468,13 +468,16 @@ impl DataMarkerId {
 #[derive(Copy, Clone, PartialEq, Eq)]
 #[non_exhaustive]
 pub struct DataMarkerInfo {
-    /// TODO
+    /// The ID of this marker.
     pub id: DataMarkerId,
-    /// TODO
+    /// Whether this data marker only has a single payload, not keyed by a data identifier.
     pub is_singleton: bool,
-    /// TODO
+    /// Whether this data marker uses checksums for integrity purposes.
+    pub has_checksum: bool,
+    /// The fallback to use for this data marker.
     pub fallback_config: LocaleFallbackConfig,
-    /// TODO
+    /// The attributes domain for this data marker. This can be used for filtering marker
+    /// attributes during provider export.
     #[cfg(feature = "export")]
     pub attributes_domain: &'static str,
 }
@@ -504,6 +507,7 @@ impl DataMarkerInfo {
             id,
             fallback_config: LocaleFallbackConfig::default(),
             is_singleton: false,
+            has_checksum: false,
             #[cfg(feature = "export")]
             attributes_domain: "",
         }

provider/export/src/export_impl.rs

@@ -140,7 +140,11 @@ impl ExportDriver {
 
                 let transform_duration = instant1.elapsed();
 
-                flush_metadata.checksum = response.metadata.checksum;
+                if marker.has_checksum {
+                    flush_metadata.checksum = response.metadata.checksum;
+                } else if response.metadata.checksum.is_some() {
+                    log::warn!("{marker:?} returns a checksum, but it's not configured to");
+                }
 
                 sink.flush_singleton(marker, &response.payload, flush_metadata)
                     .map_err(|e| e.with_req(marker, Default::default()))?;
@@ -179,23 +183,27 @@ impl ExportDriver {
                 })
                 .collect::<Result<HashMap<_, _>, _>>()?;
 
-            flush_metadata.checksum =
-                responses
-                    .iter()
-                    .try_fold(None, |acc, (id, (response, _))| {
-                        match (acc, response.metadata.checksum) {
-                            (Some(a), Some(b)) if a != b => {
-                                Err(DataError::custom("Mismatched checksums").with_req(
-                                    marker,
-                                    DataRequest {
-                                        id: id.as_borrowed(),
-                                        ..Default::default()
-                                    },
-                                ))
+            if marker.has_checksum {
+                flush_metadata.checksum =
+                    responses
+                        .iter()
+                        .try_fold(None, |acc, (id, (response, _))| {
+                            match (acc, response.metadata.checksum) {
+                                (Some(a), Some(b)) if a != b => {
+                                    Err(DataError::custom("Mismatched checksums").with_req(
+                                        marker,
+                                        DataRequest {
+                                            id: id.as_borrowed(),
+                                            ..Default::default()
+                                        },
+                                    ))
+                                }
+                                (a, b) => Ok(a.or(b)),
                             }
-                            (a, b) => Ok(a.or(b)),
-                        }
-                    })?;
+                        })?;
+            } else if responses.iter().any(|r| r.1 .0.metadata.checksum.is_some()) {
+                log::warn!("{marker:?} returns a checksum, but it's not configured to");
+            }
 
             let (slowest_duration, slowest_id) = match deduplication_strategy {
                 DeduplicationStrategy::Maximal | DeduplicationStrategy::RetainBaseLanguages => {