Experimental: add compatibility with GATs in backend::DataService

This means we don't need to clone so many things or connect
to the database more than once, and we can organise things in a clearer
way. Hooray for GATs!

Author: sd2k

Cargo.lock

@@ -11,7 +11,8 @@ authors = [
 bytes = "1.1.0"
 chrono = "0.4.19"
 futures-util = "0.3.21"
-grafana-plugin-sdk = "0.4.2"
+# grafana-plugin-sdk = "0.4.2"
+grafana-plugin-sdk = { git = "https://github.com/grafana/grafana-plugin-sdk-rust", branch = "query-data-gat" }
 http = "0.2.6"
 md5 = "0.7.0"
 rust_decimal = { version = "1.22.0", features = ["db-tokio-postgres"] }

backend/Cargo.toml

@@ -1,14 +1,10 @@
-use std::{collections::HashMap, sync::Arc};
-
 use futures_util::stream::FuturesOrdered;
 
-use grafana_plugin_sdk::backend;
-use tokio::sync::RwLock;
-use tokio_postgres::Client;
+use grafana_plugin_sdk::backend::{self, DataSourceInstanceSettings};
 
 use crate::{
-    path::{self, PathDisplay, QueryId},
-    queries::{Query, SelectStatement, TailTarget},
+    path::{PathDisplay, QueryId},
+    queries::{Query, TailTarget},
     rows_to_frame, Error, MaterializePlugin,
 };
 
@@ -31,32 +27,40 @@ impl backend::DataQueryError for QueryError {
 // Unfortunately this has to take all of its arguments by value until we have
 // GATs, since the `DataService::Stream` associated type can't contain references.
 // Ideally we'd just borrow the query/uid etc but it's really not a big deal.
-async fn query_data_single(
-    client: &Client,
-    uid: &str,
-    query: backend::DataQuery<Query>,
-    queries: Arc<RwLock<HashMap<path::QueryId, SelectStatement>>>,
-) -> Result<backend::DataResponse, Error> {
-    let q = query.query;
-    let target = q.as_tail()?;
-    let rows = target.select_all(client).await?;
-    let mut frame = rows_to_frame(&rows);
+impl MaterializePlugin {
+    async fn query_data_single(
+        &self,
+        datasource_instance_settings: &DataSourceInstanceSettings,
+        query: &backend::DataQuery<Query>,
+    ) -> Result<backend::DataResponse, Error> {
+        let q = &query.query;
+        let client = self.get_client(datasource_instance_settings).await?;
+        let target = q.as_tail()?;
+        let rows = target.select_all(&client).await?;
+        let mut frame = rows_to_frame(&rows);
 
-    if let TailTarget::Select { statement } = target {
-        let query_id = QueryId::from_statement(statement);
-        queries.write().await.insert(query_id, statement.clone());
-    }
+        if let TailTarget::Select { statement } = target {
+            let query_id = QueryId::from_statement(statement);
+            self.sql_queries
+                .write()
+                .await
+                .insert(query_id, statement.clone());
+        }
 
-    let path = q.to_path();
-    // Set the channel of the frame, indicating to Grafana that it should switch to
-    // streaming.
-    let channel = format!("ds/{}/{}", uid, path)
-        .parse()
-        .map_err(Error::CreatingChannel)?;
-    frame.set_channel(channel);
-    let frame = frame.check()?;
+        let path = q.to_path();
+        // Set the channel of the frame, indicating to Grafana that it should switch to
+        // streaming.
+        let channel = format!("ds/{}/{}", datasource_instance_settings.uid, path)
+            .parse()
+            .map_err(Error::CreatingChannel)?;
+        frame.set_channel(channel);
+        let frame = frame.check()?;
 
-    Ok(backend::DataResponse::new(query.ref_id, vec![frame]))
+        Ok(backend::DataResponse::new(
+            query.ref_id.clone(),
+            vec![frame],
+        ))
+    }
 }
 
 #[backend::async_trait]
@@ -65,43 +69,27 @@ impl backend::DataService for MaterializePlugin {
     type QueryError = QueryError;
     type Stream<'a> = backend::BoxDataResponseStream<'a, Self::QueryError>;
 
-    async fn query_data(
-        &self,
-        request: backend::QueryDataRequest<Self::Query>,
-    ) -> Self::Stream<'_> {
+    async fn query_data<'stream, 'req: 'stream, 'slf: 'req>(
+        &'slf self,
+        request: &'req backend::QueryDataRequest<Self::Query>,
+    ) -> Self::Stream<'stream> {
         let datasource_settings = request
             .plugin_context
             .datasource_instance_settings
-            .clone()
+            .as_ref()
             .ok_or(Error::MissingDatasource)
             .unwrap();
-        // let clients: Vec<_> = request
-        //     .queries
-        //     .iter()
-        //     .map(|_| self.get_client(&datasource_settings))
-        //     .collect::<FuturesUnordered<_>>()
-        //     .collect()
-        //     .await;
-        let client = Arc::new(self.get_client(&datasource_settings).await.unwrap());
-        let queries = self.sql_queries.clone();
         Box::pin(
             request
                 .queries
-                .into_iter()
-                .map(|x| {
-                    let client = client.clone();
-                    let queries = queries.clone();
-                    let ref_id = x.ref_id.clone();
-                    let uid = datasource_settings.uid.clone();
-                    async move {
-                        // let client = client.map_err(|source| QueryError {
-                        //     ref_id: ref_id.clone(),
-                        //     source,
-                        // })?;
-                        query_data_single(&client, &uid, x, queries)
-                            .await
-                            .map_err(|source| QueryError { ref_id, source })
-                    }
+                .iter()
+                .map(|x| async move {
+                    self.query_data_single(datasource_settings, x)
+                        .await
+                        .map_err(|source| QueryError {
+                            ref_id: x.ref_id.clone(),
+                            source,
+                        })
                 })
                 .collect::<FuturesOrdered<_>>(),
         )