graph, graphql: Store the shape_hash in our Query structs

Author: lutter

graph/src/data/query/query.rs

@@ -5,6 +5,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::ops::{Deref, DerefMut};
 use std::sync::Arc;
 
+use crate::data::graphql::shape_hash::shape_hash;
 use crate::data::schema::Schema;
 
 fn deserialize_number<'de, D>(deserializer: D) -> Result<q::Number, D::Error>
@@ -109,6 +110,7 @@ pub struct Query {
     pub schema: Arc<Schema>,
     pub document: q::Document,
     pub variables: Option<QueryVariables>,
+    pub shape_hash: u64,
     _force_use_of_new: (),
 }
 
@@ -118,10 +120,12 @@ impl Query {
         document: q::Document,
         variables: Option<QueryVariables>,
     ) -> Self {
+        let shape_hash = shape_hash(&document);
         Query {
             schema,
             document,
             variables,
+            shape_hash,
             _force_use_of_new: (),
         }
     }

graphql/src/execution/query.rs

@@ -35,6 +35,9 @@ pub struct Query {
     pub variables: HashMap<q::Name, q::Value>,
     /// The root selection set of the query
     pub selection_set: q::SelectionSet,
+    /// The ShapeHash of the original query
+    pub shape_hash: u64,
+
     pub(crate) fragments: HashMap<String, q::FragmentDefinition>,
     kind: Kind,
 
@@ -106,6 +109,7 @@ impl Query {
             variables,
             fragments,
             selection_set,
+            shape_hash: query.shape_hash,
             kind,
             query_text,
             variables_text,
@@ -160,6 +164,7 @@ impl Query {
             variables: self.variables.clone(),
             fragments: self.fragments.clone(),
             selection_set: self.selection_set.clone(),
+            shape_hash: self.shape_hash,
             kind: self.kind,
             query_text: self.query_text.clone(),
             variables_text: self.variables_text.clone(),

graphql/src/runner.rs

@@ -146,7 +146,7 @@ where
     }
 
     pub fn check_too_expensive(&self, query: &Query) -> Result<(), Vec<QueryExecutionError>> {
-        if self.expensive.contains_key(&shape_hash(&query.document)) {
+        if self.expensive.contains_key(&query.shape_hash) {
             Err(vec![QueryExecutionError::TooExpensive])
         } else {
             Ok(())