Skip to content

Fix(runtime): fix get endpoint failed when execute some set statement #146

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jun 28, 2022
Merged

Fix(runtime): fix get endpoint failed when execute some set statement #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7bc970c
fix(runtime): fix get endpoint failed when execute some `set` statement
xuanyuan300 Jun 28, 2022
c504b84
fix(runtime): fix get endpoint failed when execute some `set` statement
xuanyuan300 Jun 28, 2022
46f4598
Merge branch 'fix-getconn-unwrap' of github.com:xuanyuan300/pisanix i…
xuanyuan300 Jun 28, 2022
d6ca840
chore(runtime): remove unused println!
xuanyuan300 Jun 28, 2022
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
24 changes: 21 additions & 3 deletions pisa-proxy/runtime/mysql/src/server/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,12 @@ impl MySqlServer {
SetOpts::SetNames(name) => {
if let Some(name) = &name.charset_name {
self.client.charset = name.clone();
self.trans_fsm.set_charset(name.clone())
self.trans_fsm.set_charset(name.clone());
self.trans_fsm
.trigger(TransEventName::SetSessionEvent, RouteInput::Statement(input))
.await
.unwrap();
return;
}
}
SetOpts::SetVariable(val) => {
Expand All @@ -522,18 +527,26 @@ impl MySqlServer {
}

if value == "1" {
let _ = self.trans_fsm.reset_fsm_state(RouteInput::Statement(input)).await;
let _ = self
.trans_fsm
.reset_fsm_state(RouteInput::Statement(input))
.await;
}

self.client.autocommit = Some(value.clone());
self.trans_fsm.set_autocommit(value.clone());
return;
}
_ => {}
},
ExprOrDefault::On => {
self.client.autocommit = Some(String::from("ON"));
self.trans_fsm.set_autocommit(String::from("ON"));
let _ = self.trans_fsm.reset_fsm_state(RouteInput::Statement(input)).await;
let _ = self
.trans_fsm
.reset_fsm_state(RouteInput::Statement(input))
.await;
return;
}

_ => {}
Expand All @@ -545,6 +558,11 @@ impl MySqlServer {

_ => {}
}

self.trans_fsm
.trigger(TransEventName::SetSessionEvent, RouteInput::Statement(input))
.await
.unwrap();
}

pub async fn handle_query_resultset<'b>(
Expand Down
11 changes: 4 additions & 7 deletions pisa-proxy/runtime/mysql/src/transaction_fsm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use std::sync::Arc;

use async_trait::async_trait;
use conn_pool::{ConnAttr, Pool, PoolConn, ConnAttrMut};
use conn_pool::{ConnAttr, ConnAttrMut, Pool, PoolConn};
use endpoint::endpoint::Endpoint;
use mysql_protocol::client::conn::{ClientConn, SessionAttr};
use pisa_error::error::{Error, ErrorKind};
Expand Down Expand Up @@ -316,10 +316,10 @@ impl TransFsm {
}

// when autocommit=0, should be reset fsm state
pub async fn reset_fsm_state(&mut self, input: RouteInput<'_>) -> Result<(), Error>{
pub async fn reset_fsm_state(&mut self, input: RouteInput<'_>) -> Result<(), Error> {
self.current_state = TransState::TransDummyState;
self.current_event = TransEventName::DummyEvent;

self.trigger(TransEventName::QueryEvent, input).await?;
Ok(())
}
Expand All @@ -343,9 +343,7 @@ impl TransFsm {
let conn = self.client_conn.take();
let addr = self.endpoint.as_ref().unwrap().addr.as_ref();
match conn {
Some(client_conn) => {
Ok(client_conn)
}
Some(client_conn) => Ok(client_conn),
None => match self.pool.get_conn_with_opts(addr).await {
Ok(mut client_conn) => {
client_conn.init(self.build_conn_attrs()).await;
Expand All @@ -360,7 +358,6 @@ impl TransFsm {
self.client_conn = Some(conn)
}


#[inline]
fn build_conn_attrs(&self) -> Vec<SessionAttr> {
vec![
Expand Down