Fix arroyo-types dependency for UDFs

ArroyoSystems · Jan 16, 2024 · c0a8616 · c0a8616
1 parent 1b9cdbf
commit c0a8616
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/arroyo-compiler-service/src/main.rs b/arroyo-compiler-service/src/main.rs
@@ -355,6 +355,13 @@ impl CompilerGrpc for CompileService {
             .await
             .map_err(|e| Status::internal(format!("Writing UDFs failed: {}", e)))?;
 
+        // udfs depend on arroyo-types::UdfContext, so the types crate needs to export it
+        tokio::fs::write(
+            self.build_dir.join("types/src/lib.rs"),
+            "pub use arroyo_types::UdfContext;",
+        )
+        .await?;
+
         let output = Command::new("cargo")
             .current_dir(&udf_build_dir)
             .arg("check")

diff --git a/arroyo-controller/src/compiler.rs b/arroyo-controller/src/compiler.rs
@@ -91,6 +91,7 @@ impl ProgramCompiler {
 
         quote! {
             use std::time::SystemTime;
+            pub use arroyo_types::UdfContext;
 
             #(#structs )*
         }

diff --git a/arroyo-controller/src/lib.rs b/arroyo-controller/src/lib.rs
@@ -686,7 +686,7 @@ impl ControllerServer {
 }
 
 fn cargo_toml(name: &str, dependencies: &str) -> String {
-    let arroyo_types = "arroyo-types = { path = \"../../../arroyo-types\" }";
+    let types_dep = "types = { path = \"../../types\" }";
 
     format!(
         r#"
@@ -698,7 +698,7 @@ edition = "2021"
 {}
 {}
         "#,
-        name, dependencies, arroyo_types
+        name, dependencies, types_dep
     )
 }