Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Derive Copy for IsolationLevel so we don't have to clone it. #258

Merged
merged 1 commit into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/connectors/ndc-postgres/src/configuration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ pub fn as_runtime_configuration(config: &Configuration) -> RuntimeConfiguration
connection_uri: match &v2_config.connection_uri {
ConnectionUri::Uri(ResolvedSecret(uri)) => uri.clone(),
},
isolation_level: v2_config.isolation_level.clone(),
isolation_level: v2_config.isolation_level,
mutations_version: v2_config.configure_options.mutations_version.clone(),
},
}
Expand Down
2 changes: 1 addition & 1 deletion crates/connectors/ndc-postgres/src/explain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ fn plan_query(
let timer = state.metrics.time_query_plan();
let result = translation::query::translate(
&configuration.metadata,
&configuration.isolation_level,
configuration.isolation_level,
query_request,
)
.map_err(|err| {
Expand Down
2 changes: 1 addition & 1 deletion crates/connectors/ndc-postgres/src/mutation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ fn plan_mutation(
})
.collect::<Result<Vec<_>, connector::MutationError>>()?;
timer.complete_with(Ok(sql::execution_plan::simple_mutations_execution_plan(
&configuration.isolation_level,
configuration.isolation_level,
mutations,
)))
}
Expand Down
2 changes: 1 addition & 1 deletion crates/connectors/ndc-postgres/src/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ fn plan_query(
let timer = state.metrics.time_query_plan();
let result = translation::query::translate(
&configuration.metadata,
&configuration.isolation_level,
configuration.isolation_level,
query_request,
)
.map_err(|err| {
Expand Down
4 changes: 3 additions & 1 deletion crates/query-engine/sql/src/sql/ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,9 @@ pub mod transaction {
/// Rollback a transaction
pub struct Rollback {}

#[derive(Debug, Clone, Default, serde::Deserialize, serde::Serialize, schemars::JsonSchema)]
#[derive(
Debug, Clone, Copy, Default, serde::Deserialize, serde::Serialize, schemars::JsonSchema,
)]
/// The isolation level of transactions
pub enum IsolationLevel {
#[default]
Expand Down
4 changes: 2 additions & 2 deletions crates/query-engine/sql/src/sql/execution_plan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub fn explain_to_sql(explain: &sql::ast::Explain) -> sql::string::SQL {

/// A simple query execution plan with only a root field and a query.
pub fn simple_query_execution_plan(
isolation_level: &sql::ast::transaction::IsolationLevel,
isolation_level: sql::ast::transaction::IsolationLevel,
variables: Option<Vec<BTreeMap<String, serde_json::Value>>>,
root_field: String,
query: sql::ast::Select,
Expand Down Expand Up @@ -94,7 +94,7 @@ impl Mutation {

/// A simple mutation execution plan with only a root field and a query.
pub fn simple_mutations_execution_plan(
isolation_level: &sql::ast::transaction::IsolationLevel,
isolation_level: sql::ast::transaction::IsolationLevel,
mutations: Vec<Mutation>,
) -> ExecutionPlan<Mutations> {
ExecutionPlan {
Expand Down
4 changes: 2 additions & 2 deletions crates/query-engine/sql/src/sql/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -620,13 +620,13 @@ pub const VARIABLES_OBJECT_PLACEHOLDER: &str = "%VARIABLES_OBJECT_PLACEHOLDER";
pub const VARIABLE_ORDER_FIELD: &str = "%variable_order";

pub fn begin(
isolation_level: &transaction::IsolationLevel,
isolation_level: transaction::IsolationLevel,
transaction_mode: transaction::TransactionMode,
) -> Vec<string::Statement> {
vec![{
let mut sql = string::SQL::new();
transaction::Begin {
isolation_level: isolation_level.clone(),
isolation_level,
transaction_mode,
}
.to_sql(&mut sql);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use query_engine_sql::sql;
/// Translate the incoming QueryRequest to an ExecutionPlan (SQL) to be run against the database.
pub fn translate(
metadata: &metadata::Metadata,
isolation_level: &sql::ast::transaction::IsolationLevel,
isolation_level: sql::ast::transaction::IsolationLevel,
query_request: models::QueryRequest,
) -> Result<sql::execution_plan::ExecutionPlan<sql::execution_plan::Query>, Error> {
let env = Env::new(metadata, query_request.collection_relationships, &None);
Expand Down
19 changes: 6 additions & 13 deletions crates/query-engine/translation/tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use query_engine_sql::sql;
use query_engine_translation::translation;

pub fn test_translation(testname: &str) -> Result<String, translation::error::Error> {
test_query_translation(&None, testname)
test_query_translation(None, testname)
}

/// Translate a query to SQL and compare against the snapshot.
pub fn test_query_translation(
isolation_level: &Option<sql::ast::transaction::IsolationLevel>,
isolation_level: Option<sql::ast::transaction::IsolationLevel>,
testname: &str,
) -> Result<String, translation::error::Error> {
let tables = serde_json::from_str(
Expand All @@ -25,13 +25,8 @@ pub fn test_query_translation(
)
.unwrap();

let plan = translation::query::translate(
&tables,
&isolation_level
.clone()
.unwrap_or(sql::ast::transaction::IsolationLevel::default()),
request,
)?;
let plan =
translation::query::translate(&tables, isolation_level.unwrap_or_default(), request)?;

let mut sqls: Vec<String> = vec![];

Expand Down Expand Up @@ -78,7 +73,7 @@ pub fn test_query_translation(

/// Translate a mutation to SQL and compare against the snapshot.
pub fn test_mutation_translation(
isolation_level: &Option<sql::ast::transaction::IsolationLevel>,
isolation_level: Option<sql::ast::transaction::IsolationLevel>,
testname: &str,
) -> Result<String, translation::error::Error> {
let tables = serde_json::from_str(
Expand Down Expand Up @@ -114,9 +109,7 @@ pub fn test_mutation_translation(
.collect::<Result<Vec<_>, translation::error::Error>>()?;

let plan = sql::execution_plan::simple_mutations_execution_plan(
&isolation_level
.clone()
.unwrap_or(sql::ast::transaction::IsolationLevel::default()),
isolation_level.unwrap_or_default(),
mutations,
);
let mut sqls: Vec<String> = vec![];
Expand Down
4 changes: 2 additions & 2 deletions crates/query-engine/translation/tests/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ mod mutations {

#[test]
fn simple() {
let result = common::test_mutation_translation(&None, "simple").unwrap();
let result = common::test_mutation_translation(None, "simple").unwrap();
insta::assert_snapshot!(result);
}
}
Expand All @@ -265,7 +265,7 @@ mod transaction {
#[test]
fn select_with_limit() {
let result = common::test_query_translation(
&Some(query_engine_sql::sql::ast::transaction::IsolationLevel::Serializable),
Some(query_engine_sql::sql::ast::transaction::IsolationLevel::Serializable),
"select_with_limit",
)
.unwrap();
Expand Down