chore: replace IoId with CallId (#2150)

Co-authored-by: Tushar Mathur <[email protected]>
tailcallhq · Jun 9, 2024 · 598b3f9 · 598b3f9
1 parent 47dfcad
commit 598b3f9
Show file tree

Hide file tree

Showing 16 changed files with 145 additions and 66 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -159,6 +159,7 @@ tokio-test = "0.4.4"
 base64 = "0.22.1"
 tailcall-hasher = { path = "tailcall-hasher" }
 serde_json_borrow = "0.5.0"
+num = "0.4.3"
 
 [dev-dependencies]
 tailcall-prettier = { path = "tailcall-prettier" }

diff --git a/src/core/counter.rs b/src/core/counter.rs
@@ -1,15 +1,38 @@
 use std::cell::Cell;
+use std::sync::Mutex;
+
+pub trait Count {
+    type Item;
+    fn next(&self) -> Self::Item;
+}
 
-#[allow(unused)]
 #[derive(Default)]
-pub struct Counter(Cell<usize>);
-impl Counter {
-    pub fn new(start: usize) -> Self {
+pub struct Counter<A>(Cell<A>);
+impl<A> Counter<A> {
+    pub fn new(start: A) -> Self {
         Self(Cell::new(start))
     }
-    pub fn next(&self) -> usize {
+}
+
+impl<A: Copy + num::Num> Count for Counter<A> {
+    type Item = A;
+
+    fn next(&self) -> A {
         let curr = self.0.get();
-        self.0.set(curr + 1);
+        self.0.set(curr + A::one());
         curr
     }
 }
+
+#[derive(Default)]
+pub struct AtomicCounter<A>(Mutex<A>);
+
+impl<A: Copy + num::Num> Count for AtomicCounter<A> {
+    type Item = A;
+
+    fn next(&self) -> A {
+        let mut x = self.0.lock().unwrap();
+        *x = *x + A::one();
+        *x
+    }
+}
diff --git a/src/core/generator/json/mod.rs b/src/core/generator/json/mod.rs
@@ -10,10 +10,10 @@ pub use query_generator::QueryGenerator;
 pub use schema_generator::SchemaGenerator;
 pub use types_generator::TypesGenerator;
 
-use crate::core::counter::Counter;
+use crate::core::counter::{Count, Counter};
 
 pub struct NameGenerator {
-    counter: Counter,
+    counter: Counter<usize>,
     prefix: String,
 }
 

diff --git a/src/core/ir/jit/builder.rs b/src/core/ir/jit/builder.rs
@@ -6,14 +6,14 @@ use async_graphql_parser::types::{OperationType, SelectionSet};
 use super::field_index::{FieldIndex, QueryField};
 use super::model::*;
 use crate::core::blueprint::Blueprint;
-use crate::core::counter::Counter;
+use crate::core::counter::{Count, Counter};
 use crate::core::merge_right::MergeRight;
 
 #[allow(unused)]
 pub struct ExecutionPlanBuilder {
     pub index: FieldIndex,
-    pub arg_id: Counter,
-    pub field_id: Counter,
+    pub arg_id: Counter<usize>,
+    pub field_id: Counter<usize>,
     pub document: ExecutableDocument,
 }
 

diff --git a/src/core/ir/jit/context.rs b/src/core/ir/jit/context.rs
@@ -5,12 +5,12 @@ use serde_json_borrow::OwnedValue;
 
 use super::model::{ExecutionPlan, Field, FieldId, Parent};
 use super::store::Store;
-use crate::core::ir::{EvaluationError, IoId, IR};
+use crate::core::ir::{CallId, EvaluationError, IR};
 
 #[allow(unused)]
 pub struct ExecutionContext {
     plan: ExecutionPlan,
-    store: Mutex<Store<IoId, OwnedValue>>,
+    store: Mutex<Store<CallId, OwnedValue>>,
 }
 
 #[allow(unused)]
@@ -67,7 +67,7 @@ impl ExecutionContext {
             .collect::<Vec<_>>()
     }
 
-    pub async fn execute(self) -> Result<Store<IoId, OwnedValue>, EvaluationError> {
+    pub async fn execute(self) -> Result<Store<CallId, OwnedValue>, EvaluationError> {
         future::join_all(
             self.root()
                 .iter()

diff --git a/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__default_value.snap b/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__default_value.snap
@@ -3,7 +3,7 @@ source: src/core/ir/jit/builder.rs
 expression: plan
 ---
 ExecutionPlan {
-    fields: [
+    parent: [
         Field {
             id: 0,
             name: "createPost",
@@ -48,7 +48,7 @@ ExecutionPlan {
             ),
         },
     ],
-    field_children: [
+    children: [
         Field {
             id: 0,
             name: "createPost",

diff --git a/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__fragments.snap b/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__fragments.snap
@@ -3,7 +3,7 @@ source: src/core/ir/jit/builder.rs
 expression: plan
 ---
 ExecutionPlan {
-    fields: [
+    parent: [
         Field {
             id: 0,
             name: "name",
@@ -39,7 +39,7 @@ ExecutionPlan {
             ],
         },
     ],
-    field_children: [
+    children: [
         Field {
             id: 0,
             name: "name",

diff --git a/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__from_document.snap b/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__from_document.snap
@@ -3,7 +3,7 @@ source: src/core/ir/jit/builder.rs
 expression: plan
 ---
 ExecutionPlan {
-    fields: [
+    parent: [
         Field {
             id: 0,
             name: "posts",
@@ -36,7 +36,7 @@ ExecutionPlan {
             ),
         },
     ],
-    field_children: [
+    children: [
         Field {
             id: 0,
             name: "posts",

diff --git a/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__multiple_operations.snap b/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__multiple_operations.snap
@@ -3,7 +3,7 @@ source: src/core/ir/jit/builder.rs
 expression: plan
 ---
 ExecutionPlan {
-    fields: [
+    parent: [
         Field {
             id: 0,
             name: "user",
@@ -62,7 +62,7 @@ ExecutionPlan {
             ),
         },
     ],
-    field_children: [
+    children: [
         Field {
             id: 0,
             name: "user",

diff --git a/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__simple_mutation.snap b/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__simple_mutation.snap
@@ -3,7 +3,7 @@ source: src/core/ir/jit/builder.rs
 expression: plan
 ---
 ExecutionPlan {
-    fields: [
+    parent: [
         Field {
             id: 0,
             name: "createUser",
@@ -103,7 +103,7 @@ ExecutionPlan {
             ),
         },
     ],
-    field_children: [
+    children: [
         Field {
             id: 0,
             name: "createUser",

diff --git a/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__simple_query.snap b/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__simple_query.snap
@@ -3,7 +3,7 @@ source: src/core/ir/jit/builder.rs
 expression: plan
 ---
 ExecutionPlan {
-    fields: [
+    parent: [
         Field {
             id: 0,
             name: "posts",
@@ -28,7 +28,7 @@ ExecutionPlan {
             ),
         },
     ],
-    field_children: [
+    children: [
         Field {
             id: 0,
             name: "posts",

diff --git a/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__unions.snap b/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__unions.snap
@@ -3,7 +3,7 @@ source: src/core/ir/jit/builder.rs
 expression: plan
 ---
 ExecutionPlan {
-    fields: [
+    parent: [
         Field {
             id: 0,
             name: "getUserIdOrEmail",
@@ -24,7 +24,7 @@ ExecutionPlan {
             ],
         },
     ],
-    field_children: [
+    children: [
         Field {
             id: 0,
             name: "getUserIdOrEmail",

diff --git a/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__variables.snap b/src/core/ir/jit/snapshots/tailcall__core__ir__jit__builder__tests__variables.snap
@@ -3,7 +3,7 @@ source: src/core/ir/jit/builder.rs
 expression: plan
 ---
 ExecutionPlan {
-    fields: [
+    parent: [
         Field {
             id: 0,
             name: "user",
@@ -42,7 +42,7 @@ ExecutionPlan {
             ),
         },
     ],
-    field_children: [
+    children: [
         Field {
             id: 0,
             name: "user",