Remove support for Map/Set validators (#41842)

Maps and sets are undocumented and deprecated; start getting rid of them.

GitOrigin-RevId: e0131a88d68e0729150b6ce45925bf2f72175650

Author: goffrie

crates/common/src/schemas/json.rs

@@ -641,6 +641,8 @@ pub enum ValidatorJson {
     Boolean,
     String,
     Bytes,
+    #[serde(alias = "map")]
+    #[serde(alias = "set")]
     Any,
     Literal {
         value: JsonValue,
@@ -652,13 +654,6 @@ pub enum ValidatorJson {
     Array {
         value: Box<ValidatorJson>,
     },
-    Set {
-        value: Box<ValidatorJson>,
-    },
-    Map {
-        keys: Box<ValidatorJson>,
-        values: Box<ValidatorJson>,
-    },
     Record {
         keys: Box<ValidatorJson>,
         values: Box<FieldTypeJson>,
@@ -690,11 +685,6 @@ impl TryFrom<ValidatorJson> for Validator {
             ValidatorJson::Literal { value } => Ok(Validator::Literal(value.try_into()?)),
             ValidatorJson::Id { table_name } => Ok(Validator::Id(table_name.parse()?)),
             ValidatorJson::Array { value } => Ok(Validator::Array(Box::new((*value).try_into()?))),
-            ValidatorJson::Set { value } => Ok(Validator::Set(Box::new((*value).try_into()?))),
-            ValidatorJson::Map { keys, values } => Ok(Validator::Map(
-                Box::new((*keys).try_into()?),
-                Box::new((*values).try_into()?),
-            )),
             ValidatorJson::Record { keys, values } => {
                 let error_short_code = "InvalidRecordType";
                 let keys_validator = Validator::try_from(*keys)?;
@@ -758,13 +748,6 @@ impl TryFrom<Validator> for ValidatorJson {
             Validator::Array(t) => ValidatorJson::Array {
                 value: Box::new(ValidatorJson::try_from(*t)?),
             },
-            Validator::Set(t) => ValidatorJson::Set {
-                value: Box::new(ValidatorJson::try_from(*t)?),
-            },
-            Validator::Map(k, v) => ValidatorJson::Map {
-                keys: Box::new(ValidatorJson::try_from(*k)?),
-                values: Box::new(ValidatorJson::try_from(*v)?),
-            },
             Validator::Record(k, v) => ValidatorJson::Record {
                 keys: Box::new(ValidatorJson::try_from(*k)?),
                 values: Box::new(FieldTypeJson::try_from(FieldValidator {
@@ -853,9 +836,15 @@ impl TryFrom<ObjectValidator> for BTreeMap<String, FieldTypeJson> {
 #[cfg(test)]
 mod tests {
     use errors::ErrorMetadataAnyhowExt;
-    use serde_json::Value as JsonValue;
+    use serde_json::{
+        json,
+        Value as JsonValue,
+    };
 
-    use crate::schemas::validator::LiteralValidator;
+    use crate::schemas::{
+        json::ValidatorJson,
+        validator::LiteralValidator,
+    };
 
     #[test]
     fn test_infinite_literal_is_user_error() -> anyhow::Result<()> {
@@ -872,4 +861,21 @@ mod tests {
         assert!(error.is_bad_request());
         Ok(())
     }
+
+    #[test]
+    fn test_map_set_are_any() -> anyhow::Result<()> {
+        assert_eq!(
+            serde_json::from_value::<ValidatorJson>(
+                json!({"type": "map", "keys": {"type": "string"}, "values": {"type": "string"}})
+            )?,
+            ValidatorJson::Any
+        );
+        assert_eq!(
+            serde_json::from_value::<ValidatorJson>(
+                json!({"type": "set", "value": {"type": "string"}})
+            )?,
+            ValidatorJson::Any
+        );
+        Ok(())
+    }
 }

crates/common/src/schemas/mod.rs

@@ -805,15 +805,6 @@ impl DocumentSchema {
         }
     }
 
-    pub fn has_map_or_set(&self) -> bool {
-        match &self {
-            DocumentSchema::Any => false,
-            DocumentSchema::Union(validators) => validators
-                .iter()
-                .any(|root_validator| root_validator.has_map_or_set()),
-        }
-    }
-
     pub fn is_vector_index_eligible(&self, field_path: &FieldPath) -> bool {
         match &self {
             DocumentSchema::Any => true,

crates/common/src/schemas/tests.rs

@@ -1233,54 +1233,6 @@ mod validator_subset {
         )
     }
 
-    #[test]
-    fn test_sets_are_covariant() -> anyhow::Result<()> {
-        assert_is_strict_subset(
-            Validator::Set(Box::new(Validator::String)),
-            Validator::Set(Box::new(Validator::Any)),
-        )
-    }
-
-    #[test]
-    fn test_arrays_and_sets_dont_mix() -> anyhow::Result<()> {
-        assert_is_unrelated(
-            Validator::Array(Box::new(Validator::String)),
-            Validator::Set(Box::new(Validator::String)),
-        )
-    }
-
-    #[test]
-    fn test_maps_are_covariant_over_keys() -> anyhow::Result<()> {
-        assert_is_strict_subset(
-            Validator::Map(Box::new(Validator::String), Box::new(Validator::Any)),
-            Validator::Map(Box::new(Validator::Any), Box::new(Validator::Any)),
-        )
-    }
-
-    #[test]
-    fn test_maps_are_covariant_over_values() -> anyhow::Result<()> {
-        assert_is_strict_subset(
-            Validator::Map(Box::new(Validator::Any), Box::new(Validator::String)),
-            Validator::Map(Box::new(Validator::Any), Box::new(Validator::Any)),
-        )
-    }
-
-    #[test]
-    fn test_maps_not_related_when_key_not_related() -> anyhow::Result<()> {
-        assert_is_unrelated(
-            Validator::Map(Box::new(Validator::String), Box::new(Validator::Any)),
-            Validator::Map(Box::new(Validator::Int64), Box::new(Validator::Any)),
-        )
-    }
-
-    #[test]
-    fn test_maps_not_related_when_value_not_related() -> anyhow::Result<()> {
-        assert_is_unrelated(
-            Validator::Map(Box::new(Validator::Any), Box::new(Validator::String)),
-            Validator::Map(Box::new(Validator::Any), Box::new(Validator::Int64)),
-        )
-    }
-
     #[test]
     fn test_changing_union_order() -> anyhow::Result<()> {
         assert_is_equivalent(