aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-23 17:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move schema lock read to translate only

Browse Source
This commit is contained in:
Pere Diaz Bou
2025-03-05 12:07:00 +01:00
parent b63f541150
commit 5f5ca50c41
1 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
core/lib.rs
View File

@@ -258,12 +258,15 @@ impl Connection {
let mut parser = Parser::new(sql.as_bytes());
let cmd = parser.next()?;
let syms = self.syms.borrow();
let schema = self.schema.try_read().ok_or(LimboError::SchemaLocked)?;
if let Some(cmd) = cmd {
match cmd {
Cmd::Stmt(stmt) => {
let program = Rc::new(translate::translate(
&schema,
&self
.schema
.try_read()
.ok_or(LimboError::SchemaLocked)?
.deref(),
stmt,
self.header.clone(),
self.pager.clone(),
@@ -293,12 +296,15 @@ impl Connection {
}
pub(crate) fn run_cmd(self: &Rc<Connection>, cmd: Cmd) -> Result<Option<Statement>> {
let schema = self.schema.try_read().ok_or(LimboError::SchemaLocked)?;
let syms = self.syms.borrow();
match cmd {
Cmd::Stmt(stmt) => {
let program = Rc::new(translate::translate(
schema.deref(),
&self
.schema
.try_read()
.ok_or(LimboError::SchemaLocked)?
.deref(),
stmt,
self.header.clone(),
self.pager.clone(),
@@ -311,7 +317,11 @@ impl Connection {
}
Cmd::Explain(stmt) => {
let program = translate::translate(
schema.deref(),
&self
.schema
.try_read()
.ok_or(LimboError::SchemaLocked)?
.deref(),
stmt,
self.header.clone(),
self.pager.clone(),
@@ -325,8 +335,24 @@ impl Connection {
Cmd::ExplainQueryPlan(stmt) => {
match stmt {
ast::Stmt::Select(select) => {
let mut plan = prepare_select_plan(schema.deref(), *select, &syms, None)?;
optimize_plan(&mut plan, schema.deref())?;
let mut plan = prepare_select_plan(
&self
.schema
.try_read()
.ok_or(LimboError::SchemaLocked)?
.deref(),
*select,
&syms,
None,
)?;
optimize_plan(
&mut plan,
&self
.schema
.try_read()
.ok_or(LimboError::SchemaLocked)?
.deref(),
)?;
println!("{}", plan);
}
_ => todo!(),
@@ -345,12 +371,15 @@ impl Connection {
let mut parser = Parser::new(sql.as_bytes());
let cmd = parser.next()?;
let syms = self.syms.borrow();
let schema = self.schema.try_read().ok_or(LimboError::SchemaLocked)?;
if let Some(cmd) = cmd {
match cmd {
Cmd::Explain(stmt) => {
let program = translate::translate(
&schema,
&self
.schema
.try_read()
.ok_or(LimboError::SchemaLocked)?
.deref(),
stmt,
self.header.clone(),
self.pager.clone(),
@@ -363,7 +392,11 @@ impl Connection {
Cmd::ExplainQueryPlan(_stmt) => todo!(),
Cmd::Stmt(stmt) => {
let program = translate::translate(
&schema,
&self
.schema
.try_read()
.ok_or(LimboError::SchemaLocked)?
.deref(),
stmt,
self.header.clone(),
self.pager.clone(),