From d57824e69627c489db2e4e5f5d8ac10ee975dc70 Mon Sep 17 00:00:00 2001 From: Miguel Fernandez Date: Wed, 18 Jan 2023 11:29:54 +0100 Subject: [PATCH] Remove history files --- .gitignore | 4 +- .../src/runner/binary_20230116193406.rs | 274 ------------------ .../src/runner/binary_20230116193429.rs | 271 ----------------- .../src/runner/binary_20230116193432.rs | 270 ----------------- .../src/runner/binary_20230116193439.rs | 270 ----------------- .../src/runner/binary_20230116193519.rs | 270 ----------------- .../src/runner/binary_20230116193641.rs | 247 ---------------- .../src/runner/binary_20230116193643.rs | 246 ---------------- .../src/runner/binary_20230116193718.rs | 246 ---------------- 9 files changed, 2 insertions(+), 2096 deletions(-) delete mode 100644 .history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193406.rs delete mode 100644 .history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193429.rs delete mode 100644 .history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193432.rs delete mode 100644 .history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193439.rs delete mode 100644 .history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193519.rs delete mode 100644 .history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193641.rs delete mode 100644 .history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193643.rs delete mode 100644 .history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193718.rs diff --git a/.gitignore b/.gitignore index 9f6544e64139..57ab16ee1879 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ current_connector prisma-gpg-private.asc .test_config *.pending-snap -.history +.history/ *.class *.log @@ -44,4 +44,4 @@ dev_datamodel.prisma dmmf.json graph.dot -prisma-fmt-wasm/nodejs \ No newline at end of file +prisma-fmt-wasm/nodejs diff --git a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193406.rs b/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193406.rs deleted file mode 100644 index e59efcaab8c8..000000000000 --- a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193406.rs +++ /dev/null @@ -1,274 +0,0 @@ -use crate::{ConnectorTag, RunnerInterface, TestError, TestResult, TxResult}; -<<<<<<< HEAD -======= -use hyper::{Body, HeaderMap, Method, Request, Response}; ->>>>>>> 608455ced7 (Prepare the code for metrics capturing) -use query_core::{schema::QuerySchemaRef, TxId}; -use query_engine::opt::PrismaOpt; -use query_engine::server::routes; -use query_engine::state::{self, State}; -use query_engine_metrics::MetricRegistry; -use request_handlers::{GQLBatchResponse, GQLError, GQLResponse, GraphQlBody, MultiQuery, PrismaResponse}; - -use hyper::{Body, Method, Request, Response}; -use quaint::{prelude::Queryable, single::Quaint}; -use std::env; - -pub struct BinaryRunner { - connector_tag: ConnectorTag, - current_tx_id: Option, - additional_headers: Option, - state: State, - connection_url: String, -} - -impl BinaryRunner { - pub(crate) fn set_additional_headers(&mut self, headers: Option) { - self.additional_headers = headers; - } -} - -#[async_trait::async_trait] -impl RunnerInterface for BinaryRunner { - async fn load(datamodel: String, connector_tag: ConnectorTag, metrics: MetricRegistry) -> TestResult { - let opts = PrismaOpt::from_list(&[ - "binary", - "--enable-raw-queries", - "--enable-logs-in-response", - "--datamodel", - &datamodel, - ]); - let state = state::setup(&opts, false, Some(metrics)).await.unwrap(); - - let configuration = opts.configuration(true).unwrap(); - let data_source = configuration.datasources.first().unwrap(); - let connection_url = data_source.load_url(|key| env::var(key).ok()).unwrap(); - - Ok(BinaryRunner { - state, - connector_tag, - connection_url, - current_tx_id: None, - additional_headers: None, - }) - } - - async fn query(&self, query: String) -> TestResult { - let query = GraphQlBody::Single(query.into()); - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - if let Some(headers) = &self.additional_headers { - for (key, value) in headers { - builder = builder.header(key, value); - } - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - - let json_resp: serde_json::Value = response_to_json(resp).await; - let gql_response = json_to_gql_response(&json_resp); - - Ok(PrismaResponse::Single(gql_response).into()) - } - - async fn raw_execute(&self, query: String) -> TestResult<()> { - if matches!(self.connector_tag, ConnectorTag::MongoDb(_)) { - panic!("raw_execute is not supported for MongoDB yet"); - } - - let conn = Quaint::new(&self.connection_url).await?; - conn.raw_cmd(&query).await?; - - Ok(()) - } - - async fn batch( - &self, - queries: Vec, - transaction: bool, - isolation_level: Option, - ) -> TestResult { - let query = GraphQlBody::Multi(MultiQuery::new( - queries.into_iter().map(Into::into).collect(), - transaction, - isolation_level, - )); - - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - if let Some(headers) = &self.additional_headers { - for (key, value) in headers { - builder = builder.header(key, value); - } - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp: serde_json::Value = response_to_json(resp).await; - - let mut batch_response = GQLBatchResponse::default(); - - if let Some(batch) = json_resp.get("batchResult") { - let results = batch.as_array().unwrap(); - let responses: Vec = results.iter().map(json_to_gql_response).collect(); - batch_response.insert_responses(responses); - } - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - batch_response.insert_error(gql_error); - }) - } - - Ok(PrismaResponse::Multi(batch_response).into()) - } - - async fn start_tx( - &self, - max_acquisition_millis: u64, - valid_for_millis: u64, - isolation_level: Option, - ) -> TestResult { - let body = serde_json::json!({ - "max_wait": max_acquisition_millis, - "timeout": valid_for_millis, - "isolation_level": isolation_level, - }); - - let body_bytes = serde_json::to_vec(&body).unwrap(); - - let req = Request::builder() - .uri("/transaction/start") - .method(Method::POST) - .body(Body::from(body_bytes)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp = response_to_json(resp).await; - let json_obj = json_resp.as_object().unwrap(); - - match json_obj.get("error_code") { - Some(_) => Err(TestError::InteractiveTransactionError( - serde_json::to_string(json_obj).unwrap(), - )), - None => Ok(json_obj.get("id").unwrap().as_str().unwrap().into()), - } - } - - async fn commit_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/commit", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await; - let resp = resp.unwrap(); - - let result = response_to_json(resp).await; - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - async fn rollback_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/rollback", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let result = response_to_json(resp).await; - - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - fn connector(&self) -> &crate::ConnectorTag { - &self.connector_tag - } - - fn set_active_tx(&mut self, tx_id: query_core::TxId) { - self.current_tx_id = Some(tx_id); - } - - fn clear_active_tx(&mut self) { - self.current_tx_id = None; - } - - fn get_metrics(&self) -> MetricRegistry { - self.state.get_metrics() - } - - fn query_schema(&self) -> &QuerySchemaRef { - self.state.query_schema() - } -} - -async fn response_to_json(resp: Response) -> serde_json::Value { - let body_start = resp.into_body(); - let full_body = hyper::body::to_bytes(body_start).await.unwrap(); - - serde_json::from_slice(full_body.as_ref()).unwrap() -} - -fn json_to_gql_response(json_resp: &serde_json::Value) -> GQLResponse { - let mut gql_response = match json_resp.get("data") { - Some(data_val) => { - let obj = data_val.as_object().unwrap(); - - let mut gql_response = GQLResponse::with_capacity(obj.keys().count()); - - obj.iter().for_each(|(k, v)| { - gql_response.insert_data(k.to_string(), query_core::Item::Json(v.clone())); - }); - gql_response - } - None => GQLResponse::with_capacity(0), - }; - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - gql_response.insert_error(gql_error); - }) - } - - gql_response -} diff --git a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193429.rs b/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193429.rs deleted file mode 100644 index 8492ebb94016..000000000000 --- a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193429.rs +++ /dev/null @@ -1,271 +0,0 @@ -use crate::{ConnectorTag, RunnerInterface, TestError, TestResult, TxResult}; - -use query_core::{schema::QuerySchemaRef, TxId}; -use query_engine::opt::PrismaOpt; -use query_engine::server::routes; -use query_engine::state::{self, State}; -use query_engine_metrics::MetricRegistry; -use request_handlers::{GQLBatchResponse, GQLError, GQLResponse, GraphQlBody, MultiQuery, PrismaResponse}; - -use hyper::{Body, Method, Request, Response}; -use quaint::{prelude::Queryable, single::Quaint}; -use std::env; - -pub struct BinaryRunner { - connector_tag: ConnectorTag, - current_tx_id: Option, - additional_headers: Option, - state: State, - connection_url: String, -} - -impl BinaryRunner { - pub(crate) fn set_additional_headers(&mut self, headers: Option) { - self.additional_headers = headers; - } -} - -#[async_trait::async_trait] -impl RunnerInterface for BinaryRunner { - async fn load(datamodel: String, connector_tag: ConnectorTag, metrics: MetricRegistry) -> TestResult { - let opts = PrismaOpt::from_list(&[ - "binary", - "--enable-raw-queries", - "--enable-logs-in-response", - "--datamodel", - &datamodel, - ]); - let state = state::setup(&opts, false, Some(metrics)).await.unwrap(); - - let configuration = opts.configuration(true).unwrap(); - let data_source = configuration.datasources.first().unwrap(); - let connection_url = data_source.load_url(|key| env::var(key).ok()).unwrap(); - - Ok(BinaryRunner { - state, - connector_tag, - connection_url, - current_tx_id: None, - additional_headers: None, - }) - } - - async fn query(&self, query: String) -> TestResult { - let query = GraphQlBody::Single(query.into()); - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - if let Some(headers) = &self.additional_headers { - for (key, value) in headers { - builder = builder.header(key, value); - } - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - - let json_resp: serde_json::Value = response_to_json(resp).await; - let gql_response = json_to_gql_response(&json_resp); - - Ok(PrismaResponse::Single(gql_response).into()) - } - - async fn raw_execute(&self, query: String) -> TestResult<()> { - if matches!(self.connector_tag, ConnectorTag::MongoDb(_)) { - panic!("raw_execute is not supported for MongoDB yet"); - } - - let conn = Quaint::new(&self.connection_url).await?; - conn.raw_cmd(&query).await?; - - Ok(()) - } - - async fn batch( - &self, - queries: Vec, - transaction: bool, - isolation_level: Option, - ) -> TestResult { - let query = GraphQlBody::Multi(MultiQuery::new( - queries.into_iter().map(Into::into).collect(), - transaction, - isolation_level, - )); - - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - if let Some(headers) = &self.additional_headers { - for (key, value) in headers { - builder = builder.header(key, value); - } - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp: serde_json::Value = response_to_json(resp).await; - - let mut batch_response = GQLBatchResponse::default(); - - if let Some(batch) = json_resp.get("batchResult") { - let results = batch.as_array().unwrap(); - let responses: Vec = results.iter().map(json_to_gql_response).collect(); - batch_response.insert_responses(responses); - } - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - batch_response.insert_error(gql_error); - }) - } - - Ok(PrismaResponse::Multi(batch_response).into()) - } - - async fn start_tx( - &self, - max_acquisition_millis: u64, - valid_for_millis: u64, - isolation_level: Option, - ) -> TestResult { - let body = serde_json::json!({ - "max_wait": max_acquisition_millis, - "timeout": valid_for_millis, - "isolation_level": isolation_level, - }); - - let body_bytes = serde_json::to_vec(&body).unwrap(); - - let req = Request::builder() - .uri("/transaction/start") - .method(Method::POST) - .body(Body::from(body_bytes)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp = response_to_json(resp).await; - let json_obj = json_resp.as_object().unwrap(); - - match json_obj.get("error_code") { - Some(_) => Err(TestError::InteractiveTransactionError( - serde_json::to_string(json_obj).unwrap(), - )), - None => Ok(json_obj.get("id").unwrap().as_str().unwrap().into()), - } - } - - async fn commit_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/commit", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await; - let resp = resp.unwrap(); - - let result = response_to_json(resp).await; - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - async fn rollback_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/rollback", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let result = response_to_json(resp).await; - - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - fn connector(&self) -> &crate::ConnectorTag { - &self.connector_tag - } - - fn set_active_tx(&mut self, tx_id: query_core::TxId) { - self.current_tx_id = Some(tx_id); - } - - fn clear_active_tx(&mut self) { - self.current_tx_id = None; - } - - fn get_metrics(&self) -> MetricRegistry { - self.state.get_metrics() - } - - fn query_schema(&self) -> &QuerySchemaRef { - self.state.query_schema() - } -} - -async fn response_to_json(resp: Response) -> serde_json::Value { - let body_start = resp.into_body(); - let full_body = hyper::body::to_bytes(body_start).await.unwrap(); - - serde_json::from_slice(full_body.as_ref()).unwrap() -} - -fn json_to_gql_response(json_resp: &serde_json::Value) -> GQLResponse { - let mut gql_response = match json_resp.get("data") { - Some(data_val) => { - let obj = data_val.as_object().unwrap(); - - let mut gql_response = GQLResponse::with_capacity(obj.keys().count()); - - obj.iter().for_each(|(k, v)| { - gql_response.insert_data(k.to_string(), query_core::Item::Json(v.clone())); - }); - gql_response - } - None => GQLResponse::with_capacity(0), - }; - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - gql_response.insert_error(gql_error); - }) - } - - gql_response -} diff --git a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193432.rs b/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193432.rs deleted file mode 100644 index fa1de69034de..000000000000 --- a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193432.rs +++ /dev/null @@ -1,270 +0,0 @@ -use crate::{ConnectorTag, RunnerInterface, TestError, TestResult, TxResult}; -use query_core::{schema::QuerySchemaRef, TxId}; -use query_engine::opt::PrismaOpt; -use query_engine::server::routes; -use query_engine::state::{self, State}; -use query_engine_metrics::MetricRegistry; -use request_handlers::{GQLBatchResponse, GQLError, GQLResponse, GraphQlBody, MultiQuery, PrismaResponse}; - -use hyper::{Body, Method, Request, Response}; -use quaint::{prelude::Queryable, single::Quaint}; -use std::env; - -pub struct BinaryRunner { - connector_tag: ConnectorTag, - current_tx_id: Option, - additional_headers: Option, - state: State, - connection_url: String, -} - -impl BinaryRunner { - pub(crate) fn set_additional_headers(&mut self, headers: Option) { - self.additional_headers = headers; - } -} - -#[async_trait::async_trait] -impl RunnerInterface for BinaryRunner { - async fn load(datamodel: String, connector_tag: ConnectorTag, metrics: MetricRegistry) -> TestResult { - let opts = PrismaOpt::from_list(&[ - "binary", - "--enable-raw-queries", - "--enable-logs-in-response", - "--datamodel", - &datamodel, - ]); - let state = state::setup(&opts, false, Some(metrics)).await.unwrap(); - - let configuration = opts.configuration(true).unwrap(); - let data_source = configuration.datasources.first().unwrap(); - let connection_url = data_source.load_url(|key| env::var(key).ok()).unwrap(); - - Ok(BinaryRunner { - state, - connector_tag, - connection_url, - current_tx_id: None, - additional_headers: None, - }) - } - - async fn query(&self, query: String) -> TestResult { - let query = GraphQlBody::Single(query.into()); - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - if let Some(headers) = &self.additional_headers { - for (key, value) in headers { - builder = builder.header(key, value); - } - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - - let json_resp: serde_json::Value = response_to_json(resp).await; - let gql_response = json_to_gql_response(&json_resp); - - Ok(PrismaResponse::Single(gql_response).into()) - } - - async fn raw_execute(&self, query: String) -> TestResult<()> { - if matches!(self.connector_tag, ConnectorTag::MongoDb(_)) { - panic!("raw_execute is not supported for MongoDB yet"); - } - - let conn = Quaint::new(&self.connection_url).await?; - conn.raw_cmd(&query).await?; - - Ok(()) - } - - async fn batch( - &self, - queries: Vec, - transaction: bool, - isolation_level: Option, - ) -> TestResult { - let query = GraphQlBody::Multi(MultiQuery::new( - queries.into_iter().map(Into::into).collect(), - transaction, - isolation_level, - )); - - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - if let Some(headers) = &self.additional_headers { - for (key, value) in headers { - builder = builder.header(key, value); - } - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp: serde_json::Value = response_to_json(resp).await; - - let mut batch_response = GQLBatchResponse::default(); - - if let Some(batch) = json_resp.get("batchResult") { - let results = batch.as_array().unwrap(); - let responses: Vec = results.iter().map(json_to_gql_response).collect(); - batch_response.insert_responses(responses); - } - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - batch_response.insert_error(gql_error); - }) - } - - Ok(PrismaResponse::Multi(batch_response).into()) - } - - async fn start_tx( - &self, - max_acquisition_millis: u64, - valid_for_millis: u64, - isolation_level: Option, - ) -> TestResult { - let body = serde_json::json!({ - "max_wait": max_acquisition_millis, - "timeout": valid_for_millis, - "isolation_level": isolation_level, - }); - - let body_bytes = serde_json::to_vec(&body).unwrap(); - - let req = Request::builder() - .uri("/transaction/start") - .method(Method::POST) - .body(Body::from(body_bytes)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp = response_to_json(resp).await; - let json_obj = json_resp.as_object().unwrap(); - - match json_obj.get("error_code") { - Some(_) => Err(TestError::InteractiveTransactionError( - serde_json::to_string(json_obj).unwrap(), - )), - None => Ok(json_obj.get("id").unwrap().as_str().unwrap().into()), - } - } - - async fn commit_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/commit", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await; - let resp = resp.unwrap(); - - let result = response_to_json(resp).await; - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - async fn rollback_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/rollback", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let result = response_to_json(resp).await; - - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - fn connector(&self) -> &crate::ConnectorTag { - &self.connector_tag - } - - fn set_active_tx(&mut self, tx_id: query_core::TxId) { - self.current_tx_id = Some(tx_id); - } - - fn clear_active_tx(&mut self) { - self.current_tx_id = None; - } - - fn get_metrics(&self) -> MetricRegistry { - self.state.get_metrics() - } - - fn query_schema(&self) -> &QuerySchemaRef { - self.state.query_schema() - } -} - -async fn response_to_json(resp: Response) -> serde_json::Value { - let body_start = resp.into_body(); - let full_body = hyper::body::to_bytes(body_start).await.unwrap(); - - serde_json::from_slice(full_body.as_ref()).unwrap() -} - -fn json_to_gql_response(json_resp: &serde_json::Value) -> GQLResponse { - let mut gql_response = match json_resp.get("data") { - Some(data_val) => { - let obj = data_val.as_object().unwrap(); - - let mut gql_response = GQLResponse::with_capacity(obj.keys().count()); - - obj.iter().for_each(|(k, v)| { - gql_response.insert_data(k.to_string(), query_core::Item::Json(v.clone())); - }); - gql_response - } - None => GQLResponse::with_capacity(0), - }; - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - gql_response.insert_error(gql_error); - }) - } - - gql_response -} diff --git a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193439.rs b/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193439.rs deleted file mode 100644 index fa1de69034de..000000000000 --- a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193439.rs +++ /dev/null @@ -1,270 +0,0 @@ -use crate::{ConnectorTag, RunnerInterface, TestError, TestResult, TxResult}; -use query_core::{schema::QuerySchemaRef, TxId}; -use query_engine::opt::PrismaOpt; -use query_engine::server::routes; -use query_engine::state::{self, State}; -use query_engine_metrics::MetricRegistry; -use request_handlers::{GQLBatchResponse, GQLError, GQLResponse, GraphQlBody, MultiQuery, PrismaResponse}; - -use hyper::{Body, Method, Request, Response}; -use quaint::{prelude::Queryable, single::Quaint}; -use std::env; - -pub struct BinaryRunner { - connector_tag: ConnectorTag, - current_tx_id: Option, - additional_headers: Option, - state: State, - connection_url: String, -} - -impl BinaryRunner { - pub(crate) fn set_additional_headers(&mut self, headers: Option) { - self.additional_headers = headers; - } -} - -#[async_trait::async_trait] -impl RunnerInterface for BinaryRunner { - async fn load(datamodel: String, connector_tag: ConnectorTag, metrics: MetricRegistry) -> TestResult { - let opts = PrismaOpt::from_list(&[ - "binary", - "--enable-raw-queries", - "--enable-logs-in-response", - "--datamodel", - &datamodel, - ]); - let state = state::setup(&opts, false, Some(metrics)).await.unwrap(); - - let configuration = opts.configuration(true).unwrap(); - let data_source = configuration.datasources.first().unwrap(); - let connection_url = data_source.load_url(|key| env::var(key).ok()).unwrap(); - - Ok(BinaryRunner { - state, - connector_tag, - connection_url, - current_tx_id: None, - additional_headers: None, - }) - } - - async fn query(&self, query: String) -> TestResult { - let query = GraphQlBody::Single(query.into()); - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - if let Some(headers) = &self.additional_headers { - for (key, value) in headers { - builder = builder.header(key, value); - } - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - - let json_resp: serde_json::Value = response_to_json(resp).await; - let gql_response = json_to_gql_response(&json_resp); - - Ok(PrismaResponse::Single(gql_response).into()) - } - - async fn raw_execute(&self, query: String) -> TestResult<()> { - if matches!(self.connector_tag, ConnectorTag::MongoDb(_)) { - panic!("raw_execute is not supported for MongoDB yet"); - } - - let conn = Quaint::new(&self.connection_url).await?; - conn.raw_cmd(&query).await?; - - Ok(()) - } - - async fn batch( - &self, - queries: Vec, - transaction: bool, - isolation_level: Option, - ) -> TestResult { - let query = GraphQlBody::Multi(MultiQuery::new( - queries.into_iter().map(Into::into).collect(), - transaction, - isolation_level, - )); - - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - if let Some(headers) = &self.additional_headers { - for (key, value) in headers { - builder = builder.header(key, value); - } - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp: serde_json::Value = response_to_json(resp).await; - - let mut batch_response = GQLBatchResponse::default(); - - if let Some(batch) = json_resp.get("batchResult") { - let results = batch.as_array().unwrap(); - let responses: Vec = results.iter().map(json_to_gql_response).collect(); - batch_response.insert_responses(responses); - } - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - batch_response.insert_error(gql_error); - }) - } - - Ok(PrismaResponse::Multi(batch_response).into()) - } - - async fn start_tx( - &self, - max_acquisition_millis: u64, - valid_for_millis: u64, - isolation_level: Option, - ) -> TestResult { - let body = serde_json::json!({ - "max_wait": max_acquisition_millis, - "timeout": valid_for_millis, - "isolation_level": isolation_level, - }); - - let body_bytes = serde_json::to_vec(&body).unwrap(); - - let req = Request::builder() - .uri("/transaction/start") - .method(Method::POST) - .body(Body::from(body_bytes)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp = response_to_json(resp).await; - let json_obj = json_resp.as_object().unwrap(); - - match json_obj.get("error_code") { - Some(_) => Err(TestError::InteractiveTransactionError( - serde_json::to_string(json_obj).unwrap(), - )), - None => Ok(json_obj.get("id").unwrap().as_str().unwrap().into()), - } - } - - async fn commit_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/commit", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await; - let resp = resp.unwrap(); - - let result = response_to_json(resp).await; - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - async fn rollback_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/rollback", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let result = response_to_json(resp).await; - - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - fn connector(&self) -> &crate::ConnectorTag { - &self.connector_tag - } - - fn set_active_tx(&mut self, tx_id: query_core::TxId) { - self.current_tx_id = Some(tx_id); - } - - fn clear_active_tx(&mut self) { - self.current_tx_id = None; - } - - fn get_metrics(&self) -> MetricRegistry { - self.state.get_metrics() - } - - fn query_schema(&self) -> &QuerySchemaRef { - self.state.query_schema() - } -} - -async fn response_to_json(resp: Response) -> serde_json::Value { - let body_start = resp.into_body(); - let full_body = hyper::body::to_bytes(body_start).await.unwrap(); - - serde_json::from_slice(full_body.as_ref()).unwrap() -} - -fn json_to_gql_response(json_resp: &serde_json::Value) -> GQLResponse { - let mut gql_response = match json_resp.get("data") { - Some(data_val) => { - let obj = data_val.as_object().unwrap(); - - let mut gql_response = GQLResponse::with_capacity(obj.keys().count()); - - obj.iter().for_each(|(k, v)| { - gql_response.insert_data(k.to_string(), query_core::Item::Json(v.clone())); - }); - gql_response - } - None => GQLResponse::with_capacity(0), - }; - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - gql_response.insert_error(gql_error); - }) - } - - gql_response -} diff --git a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193519.rs b/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193519.rs deleted file mode 100644 index ba0932c1324c..000000000000 --- a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193519.rs +++ /dev/null @@ -1,270 +0,0 @@ -use crate::{ConnectorTag, RunnerInterface, TestError, TestResult, TxResult}; -use query_core::{schema::QuerySchemaRef, TxId}; -use query_engine::opt::PrismaOpt; -use query_engine::server::routes; -use query_engine::state::{self, State}; -use query_engine_metrics::MetricRegistry; -use request_handlers::{GQLBatchResponse, GQLError, GQLResponse, GraphQlBody, MultiQuery, PrismaResponse}; - -use hyper::{Body, HeaderMap, Method, Request, Response}; -use quaint::{prelude::Queryable, single::Quaint}; -use std::env; - -pub struct BinaryRunner { - connector_tag: ConnectorTag, - current_tx_id: Option, - additional_headers: Option, - state: State, - connection_url: String, -} - -impl BinaryRunner { - pub(crate) fn set_additional_headers(&mut self, headers: Option) { - self.additional_headers = headers; - } -} - -#[async_trait::async_trait] -impl RunnerInterface for BinaryRunner { - async fn load(datamodel: String, connector_tag: ConnectorTag, metrics: MetricRegistry) -> TestResult { - let opts = PrismaOpt::from_list(&[ - "binary", - "--enable-raw-queries", - "--enable-logs-in-response", - "--datamodel", - &datamodel, - ]); - let state = state::setup(&opts, false, Some(metrics)).await.unwrap(); - - let configuration = opts.configuration(true).unwrap(); - let data_source = configuration.datasources.first().unwrap(); - let connection_url = data_source.load_url(|key| env::var(key).ok()).unwrap(); - - Ok(BinaryRunner { - state, - connector_tag, - connection_url, - current_tx_id: None, - additional_headers: None, - }) - } - - async fn query(&self, query: String) -> TestResult { - let query = GraphQlBody::Single(query.into()); - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - if let Some(headers) = &self.additional_headers { - for (key, value) in headers { - builder = builder.header(key, value); - } - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - - let json_resp: serde_json::Value = response_to_json(resp).await; - let gql_response = json_to_gql_response(&json_resp); - - Ok(PrismaResponse::Single(gql_response).into()) - } - - async fn raw_execute(&self, query: String) -> TestResult<()> { - if matches!(self.connector_tag, ConnectorTag::MongoDb(_)) { - panic!("raw_execute is not supported for MongoDB yet"); - } - - let conn = Quaint::new(&self.connection_url).await?; - conn.raw_cmd(&query).await?; - - Ok(()) - } - - async fn batch( - &self, - queries: Vec, - transaction: bool, - isolation_level: Option, - ) -> TestResult { - let query = GraphQlBody::Multi(MultiQuery::new( - queries.into_iter().map(Into::into).collect(), - transaction, - isolation_level, - )); - - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - if let Some(headers) = &self.additional_headers { - for (key, value) in headers { - builder = builder.header(key, value); - } - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp: serde_json::Value = response_to_json(resp).await; - - let mut batch_response = GQLBatchResponse::default(); - - if let Some(batch) = json_resp.get("batchResult") { - let results = batch.as_array().unwrap(); - let responses: Vec = results.iter().map(json_to_gql_response).collect(); - batch_response.insert_responses(responses); - } - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - batch_response.insert_error(gql_error); - }) - } - - Ok(PrismaResponse::Multi(batch_response).into()) - } - - async fn start_tx( - &self, - max_acquisition_millis: u64, - valid_for_millis: u64, - isolation_level: Option, - ) -> TestResult { - let body = serde_json::json!({ - "max_wait": max_acquisition_millis, - "timeout": valid_for_millis, - "isolation_level": isolation_level, - }); - - let body_bytes = serde_json::to_vec(&body).unwrap(); - - let req = Request::builder() - .uri("/transaction/start") - .method(Method::POST) - .body(Body::from(body_bytes)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp = response_to_json(resp).await; - let json_obj = json_resp.as_object().unwrap(); - - match json_obj.get("error_code") { - Some(_) => Err(TestError::InteractiveTransactionError( - serde_json::to_string(json_obj).unwrap(), - )), - None => Ok(json_obj.get("id").unwrap().as_str().unwrap().into()), - } - } - - async fn commit_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/commit", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await; - let resp = resp.unwrap(); - - let result = response_to_json(resp).await; - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - async fn rollback_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/rollback", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let result = response_to_json(resp).await; - - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - fn connector(&self) -> &crate::ConnectorTag { - &self.connector_tag - } - - fn set_active_tx(&mut self, tx_id: query_core::TxId) { - self.current_tx_id = Some(tx_id); - } - - fn clear_active_tx(&mut self) { - self.current_tx_id = None; - } - - fn get_metrics(&self) -> MetricRegistry { - self.state.get_metrics() - } - - fn query_schema(&self) -> &QuerySchemaRef { - self.state.query_schema() - } -} - -async fn response_to_json(resp: Response) -> serde_json::Value { - let body_start = resp.into_body(); - let full_body = hyper::body::to_bytes(body_start).await.unwrap(); - - serde_json::from_slice(full_body.as_ref()).unwrap() -} - -fn json_to_gql_response(json_resp: &serde_json::Value) -> GQLResponse { - let mut gql_response = match json_resp.get("data") { - Some(data_val) => { - let obj = data_val.as_object().unwrap(); - - let mut gql_response = GQLResponse::with_capacity(obj.keys().count()); - - obj.iter().for_each(|(k, v)| { - gql_response.insert_data(k.to_string(), query_core::Item::Json(v.clone())); - }); - gql_response - } - None => GQLResponse::with_capacity(0), - }; - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - gql_response.insert_error(gql_error); - }) - } - - gql_response -} diff --git a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193641.rs b/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193641.rs deleted file mode 100644 index e22d5785d37f..000000000000 --- a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193641.rs +++ /dev/null @@ -1,247 +0,0 @@ -use crate::{ConnectorTag, RunnerInterface, TestError, TestResult, TxResult}; - -use query_core::{schema::QuerySchemaRef, TxId}; -use query_engine::opt::PrismaOpt; -use query_engine::server::routes; -use query_engine::state::{setup, State}; -use query_engine_metrics::MetricRegistry; -use request_handlers::{GQLBatchResponse, GQLError, GQLResponse, GraphQlBody, MultiQuery, PrismaResponse}; - -use hyper::{Body, HeaderMap, Method, Request, Response}; -use quaint::{prelude::Queryable, single::Quaint}; -use std::env; - -pub struct BinaryRunner { - connector_tag: ConnectorTag, - current_tx_id: Option, - state: State, - connection_url: String, -} - -#[async_trait::async_trait] -impl RunnerInterface for BinaryRunner { - async fn load(datamodel: String, connector_tag: ConnectorTag, metrics: MetricRegistry) -> TestResult { - let opts = PrismaOpt::from_list(&["binary", "--enable-raw-queries", "--datamodel", &datamodel]); - let state = setup(&opts, false, Some(metrics)).await.unwrap(); - - let configuration = opts.configuration(true).unwrap(); - let data_source = configuration.datasources.first().unwrap(); - let connection_url = data_source.load_url(|key| env::var(key).ok()).unwrap(); - - Ok(BinaryRunner { - state, - connector_tag, - connection_url, - current_tx_id: None, - }) - } - - async fn query(&self, query: String) -> TestResult { - let query = GraphQlBody::Single(query.into()); - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - - let json_resp: serde_json::Value = response_to_json(resp).await; - let gql_response = json_to_gql_response(&json_resp); - - Ok(PrismaResponse::Single(gql_response).into()) - } - - async fn raw_execute(&self, query: String) -> TestResult<()> { - if matches!(self.connector_tag, ConnectorTag::MongoDb(_)) { - panic!("raw_execute is not supported for MongoDB yet"); - } - - let conn = Quaint::new(&self.connection_url).await?; - conn.raw_cmd(&query).await?; - - Ok(()) - } - - async fn batch( - &self, - queries: Vec, - transaction: bool, - isolation_level: Option, - ) -> TestResult { - let query = GraphQlBody::Multi(MultiQuery::new( - queries.into_iter().map(Into::into).collect(), - transaction, - isolation_level, - )); - - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - // Garren: basically if there is a current_tx_id we run it as a transaction - // I don't fully understand how ITX works and I need to do this to pass the tests - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.as_ref().unwrap().clone().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp: serde_json::Value = response_to_json(resp).await; - - let mut batch_response = GQLBatchResponse::default(); - - if let Some(batch) = json_resp.get("batchResult") { - let results = batch.as_array().unwrap(); - let responses: Vec = results.iter().map(json_to_gql_response).collect(); - batch_response.insert_responses(responses); - } - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - batch_response.insert_error(gql_error); - }) - } - - Ok(PrismaResponse::Multi(batch_response).into()) - } - - async fn start_tx( - &self, - max_acquisition_millis: u64, - valid_for_millis: u64, - isolation_level: Option, - ) -> TestResult { - let body = serde_json::json!({ - "max_wait": max_acquisition_millis, - "timeout": valid_for_millis, - "isolation_level": isolation_level, - }); - - let body_bytes = serde_json::to_vec(&body).unwrap(); - - let req = Request::builder() - .uri("/transaction/start") - .method(Method::POST) - .body(Body::from(body_bytes)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp = response_to_json(resp).await; - let json_obj = json_resp.as_object().unwrap(); - - match json_obj.get("error_code") { - Some(_) => Err(TestError::InteractiveTransactionError( - serde_json::to_string(json_obj).unwrap(), - )), - None => Ok(json_obj.get("id").unwrap().as_str().unwrap().into()), - } - } - - async fn commit_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/commit", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await; - let resp = resp.unwrap(); - - let result = response_to_json(resp).await; - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - async fn rollback_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/rollback", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let result = response_to_json(resp).await; - - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - fn connector(&self) -> &crate::ConnectorTag { - &self.connector_tag - } - - fn set_active_tx(&mut self, tx_id: query_core::TxId) { - self.current_tx_id = Some(tx_id); - } - - fn clear_active_tx(&mut self) { - self.current_tx_id = None; - } - - fn get_metrics(&self) -> MetricRegistry { - self.state.get_metrics() - } - - fn query_schema(&self) -> &QuerySchemaRef { - self.state.query_schema() - } -} - -async fn response_to_json(resp: Response) -> serde_json::Value { - let body_start = resp.into_body(); - let full_body = hyper::body::to_bytes(body_start).await.unwrap(); - - serde_json::from_slice(full_body.as_ref()).unwrap() -} - -fn json_to_gql_response(json_resp: &serde_json::Value) -> GQLResponse { - let mut gql_response = match json_resp.get("data") { - Some(data_val) => { - let obj = data_val.as_object().unwrap(); - - let mut gql_response = GQLResponse::with_capacity(obj.keys().count()); - - obj.iter().for_each(|(k, v)| { - gql_response.insert_data(k.to_string(), query_core::Item::Json(v.clone())); - }); - gql_response - } - None => GQLResponse::with_capacity(0), - }; - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - gql_response.insert_error(gql_error); - }) - } - - gql_response -} diff --git a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193643.rs b/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193643.rs deleted file mode 100644 index 07fd81e1eda0..000000000000 --- a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193643.rs +++ /dev/null @@ -1,246 +0,0 @@ -use crate::{ConnectorTag, RunnerInterface, TestError, TestResult, TxResult}; -use query_core::{schema::QuerySchemaRef, TxId}; -use query_engine::opt::PrismaOpt; -use query_engine::server::routes; -use query_engine::state::{setup, State}; -use query_engine_metrics::MetricRegistry; -use request_handlers::{GQLBatchResponse, GQLError, GQLResponse, GraphQlBody, MultiQuery, PrismaResponse}; - -use hyper::{Body, HeaderMap, Method, Request, Response}; -use quaint::{prelude::Queryable, single::Quaint}; -use std::env; - -pub struct BinaryRunner { - connector_tag: ConnectorTag, - current_tx_id: Option, - state: State, - connection_url: String, -} - -#[async_trait::async_trait] -impl RunnerInterface for BinaryRunner { - async fn load(datamodel: String, connector_tag: ConnectorTag, metrics: MetricRegistry) -> TestResult { - let opts = PrismaOpt::from_list(&["binary", "--enable-raw-queries", "--datamodel", &datamodel]); - let state = setup(&opts, false, Some(metrics)).await.unwrap(); - - let configuration = opts.configuration(true).unwrap(); - let data_source = configuration.datasources.first().unwrap(); - let connection_url = data_source.load_url(|key| env::var(key).ok()).unwrap(); - - Ok(BinaryRunner { - state, - connector_tag, - connection_url, - current_tx_id: None, - }) - } - - async fn query(&self, query: String) -> TestResult { - let query = GraphQlBody::Single(query.into()); - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - - let json_resp: serde_json::Value = response_to_json(resp).await; - let gql_response = json_to_gql_response(&json_resp); - - Ok(PrismaResponse::Single(gql_response).into()) - } - - async fn raw_execute(&self, query: String) -> TestResult<()> { - if matches!(self.connector_tag, ConnectorTag::MongoDb(_)) { - panic!("raw_execute is not supported for MongoDB yet"); - } - - let conn = Quaint::new(&self.connection_url).await?; - conn.raw_cmd(&query).await?; - - Ok(()) - } - - async fn batch( - &self, - queries: Vec, - transaction: bool, - isolation_level: Option, - ) -> TestResult { - let query = GraphQlBody::Multi(MultiQuery::new( - queries.into_iter().map(Into::into).collect(), - transaction, - isolation_level, - )); - - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - // Garren: basically if there is a current_tx_id we run it as a transaction - // I don't fully understand how ITX works and I need to do this to pass the tests - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.as_ref().unwrap().clone().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp: serde_json::Value = response_to_json(resp).await; - - let mut batch_response = GQLBatchResponse::default(); - - if let Some(batch) = json_resp.get("batchResult") { - let results = batch.as_array().unwrap(); - let responses: Vec = results.iter().map(json_to_gql_response).collect(); - batch_response.insert_responses(responses); - } - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - batch_response.insert_error(gql_error); - }) - } - - Ok(PrismaResponse::Multi(batch_response).into()) - } - - async fn start_tx( - &self, - max_acquisition_millis: u64, - valid_for_millis: u64, - isolation_level: Option, - ) -> TestResult { - let body = serde_json::json!({ - "max_wait": max_acquisition_millis, - "timeout": valid_for_millis, - "isolation_level": isolation_level, - }); - - let body_bytes = serde_json::to_vec(&body).unwrap(); - - let req = Request::builder() - .uri("/transaction/start") - .method(Method::POST) - .body(Body::from(body_bytes)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp = response_to_json(resp).await; - let json_obj = json_resp.as_object().unwrap(); - - match json_obj.get("error_code") { - Some(_) => Err(TestError::InteractiveTransactionError( - serde_json::to_string(json_obj).unwrap(), - )), - None => Ok(json_obj.get("id").unwrap().as_str().unwrap().into()), - } - } - - async fn commit_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/commit", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await; - let resp = resp.unwrap(); - - let result = response_to_json(resp).await; - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - async fn rollback_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/rollback", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let result = response_to_json(resp).await; - - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - fn connector(&self) -> &crate::ConnectorTag { - &self.connector_tag - } - - fn set_active_tx(&mut self, tx_id: query_core::TxId) { - self.current_tx_id = Some(tx_id); - } - - fn clear_active_tx(&mut self) { - self.current_tx_id = None; - } - - fn get_metrics(&self) -> MetricRegistry { - self.state.get_metrics() - } - - fn query_schema(&self) -> &QuerySchemaRef { - self.state.query_schema() - } -} - -async fn response_to_json(resp: Response) -> serde_json::Value { - let body_start = resp.into_body(); - let full_body = hyper::body::to_bytes(body_start).await.unwrap(); - - serde_json::from_slice(full_body.as_ref()).unwrap() -} - -fn json_to_gql_response(json_resp: &serde_json::Value) -> GQLResponse { - let mut gql_response = match json_resp.get("data") { - Some(data_val) => { - let obj = data_val.as_object().unwrap(); - - let mut gql_response = GQLResponse::with_capacity(obj.keys().count()); - - obj.iter().for_each(|(k, v)| { - gql_response.insert_data(k.to_string(), query_core::Item::Json(v.clone())); - }); - gql_response - } - None => GQLResponse::with_capacity(0), - }; - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - gql_response.insert_error(gql_error); - }) - } - - gql_response -} diff --git a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193718.rs b/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193718.rs deleted file mode 100644 index dc39be708c7f..000000000000 --- a/.history/query-engine/connector-test-kit-rs/query-tests-setup/src/runner/binary_20230116193718.rs +++ /dev/null @@ -1,246 +0,0 @@ -use crate::{ConnectorTag, RunnerInterface, TestError, TestResult, TxResult}; -use query_core::{schema::QuerySchemaRef, TxId}; -use query_engine::opt::PrismaOpt; -use query_engine::server::routes; -use query_engine::state::{setup, State}; -use query_engine_metrics::MetricRegistry; -use request_handlers::{GQLBatchResponse, GQLError, GQLResponse, GraphQlBody, MultiQuery, PrismaResponse}; - -use hyper::{Body, Method, Request, Response}; -use quaint::{prelude::Queryable, single::Quaint}; -use std::env; - -pub struct BinaryRunner { - connector_tag: ConnectorTag, - current_tx_id: Option, - state: State, - connection_url: String, -} - -#[async_trait::async_trait] -impl RunnerInterface for BinaryRunner { - async fn load(datamodel: String, connector_tag: ConnectorTag, metrics: MetricRegistry) -> TestResult { - let opts = PrismaOpt::from_list(&["binary", "--enable-raw-queries", "--datamodel", &datamodel]); - let state = setup(&opts, false, Some(metrics)).await.unwrap(); - - let configuration = opts.configuration(true).unwrap(); - let data_source = configuration.datasources.first().unwrap(); - let connection_url = data_source.load_url(|key| env::var(key).ok()).unwrap(); - - Ok(BinaryRunner { - state, - connector_tag, - connection_url, - current_tx_id: None, - }) - } - - async fn query(&self, query: String) -> TestResult { - let query = GraphQlBody::Single(query.into()); - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.clone().unwrap().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - - let json_resp: serde_json::Value = response_to_json(resp).await; - let gql_response = json_to_gql_response(&json_resp); - - Ok(PrismaResponse::Single(gql_response).into()) - } - - async fn raw_execute(&self, query: String) -> TestResult<()> { - if matches!(self.connector_tag, ConnectorTag::MongoDb(_)) { - panic!("raw_execute is not supported for MongoDB yet"); - } - - let conn = Quaint::new(&self.connection_url).await?; - conn.raw_cmd(&query).await?; - - Ok(()) - } - - async fn batch( - &self, - queries: Vec, - transaction: bool, - isolation_level: Option, - ) -> TestResult { - let query = GraphQlBody::Multi(MultiQuery::new( - queries.into_iter().map(Into::into).collect(), - transaction, - isolation_level, - )); - - let body = serde_json::to_vec(&query).unwrap(); - - let mut builder = Request::builder().method(Method::POST); - - // Garren: basically if there is a current_tx_id we run it as a transaction - // I don't fully understand how ITX works and I need to do this to pass the tests - if self.current_tx_id.is_some() { - let tx_id: String = self.current_tx_id.as_ref().unwrap().clone().to_string(); - builder = builder.header("X-transaction-id", tx_id); - } - - let req = builder.body(Body::from(body)).unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp: serde_json::Value = response_to_json(resp).await; - - let mut batch_response = GQLBatchResponse::default(); - - if let Some(batch) = json_resp.get("batchResult") { - let results = batch.as_array().unwrap(); - let responses: Vec = results.iter().map(json_to_gql_response).collect(); - batch_response.insert_responses(responses); - } - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - batch_response.insert_error(gql_error); - }) - } - - Ok(PrismaResponse::Multi(batch_response).into()) - } - - async fn start_tx( - &self, - max_acquisition_millis: u64, - valid_for_millis: u64, - isolation_level: Option, - ) -> TestResult { - let body = serde_json::json!({ - "max_wait": max_acquisition_millis, - "timeout": valid_for_millis, - "isolation_level": isolation_level, - }); - - let body_bytes = serde_json::to_vec(&body).unwrap(); - - let req = Request::builder() - .uri("/transaction/start") - .method(Method::POST) - .body(Body::from(body_bytes)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let json_resp = response_to_json(resp).await; - let json_obj = json_resp.as_object().unwrap(); - - match json_obj.get("error_code") { - Some(_) => Err(TestError::InteractiveTransactionError( - serde_json::to_string(json_obj).unwrap(), - )), - None => Ok(json_obj.get("id").unwrap().as_str().unwrap().into()), - } - } - - async fn commit_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/commit", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await; - let resp = resp.unwrap(); - - let result = response_to_json(resp).await; - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - async fn rollback_tx(&self, tx_id: TxId) -> TestResult { - let uri = format!("/transaction/{}/rollback", tx_id); - - let req = Request::builder() - .uri(uri.as_str()) - .method(Method::POST) - .body(Body::from(r#"{}"#)) - .unwrap(); - - let resp = routes(self.state.clone(), req).await.unwrap(); - let result = response_to_json(resp).await; - - let error: Result = serde_json::from_value(result); - - if let Ok(user_error) = error { - Ok(Err(user_error)) - } else { - Ok(Ok(())) - } - } - - fn connector(&self) -> &crate::ConnectorTag { - &self.connector_tag - } - - fn set_active_tx(&mut self, tx_id: query_core::TxId) { - self.current_tx_id = Some(tx_id); - } - - fn clear_active_tx(&mut self) { - self.current_tx_id = None; - } - - fn get_metrics(&self) -> MetricRegistry { - self.state.get_metrics() - } - - fn query_schema(&self) -> &QuerySchemaRef { - self.state.query_schema() - } -} - -async fn response_to_json(resp: Response) -> serde_json::Value { - let body_start = resp.into_body(); - let full_body = hyper::body::to_bytes(body_start).await.unwrap(); - - serde_json::from_slice(full_body.as_ref()).unwrap() -} - -fn json_to_gql_response(json_resp: &serde_json::Value) -> GQLResponse { - let mut gql_response = match json_resp.get("data") { - Some(data_val) => { - let obj = data_val.as_object().unwrap(); - - let mut gql_response = GQLResponse::with_capacity(obj.keys().count()); - - obj.iter().for_each(|(k, v)| { - gql_response.insert_data(k.to_string(), query_core::Item::Json(v.clone())); - }); - gql_response - } - None => GQLResponse::with_capacity(0), - }; - - if let Some(error_val) = json_resp.get("errors") { - let errors = error_val.as_array().unwrap(); - - errors.iter().for_each(|err| { - let gql_error: GQLError = serde_json::from_value(err.clone()).unwrap(); - gql_response.insert_error(gql_error); - }) - } - - gql_response -}