graphql: Remove spawn_blocking from execute_root_selection_set

Author: lutter

graphql/src/execution/execution.rs

@@ -374,50 +374,23 @@ pub(crate) async fn execute_root_selection_set<R: Resolver>(
         let _permit = execute_ctx.resolver.query_permit().await;
         let query_start = Instant::now();
 
-        let logger = execute_ctx.logger.clone();
-        let query_text = execute_ctx.query.query_text.cheap_clone();
-        let variables_text = execute_ctx.query.variables_text.cheap_clone();
-        match graph::spawn_blocking_allow_panic(move || {
-            let mut query_res = QueryResult::from(
-                graph::block_on(execute_root_selection_set_uncached(
-                    &execute_ctx,
-                    &execute_selection_set,
-                    &execute_root_type,
-                ))
-                .map(|(obj, mut trace)| {
-                    trace.query_done(query_start.elapsed(), &_permit);
-                    (obj, trace)
-                }),
-            );
+        let mut query_res = QueryResult::from(
+            execute_root_selection_set_uncached(
+                &execute_ctx,
+                &execute_selection_set,
+                &execute_root_type,
+            )
+            .await
+            .map(|(obj, mut trace)| {
+                trace.query_done(query_start.elapsed(), &_permit);
+                (obj, trace)
+            }),
+        );
 
-            // Unwrap: In practice should never fail, but if it does we will catch the panic.
-            execute_ctx.resolver.post_process(&mut query_res).unwrap();
-            query_res.deployment = Some(execute_ctx.query.schema.id().clone());
-            Arc::new(query_res)
-        })
-        .await
-        {
-            Ok(result) => result,
-            Err(e) => {
-                let e = e.into_panic();
-                let e = match e
-                    .downcast_ref::<String>()
-                    .map(String::as_str)
-                    .or(e.downcast_ref::<&'static str>().copied())
-                {
-                    Some(e) => e.to_string(),
-                    None => "panic is not a string".to_string(),
-                };
-                error!(
-                    logger,
-                    "panic when processing graphql query";
-                    "panic" => e.to_string(),
-                    "query" => query_text,
-                    "variables" => variables_text,
-                );
-                Arc::new(QueryResult::from(QueryExecutionError::Panic(e)))
-            }
-        }
+        // Unwrap: In practice should never fail, but if it does we will catch the panic.
+        execute_ctx.resolver.post_process(&mut query_res).unwrap();
+        query_res.deployment = Some(execute_ctx.query.schema.id().clone());
+        Arc::new(query_res)
     };
 
     let (result, herd_hit) = if let Some(key) = key {