chore(vrl): use new value crate for type checking in VRL (#11222)

Author: JeanMertz

Cargo.lock

@@ -129,7 +129,7 @@ impl Expression for FindEnrichmentTableRecordsFn {
                     .collect::<std::result::Result<Vec<_>, _>>(),
                 value => Err(value::Error::Expected {
                     got: value.kind(),
-                    expected: Kind::Array,
+                    expected: Kind::array(Collection::any()),
                 }),
             })
             .transpose()?;
@@ -164,9 +164,7 @@ impl Expression for FindEnrichmentTableRecordsFn {
     }
 
     fn type_def(&self, _: &state::Compiler) -> TypeDef {
-        TypeDef::new()
-            .fallible()
-            .array_mapped::<(), Kind>(map! { (): Kind::Object })
+        TypeDef::array(Collection::from_unknown(Kind::object(Collection::any()))).fallible()
     }
 }
 

lib/enrichment/src/find_enrichment_table_records.rs

@@ -125,7 +125,7 @@ impl Expression for GetEnrichmentTableRecordFn {
                     .collect::<std::result::Result<Vec<_>, _>>(),
                 value => Err(value::Error::Expected {
                     got: value.kind(),
-                    expected: Kind::Array,
+                    expected: Kind::array(Collection::any()),
                 }),
             })
             .transpose()?;
@@ -156,9 +156,7 @@ impl Expression for GetEnrichmentTableRecordFn {
     }
 
     fn type_def(&self, _: &state::Compiler) -> TypeDef {
-        TypeDef::new()
-            .fallible()
-            .add_object::<(), Kind>(map! { (): Kind::all() })
+        TypeDef::object(Collection::any()).fallible()
     }
 }
 

lib/enrichment/src/get_enrichment_table_record.rs

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-serde = { version = "1.0.136", default-features = false, features = ["derive"] }
+serde = { version = "1.0.136", default-features = false, features = ["derive", "alloc"] }
 tracing = { version = "0.1", default-features = false, features = ["attributes"] }
 snafu = { version = "0.7", default-features = false }
 regex = { version = "1.5.4", default-features = false, features = ["std", "perf"] }

lib/lookup/Cargo.toml

@@ -50,6 +50,15 @@ impl<T: Ord> Collection<T> {
         }
     }
 
+    /// Create a collection kind of which there are no known and no unknown kinds.
+    #[must_use]
+    pub fn empty() -> Self {
+        Self {
+            known: BTreeMap::default(),
+            unknown: None,
+        }
+    }
+
     /// Create a collection kind of which the encapsulated values can be any kind.
     #[must_use]
     pub fn any() -> Self {

lib/value/src/kind/collection.rs

@@ -55,6 +55,6 @@ impl Expression for GetMetadataFieldFn {
     }
 
     fn type_def(&self, _: &state::Compiler) -> TypeDef {
-        TypeDef::new().infallible().bytes().add_null()
+        TypeDef::bytes().add_null().infallible()
     }
 }

lib/vector-vrl-functions/src/get_metadata_field.rs

@@ -53,6 +53,6 @@ impl Expression for RemoveMetadataFieldFn {
     }
 
     fn type_def(&self, _: &state::Compiler) -> TypeDef {
-        TypeDef::new().infallible().null()
+        TypeDef::null().infallible()
     }
 }

lib/vector-vrl-functions/src/remove_metadata_field.rs

@@ -63,6 +63,6 @@ impl Expression for SetMetadataFieldFn {
     }
 
     fn type_def(&self, _: &state::Compiler) -> TypeDef {
-        TypeDef::new().infallible().null()
+        TypeDef::null().infallible()
     }
 }

lib/vector-vrl-functions/src/set_metadata_field.rs

@@ -10,6 +10,7 @@ diagnostic = { package = "vrl-diagnostic", path = "../diagnostic" }
 parser = { package = "vrl-parser", path = "../parser" }
 lookup = { path = "../../lookup" }
 vector_common = { path = "../../vector-common", default-features = false, features = ["conversion"] }
+value = { path = "../../value" }
 
 bitflags = "1"
 bytes = "1.1.0"

lib/vrl/compiler/Cargo.toml

@@ -1,17 +1,17 @@
 use std::fmt;
 
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
-use vrl_compiler::value::Kind;
+use vrl_compiler::value::kind;
 
 struct Parameters {
-    basis: Kind,
+    basis: u16,
 }
 
 static PARAMETERS: [Parameters; 4] = [
-    Parameters { basis: Kind::Bytes },
-    Parameters { basis: Kind::Array },
-    Parameters { basis: Kind::Regex },
-    Parameters { basis: Kind::Null },
+    Parameters { basis: kind::BYTES },
+    Parameters { basis: kind::ARRAY },
+    Parameters { basis: kind::REGEX },
+    Parameters { basis: kind::NULL },
 ];
 
 impl fmt::Display for Parameters {
@@ -23,8 +23,16 @@ impl fmt::Display for Parameters {
 fn benchmark_kind_display(c: &mut Criterion) {
     let mut group = c.benchmark_group("vrl_compiler/value::kind::display");
     for param in &PARAMETERS {
-        group.bench_with_input(BenchmarkId::from_parameter(param), &param, |b, &param| {
-            b.iter(|| format!("{}", param.basis))
+        let parameter = vrl_compiler::Parameter {
+            keyword: "",
+            kind: param.basis,
+            required: false,
+        };
+
+        let kind = parameter.kind();
+
+        group.bench_with_input(BenchmarkId::from_parameter(param), &kind, |b, kind| {
+            b.iter(|| format!("{}", kind))
         });
     }
 }