aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2025-12-19 09:34:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

change every Rc to Arc in schema internals

Browse Source
This commit is contained in:
Pere Diaz Bou
2025-07-28 10:51:17 +02:00
parent d273de483f
commit 752a876f9a
14 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/ext/mod.rs
View File

@@ -97,7 +97,7 @@ pub(crate) unsafe extern "C" fn register_scalar_function(
unsafe {
(*ext_ctx.syms).functions.insert(
name_str.clone(),
Rc::new(ExternalFunc::new_scalar(name_str, func)),
Arc::new(ExternalFunc::new_scalar(name_str, func)),
);
}
ResultCode::OK
@@ -123,7 +123,7 @@ pub(crate) unsafe extern "C" fn register_aggregate_function(
unsafe {
(*ext_ctx.syms).functions.insert(
name_str.clone(),
Rc::new(ExternalFunc::new_aggregate(
Arc::new(ExternalFunc::new_aggregate(
name_str,
args,
(init_func, step_func, finalize_func),

3
core/function.rs
View File

@@ -1,6 +1,7 @@
use std::fmt;
use std::fmt::{Debug, Display};
use std::rc::Rc;
use std::sync::Arc;
use turso_ext::{FinalizeFunction, InitAggFunction, ScalarFunction, StepFunction};
use crate::LimboError;
@@ -593,7 +594,7 @@ pub enum Func {
#[cfg(feature = "json")]
Json(JsonFunc),
AlterTable(AlterTableFunc),
External(Rc<ExternalFunc>),
External(Arc<ExternalFunc>),
}
impl Display for Func {

6
core/lib.rs
View File

@@ -1676,8 +1676,8 @@ pub type StepResult = vdbe::StepResult;
#[derive(Default)]
pub struct SymbolTable {
pub functions: HashMap<String, Rc<function::ExternalFunc>>,
pub vtabs: HashMap<String, Rc<VirtualTable>>,
pub functions: HashMap<String, Arc<function::ExternalFunc>>,
pub vtabs: HashMap<String, Arc<VirtualTable>>,
pub vtab_modules: HashMap<String, Rc<crate::ext::VTabImpl>>,
}
@@ -1726,7 +1726,7 @@ impl SymbolTable {
&self,
name: &str,
_arg_count: usize,
) -> Option<Rc<function::ExternalFunc>> {
) -> Option<Arc<function::ExternalFunc>> {
self.functions.get(name).cloned()
}

47
core/schema.rs
View File

@@ -44,7 +44,10 @@ impl Schema {
Arc::new(Table::BTree(sqlite_schema_table().into())),
);
for function in VirtualTable::builtin_functions() {
tables.insert(function.name.to_owned(), Arc::new(Table::Virtual(function)));
tables.insert(
function.name.to_owned(),
Arc::new(Table::Virtual(Arc::new((*function).clone()))),
);
}
Self {
tables,
@@ -62,12 +65,12 @@ impl Schema {
.any(|idx| idx.1.iter().any(|i| i.name == name))
}
pub fn add_btree_table(&mut self, table: Rc<BTreeTable>) {
pub fn add_btree_table(&mut self, table: Arc<BTreeTable>) {
let name = normalize_ident(&table.name);
self.tables.insert(name, Table::BTree(table).into());
}
pub fn add_virtual_table(&mut self, table: Rc<VirtualTable>) {
pub fn add_virtual_table(&mut self, table: Arc<VirtualTable>) {
let name = normalize_ident(&table.name);
self.tables.insert(name, Table::Virtual(table).into());
}
@@ -87,7 +90,7 @@ impl Schema {
self.tables.remove(&name);
}
pub fn get_btree_table(&self, name: &str) -> Option<Rc<BTreeTable>> {
pub fn get_btree_table(&self, name: &str) -> Option<Arc<BTreeTable>> {
let name = normalize_ident(name);
if let Some(table) = self.tables.get(&name) {
table.btree()
@@ -198,22 +201,23 @@ impl Schema {
// longer in the in-memory schema. We need to recreate it if
// the module is loaded in the symbol table.
let vtab = if let Some(vtab) = syms.vtabs.get(name) {
vtab.clone()
Arc::new((**vtab).clone())
} else {
let mod_name = module_name_from_sql(sql)?;
crate::VirtualTable::table(
let vtab_rc = crate::VirtualTable::table(
Some(name),
mod_name,
module_args_from_sql(sql)?,
syms,
)?
)?;
Arc::new((*vtab_rc).clone())
};
self.add_virtual_table(vtab);
continue;
}
let table = BTreeTable::from_sql(sql, root_page as usize)?;
self.add_btree_table(Rc::new(table));
self.add_btree_table(Arc::new(table));
}
"index" => {
let root_page_value = record_cursor.get_value(&row, 3)?;
@@ -323,14 +327,17 @@ impl Clone for Schema {
.iter()
.map(|(name, table)| match table.deref() {
Table::BTree(table) => {
let table = Rc::deref(table);
(name.clone(), Arc::new(Table::BTree(Rc::new(table.clone()))))
}
Table::Virtual(table) => {
let table = Rc::deref(table);
let table = Arc::deref(table);
(
name.clone(),
Arc::new(Table::Virtual(Rc::new(table.clone()))),
Arc::new(Table::BTree(Arc::new(table.clone()))),
)
}
Table::Virtual(table) => {
let table = Arc::deref(table);
(
name.clone(),
Arc::new(Table::Virtual(Arc::new(table.clone()))),
)
}
Table::FromClauseSubquery(from_clause_subquery) => (
@@ -362,8 +369,8 @@ impl Clone for Schema {
#[derive(Clone, Debug)]
pub enum Table {
BTree(Rc<BTreeTable>),
Virtual(Rc<VirtualTable>),
BTree(Arc<BTreeTable>),
Virtual(Arc<VirtualTable>),
FromClauseSubquery(FromClauseSubquery),
}
@@ -402,7 +409,7 @@ impl Table {
}
}
pub fn btree(&self) -> Option<Rc<BTreeTable>> {
pub fn btree(&self) -> Option<Arc<BTreeTable>> {
match self {
Self::BTree(table) => Some(table.clone()),
Self::Virtual(_) => None,
@@ -410,7 +417,7 @@ impl Table {
}
}
pub fn virtual_table(&self) -> Option<Rc<VirtualTable>> {
pub fn virtual_table(&self) -> Option<Arc<VirtualTable>> {
match self {
Self::Virtual(table) => Some(table.clone()),
_ => None,
@@ -421,8 +428,8 @@ impl Table {
impl PartialEq for Table {
fn eq(&self, other: &Self) -> bool {
match (self, other) {
(Self::BTree(a), Self::BTree(b)) => Rc::ptr_eq(a, b),
(Self::Virtual(a), Self::Virtual(b)) => Rc::ptr_eq(a, b),
(Self::BTree(a), Self::BTree(b)) => Arc::ptr_eq(a, b),
(Self::Virtual(a), Self::Virtual(b)) => Arc::ptr_eq(a, b),
_ => false,
}
}

4
core/translate/emitter.rs
View File

@@ -1,7 +1,7 @@
// This module contains code for emitting bytecode instructions for SQL query execution.
// It handles translating high-level SQL operations into low-level bytecode that can be executed by the virtual machine.
use std::rc::Rc;
use std::sync::Arc;
use tracing::{instrument, Level};
use turso_sqlite3_parser::ast::{self, Expr};
@@ -1055,7 +1055,7 @@ fn emit_update_insns(
start_reg: start,
count: table_ref.columns().len(),
check_generated: true,
table_reference: Rc::clone(&btree_table),
table_reference: Arc::clone(&btree_table),
});
}

5
core/translate/insert.rs
View File

@@ -1,4 +1,3 @@
use std::rc::Rc;
use std::sync::Arc;
use turso_sqlite3_parser::ast::{
@@ -439,7 +438,7 @@ pub fn translate_insert(
start_reg: columns_start_register,
count: num_cols,
check_generated: true,
table_reference: Rc::clone(&t),
table_reference: Arc::clone(&t),
});
}
_ => (),
@@ -962,7 +961,7 @@ fn populate_column_registers(
// TODO: comeback here later to apply the same improvements on select
fn translate_virtual_table_insert(
mut program: ProgramBuilder,
virtual_table: Rc<VirtualTable>,
virtual_table: Arc<VirtualTable>,
columns: Option<DistinctNames>,
mut body: InsertBody,
on_conflict: Option<ResolveType>,

8
core/translate/optimizer/join.rs
View File

@@ -490,7 +490,7 @@ fn generate_join_bitmasks(table_number_max_exclusive: usize, how_many: usize) ->
#[cfg(test)]
mod tests {
use std::{cell::Cell, rc::Rc, sync::Arc};
use std::{cell::Cell, sync::Arc};
use turso_sqlite3_parser::ast::{self, Expr, Operator, SortOrder, TableInternalId};
@@ -1640,8 +1640,8 @@ mod tests {
}
/// Creates a BTreeTable with the given name and columns
fn _create_btree_table(name: &str, columns: Vec<Column>) -> Rc<BTreeTable> {
Rc::new(BTreeTable {
fn _create_btree_table(name: &str, columns: Vec<Column>) -> Arc<BTreeTable> {
Arc::new(BTreeTable {
root_page: 1, // Page number doesn't matter for tests
name: name.to_string(),
primary_key_columns: vec![],
@@ -1654,7 +1654,7 @@ mod tests {
/// Creates a TableReference for a BTreeTable
fn _create_table_reference(
table: Rc<BTreeTable>,
table: Arc<BTreeTable>,
join_info: Option<JoinInfo>,
internal_id: TableInternalId,
) -> JoinedTable {

8
core/translate/plan.rs
View File

@@ -1,4 +1,4 @@
use std::{cell::Cell, cmp::Ordering, rc::Rc, sync::Arc};
use std::{cell::Cell, cmp::Ordering, sync::Arc};
use turso_ext::{ConstraintInfo, ConstraintOp};
use turso_sqlite3_parser::ast::{self, SortOrder};
@@ -333,7 +333,7 @@ pub enum QueryDestination {
/// The cursor ID of the ephemeral table that will be used to store the results.
cursor_id: CursorID,
/// The table that will be used to store the results.
table: Rc<BTreeTable>,
table: Arc<BTreeTable>,
},
}
@@ -887,13 +887,13 @@ impl Operation {
impl JoinedTable {
/// Returns the btree table for this table reference, if it is a BTreeTable.
pub fn btree(&self) -> Option<Rc<BTreeTable>> {
pub fn btree(&self) -> Option<Arc<BTreeTable>> {
match &self.table {
Table::BTree(_) => self.table.btree(),
_ => None,
}
}
pub fn virtual_table(&self) -> Option<Rc<VirtualTable>> {
pub fn virtual_table(&self) -> Option<Arc<VirtualTable>> {
match &self.table {
Table::Virtual(_) => self.table.virtual_table(),
_ => None,

3
core/translate/schema.rs
View File

@@ -1,6 +1,7 @@
use std::collections::HashSet;
use std::ops::Range;
use std::rc::Rc;
use std::sync::Arc;
use crate::ast;
use crate::ext::VTabImpl;
@@ -772,7 +773,7 @@ pub fn translate_drop_table(
// cursor id 1
let sqlite_schema_cursor_id_1 =
program.alloc_cursor_id(CursorType::BTreeTable(schema_table.clone()));
let simple_table_rc = Rc::new(BTreeTable {
let simple_table_rc = Arc::new(BTreeTable {
root_page: 0, // Not relevant for ephemeral table definition
name: "ephemeral_scratch".to_string(),
has_rowid: true,

3
core/translate/update.rs
View File

@@ -1,5 +1,4 @@
use std::collections::HashMap;
use std::rc::Rc;
use std::sync::Arc;
use crate::schema::{BTreeTable, Column, Type};
@@ -235,7 +234,7 @@ pub fn prepare_update_plan(
connection,
)?;
let table = Rc::new(BTreeTable {
let table = Arc::new(BTreeTable {
root_page: 0, // Not relevant for ephemeral table definition
name: "ephemeral_scratch".to_string(),
has_rowid: true,

2
core/util.rs
View File

@@ -111,7 +111,7 @@ pub fn parse_schema_rows(
schema.add_virtual_table(vtab);
} else {
let table = schema::BTreeTable::from_sql(sql, root_page as usize)?;
schema.add_btree_table(Rc::new(table));
schema.add_btree_table(Arc::new(table));
}
}
"index" => {

6
core/vdbe/builder.rs
View File

@@ -1,4 +1,4 @@
use std::{cell::Cell, cmp::Ordering, rc::Rc, sync::Arc};
use std::{cell::Cell, cmp::Ordering, sync::Arc};
use tracing::{instrument, Level};
use turso_sqlite3_parser::ast::{self, TableInternalId};
@@ -115,11 +115,11 @@ pub struct ProgramBuilder {
#[derive(Debug, Clone)]
pub enum CursorType {
BTreeTable(Rc<BTreeTable>),
BTreeTable(Arc<BTreeTable>),
BTreeIndex(Arc<Index>),
Pseudo(PseudoCursorType),
Sorter,
VirtualTable(Rc<VirtualTable>),
VirtualTable(Arc<VirtualTable>),
}
impl CursorType {

3
core/vdbe/insn.rs
View File

@@ -1,6 +1,5 @@
use std::{
num::{NonZero, NonZeroUsize},
rc::Rc,
sync::Arc,
};
@@ -417,7 +416,7 @@ pub enum Insn {
/// GENERATED ALWAYS AS ... STATIC columns are only checked if P3 is zero.
/// When P3 is non-zero, no type checking occurs for static generated columns.
check_generated: bool, // P3
table_reference: Rc<BTreeTable>, // P4
table_reference: Arc<BTreeTable>, // P4
},
// Make a record and write it to destination register.

14
core/vtab.rs
View File

@@ -25,14 +25,14 @@ pub struct VirtualTable {
}
impl VirtualTable {
pub(crate) fn readonly(self: &Rc<VirtualTable>) -> bool {
pub(crate) fn readonly(self: &Arc<VirtualTable>) -> bool {
match &self.vtab_type {
VirtualTableType::Pragma(_) => true,
VirtualTableType::External(table) => table.readonly(),
}
}
pub(crate) fn builtin_functions() -> Vec<Rc<VirtualTable>> {
pub(crate) fn builtin_functions() -> Vec<Arc<VirtualTable>> {
PragmaVirtualTable::functions()
.into_iter()
.map(|(tab, schema)| {
@@ -43,12 +43,12 @@ impl VirtualTable {
kind: VTabKind::TableValuedFunction,
vtab_type: VirtualTableType::Pragma(tab),
};
Rc::new(vtab)
Arc::new(vtab)
})
.collect()
}
pub(crate) fn function(name: &str, syms: &SymbolTable) -> crate::Result<Rc<VirtualTable>> {
pub(crate) fn function(name: &str, syms: &SymbolTable) -> crate::Result<Arc<VirtualTable>> {
let module = syms.vtab_modules.get(name);
let (vtab_type, schema) = if module.is_some() {
ExtVirtualTable::create(name, module, Vec::new(), VTabKind::TableValuedFunction)
@@ -65,7 +65,7 @@ impl VirtualTable {
kind: VTabKind::TableValuedFunction,
vtab_type,
};
Ok(Rc::new(vtab))
Ok(Arc::new(vtab))
}
pub fn table(
@@ -73,7 +73,7 @@ impl VirtualTable {
module_name: &str,
args: Vec<turso_ext::Value>,
syms: &SymbolTable,
) -> crate::Result<Rc<VirtualTable>> {
) -> crate::Result<Arc<VirtualTable>> {
let module = syms.vtab_modules.get(module_name);
let (table, schema) =
ExtVirtualTable::create(module_name, module, args, VTabKind::VirtualTable)?;
@@ -83,7 +83,7 @@ impl VirtualTable {
kind: VTabKind::VirtualTable,
vtab_type: VirtualTableType::External(table),
};
Ok(Rc::new(vtab))
Ok(Arc::new(vtab))
}
fn resolve_columns(schema: String) -> crate::Result<Vec<Column>> {