pyturso 0.4.3rc1__tar.gz → 0.4.3rc2__tar.gz

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/Cargo.lock

@@ -896,7 +896,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core_tester"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -2729,7 +2729,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_completion"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2737,7 +2737,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_crypto"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "blake3",
  "data-encoding",
@@ -2750,7 +2750,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_csv"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "csv",
  "mimalloc",
@@ -2760,7 +2760,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_fuzzy"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2768,7 +2768,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_ipaddr"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "ipnetwork",
  "mimalloc",
@@ -2777,7 +2777,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_percentile"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2785,7 +2785,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_regexp"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "mimalloc",
  "regex",
@@ -2794,7 +2794,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sim"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "anyhow",
  "bitflags 2.9.4",
@@ -2831,7 +2831,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sqlite_test_ext"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "cc",
 ]
@@ -3718,7 +3718,7 @@ dependencies = [
 
 [[package]]
 name = "py-turso"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "anyhow",
  "pyo3",
@@ -4595,7 +4595,7 @@ checksum = "d372029cb5195f9ab4e4b9aef550787dce78b124fcaee8d82519925defcd6f0d"
 
 [[package]]
 name = "sql_generation"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "anarchist-readable-name-generator-lib",
  "anyhow",
@@ -5299,7 +5299,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "turso"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5323,14 +5323,14 @@ dependencies = [
 
 [[package]]
 name = "turso-dotnet"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "turso_core",
 ]
 
 [[package]]
 name = "turso-java"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "jni",
  "thiserror 2.0.16",
@@ -5339,7 +5339,7 @@ dependencies = [
 
 [[package]]
 name = "turso_cli"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5380,7 +5380,7 @@ dependencies = [
 
 [[package]]
 name = "turso_core"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "aegis",
  "aes",
@@ -5447,7 +5447,7 @@ dependencies = [
 
 [[package]]
 name = "turso_dart"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "flutter_rust_bridge",
  "turso_core",
@@ -5455,7 +5455,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "chrono",
  "getrandom 0.3.2",
@@ -5464,7 +5464,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext_tests"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "env_logger 0.11.7",
  "lazy_static",
@@ -5475,7 +5475,7 @@ dependencies = [
 
 [[package]]
 name = "turso_macros"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5484,7 +5484,7 @@ dependencies = [
 
 [[package]]
 name = "turso_node"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "chrono",
  "napi",
@@ -5497,7 +5497,7 @@ dependencies = [
 
 [[package]]
 name = "turso_parser"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "bitflags 2.9.4",
  "criterion",
@@ -5514,7 +5514,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sdk_kit"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "bindgen",
  "env_logger 0.11.7",
@@ -5527,7 +5527,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sdk_kit_macros"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5536,7 +5536,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sqlite3"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "env_logger 0.11.7",
  "libc",
@@ -5549,7 +5549,7 @@ dependencies = [
 
 [[package]]
 name = "turso_stress"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "antithesis_sdk",
  "clap",
@@ -5565,7 +5565,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_engine"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -5592,7 +5592,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_js"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "genawaiter",
  "napi",
@@ -5607,7 +5607,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_sdk_kit"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "bindgen",
  "env_logger 0.11.7",
@@ -5624,7 +5624,7 @@ dependencies = [
 
 [[package]]
 name = "turso_whopper"
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 dependencies = [
  "anyhow",
  "clap",

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/Cargo.toml

@@ -6,24 +6,24 @@ members = ["bindings/python"]
 exclude = ["perf/latency/limbo", "turso-test-runner"]
 
 [workspace.package]
-version = "0.4.3-pre.1"
+version = "0.4.3-pre.2"
 authors = ["the Limbo authors"]
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/tursodatabase/turso"
 
 [workspace.dependencies]
-turso = { path = "bindings/rust", version = "0.4.3-pre.1" }
-turso_node = { path = "bindings/javascript", version = "0.4.3-pre.1" }
-turso_sdk_kit = { path = "sdk-kit", version = "0.4.3-pre.1" }
-turso_sdk_kit_macros = { path = "sdk-kit-macros", version = "0.4.3-pre.1" }
-turso_sync_sdk_kit = { path = "sync/sdk-kit", version = "0.4.3-pre.1" }
-limbo_completion = { path = "extensions/completion", version = "0.4.3-pre.1" }
-turso_core = { path = "core", version = "0.4.3-pre.1" }
-turso_sync_engine = { path = "sync/engine", version = "0.4.3-pre.1" }
-turso_ext = { path = "extensions/core", version = "0.4.3-pre.1" }
-turso_macros = { path = "macros", version = "0.4.3-pre.1" }
-turso_parser = { path = "parser", version = "0.4.3-pre.1" }
+turso = { path = "bindings/rust", version = "0.4.3-pre.2" }
+turso_node = { path = "bindings/javascript", version = "0.4.3-pre.2" }
+turso_sdk_kit = { path = "sdk-kit", version = "0.4.3-pre.2" }
+turso_sdk_kit_macros = { path = "sdk-kit-macros", version = "0.4.3-pre.2" }
+turso_sync_sdk_kit = { path = "sync/sdk-kit", version = "0.4.3-pre.2" }
+limbo_completion = { path = "extensions/completion", version = "0.4.3-pre.2" }
+turso_core = { path = "core", version = "0.4.3-pre.2" }
+turso_sync_engine = { path = "sync/engine", version = "0.4.3-pre.2" }
+turso_ext = { path = "extensions/core", version = "0.4.3-pre.2" }
+turso_macros = { path = "macros", version = "0.4.3-pre.2" }
+turso_parser = { path = "parser", version = "0.4.3-pre.2" }
 sql_generation = { path = "sql_generation" }
 strum = { version = "0.26", features = ["derive"] }
 strum_macros = "0.26"

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyturso
-Version: 0.4.3rc1
+Version: 0.4.3rc2
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/core/function.rs

@@ -611,7 +611,7 @@ impl Display for MathFunc {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum AlterTableFunc {
     RenameTable,
     AlterColumn,
@@ -628,7 +628,7 @@ impl Display for AlterTableFunc {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum Func {
     Agg(AggFunc),
     Scalar(ScalarFunc),
@@ -655,7 +655,7 @@ impl Display for Func {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct FuncCtx {
     pub func: Func,
     pub arg_count: usize,

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/core/lib.rs

@@ -110,7 +110,7 @@ use util::parse_schema_rows;
 pub use util::IOExt;
 pub use vdbe::{
     builder::QueryMode, explain::EXPLAIN_COLUMNS, explain::EXPLAIN_QUERY_PLAN_COLUMNS,
-    FromValueRow, Register,
+    FromValueRow, Program, Register,
 };
 
 /// Configuration for database features

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/core/parameters.rs

@@ -21,7 +21,7 @@ impl Parameter {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Parameters {
     next_index: NonZero<usize>,
     pub list: Vec<Parameter>,

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/core/statement.rs

@@ -86,8 +86,16 @@ impl Statement {
         self.query_mode
     }
 
+    pub fn get_program(&self) -> &vdbe::Program {
+        &self.program
+    }
+
+    pub fn get_pager(&self) -> &Arc<Pager> {
+        &self.pager
+    }
+
     pub fn n_change(&self) -> i64 {
-        self.program
+        self.state
             .n_change
             .load(std::sync::atomic::Ordering::SeqCst)
     }
@@ -451,7 +459,7 @@ impl Statement {
         // as abort uses auto_txn_cleanup value - it needs to be called before state.reset
         self.program.abort(&self.pager, None, &mut self.state);
         self.state.reset(max_registers, max_cursors);
-        self.program.n_change.store(0, Ordering::SeqCst);
+        self.state.n_change.store(0, Ordering::SeqCst);
         self.busy = false;
         self.busy_handler_state = None;
     }

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/core/storage/pager.rs

@@ -4305,7 +4305,7 @@ pub fn default_page1(cipher: Option<&CipherMode>) -> PageRef {
     page
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone, Copy)]
 pub struct CreateBTreeFlags(pub u8);
 impl CreateBTreeFlags {
     pub const TABLE: u8 = 0b0001;

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/core/vdbe/builder.rs

@@ -1,7 +1,6 @@
-use parking_lot::RwLock;
 use std::{
     collections::HashMap,
-    sync::{atomic::AtomicI64, Arc},
+    sync::Arc,
 };
 
 use tracing::{instrument, Level};
@@ -39,7 +38,7 @@ impl TableRefIdCounter {
     }
 }
 
-use super::{BranchOffset, CursorID, ExplainState, Insn, InsnReference, JumpTarget, Program};
+use super::{BranchOffset, CursorID, Insn, InsnReference, JumpTarget, Program};
 
 /// A key that uniquely identifies a cursor.
 /// The key is a pair of table reference id and index.
@@ -1264,7 +1263,6 @@ impl ProgramBuilder {
             comments: self.comments,
             connection,
             parameters: self.parameters,
-            n_change: AtomicI64::new(0),
             change_cnt_on,
             result_columns: self.result_columns,
             table_references: self.table_references,
@@ -1275,7 +1273,6 @@ impl ProgramBuilder {
             is_subprogram: self.is_subprogram,
             contains_trigger_subprograms,
             resolve_type: self.resolve_type,
-            explain_state: RwLock::new(ExplainState::default()),
         })
     }
 }

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/core/vdbe/execute.rs

@@ -6440,7 +6440,7 @@ pub fn op_insert(
                 };
                 if let Some(rowid) = maybe_rowid {
                     program.connection.update_last_rowid(rowid);
-                    program
+                    state
                         .n_change
                         .fetch_add(1, std::sync::atomic::Ordering::SeqCst);
                 }
@@ -6660,7 +6660,7 @@ pub fn op_delete(
     if !is_part_of_update {
         // DELETEs do not count towards the total changes if they are part of an UPDATE statement,
         // i.e. the DELETE and subsequent INSERT of a row are the same "change".
-        program
+        state
             .n_change
             .fetch_add(1, std::sync::atomic::Ordering::SeqCst);
     }

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/core/vdbe/insn.rs

@@ -169,7 +169,7 @@ impl<T: Copy + std::fmt::Display> std::fmt::Display for RegisterOrLiteral<T> {
 }
 
 /// Data for HashBuild instruction (boxed to keep Insn small).
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct HashBuildData {
     pub cursor_id: CursorID,
     pub key_start_reg: usize,
@@ -186,7 +186,7 @@ pub struct HashBuildData {
 
 // There are currently 190 opcodes in sqlite
 #[repr(u8)]
-#[derive(Description, Debug, EnumDiscriminants)]
+#[derive(Description, Debug, Clone, EnumDiscriminants)]
 #[strum_discriminants(vis(pub(crate)))]
 #[strum_discriminants(derive(VariantArray, EnumCount, FromRepr))]
 #[strum_discriminants(name(InsnVariants))]

{pyturso-0.4.3rc1 → pyturso-0.4.3rc2}/core/vdbe/mod.rs

@@ -378,6 +378,8 @@ pub struct ProgramState {
     op_hash_probe_state: Option<OpHashProbeState>,
     hash_tables: HashMap<usize, HashTable>,
     uses_subjournal: bool,
+    pub n_change: AtomicI64,
+    pub explain_state: RwLock<ExplainState>,
 }
 
 impl std::fmt::Debug for Program {
@@ -447,6 +449,8 @@ impl ProgramState {
             bloom_filters: HashMap::new(),
             hash_tables: HashMap::new(),
             uses_subjournal: false,
+            n_change: AtomicI64::new(0),
+            explain_state: RwLock::new(ExplainState::default()),
         }
     }
 
@@ -540,6 +544,8 @@ impl ProgramState {
         self.hash_tables.clear();
         self.op_hash_build_state = None;
         self.op_hash_probe_state = None;
+        self.n_change.store(0, Ordering::SeqCst);
+        *self.explain_state.write() = ExplainState::default();
     }
 
     pub fn get_cursor(&mut self, cursor_id: CursorID) -> &mut Cursor {
@@ -721,6 +727,7 @@ pub struct ExplainState {
     subprogram_start_pc: Option<usize>,
 }
 
+#[derive(Clone)]
 pub struct Program {
     pub max_registers: usize,
     // we store original indices because we don't want to create new vec from
@@ -730,7 +737,6 @@ pub struct Program {
     pub comments: Vec<(InsnReference, &'static str)>,
     pub parameters: crate::parameters::Parameters,
     pub connection: Arc<Connection>,
-    pub n_change: AtomicI64,
     pub change_cnt_on: bool,
     pub result_columns: Vec<ResultSetColumn>,
     pub table_references: TableReferences,
@@ -750,7 +756,6 @@ pub struct Program {
     /// Whether the program contains any trigger subprograms.
     pub contains_trigger_subprograms: bool,
     pub resolve_type: ResolveType,
-    pub explain_state: RwLock<ExplainState>,
 }
 
 impl Program {
@@ -804,7 +809,7 @@ impl Program {
         // FIXME: do we need this?
         state.metrics.vm_steps = state.metrics.vm_steps.saturating_add(1);
 
-        let mut explain_state = self.explain_state.write();
+        let mut explain_state = state.explain_state.write();
 
         // Check if we're processing a subprogram
         if let Some(sub_idx) = explain_state.current_subprogram_index {
@@ -848,7 +853,9 @@ impl Program {
             // Process the subprogram - it will handle its own explain_step internally
             // The subprogram's explain_step will process all its instructions (including any nested subprograms)
             // and return StepResult::Row for each instruction, then StepResult::Done when finished
+            drop(explain_state);
             let result = p.step(state, pager.clone(), QueryMode::Explain, None)?;
+            let mut explain_state = state.explain_state.write();
 
             match result {
                 StepResult::Done => {
@@ -1234,22 +1241,14 @@ impl Program {
                 let TransactionState::Write { .. } = connection.get_tx_state() else {
                     unreachable!("invalid state for write commit step")
                 };
-                self.step_end_write_txn(
-                    &pager,
-                    &mut program_state.commit_state,
-                    &connection,
-                    rollback,
-                )
+                self.step_end_write_txn(&pager, &connection, program_state, rollback)
             } else if auto_commit {
                 let current_state = connection.get_tx_state();
                 tracing::trace!("Auto-commit state: {:?}", current_state);
                 match current_state {
-                    TransactionState::Write { .. } => self.step_end_write_txn(
-                        &pager,
-                        &mut program_state.commit_state,
-                        &connection,
-                        rollback,
-                    ),
+                    TransactionState::Write { .. } => {
+                        self.step_end_write_txn(&pager, &connection, program_state, rollback)
+                    }
                     TransactionState::Read => {
                         connection.set_tx_state(TransactionState::None);
                         pager.end_read_tx();
@@ -1263,21 +1262,22 @@ impl Program {
             } else {
                 if self.change_cnt_on {
                     self.connection
-                        .set_changes(self.n_change.load(Ordering::SeqCst));
+                        .set_changes(program_state.n_change.load(Ordering::SeqCst));
                 }
                 Ok(IOResult::Done(()))
             }
         }
     }
 
-    #[instrument(skip(self, pager, connection), level = Level::DEBUG)]
+    #[instrument(skip(self, pager, connection, program_state), level = Level::DEBUG)]
     fn step_end_write_txn(
         &self,
         pager: &Arc<Pager>,
-        commit_state: &mut CommitState,
         connection: &Connection,
+        program_state: &mut ProgramState,
         rollback: bool,
     ) -> Result<IOResult<()>> {
+        let commit_state = &mut program_state.commit_state;
         let cacheflush_status = if !rollback {
             match pager.commit_tx(connection) {
                 Ok(status) => status,
@@ -1287,7 +1287,7 @@ impl Program {
                     tracing::warn!("Commit succeeded but autocheckpoint failed: {}", msg);
                     if self.change_cnt_on {
                         self.connection
-                            .set_changes(self.n_change.load(Ordering::SeqCst));
+                            .set_changes(program_state.n_change.load(Ordering::SeqCst));
                     }
                     // Update global schema if this was a DDL transaction.
                     // Must be done before clearing TX state, otherwise abort() won't know
@@ -1310,7 +1310,7 @@ impl Program {
             IOResult::Done(_) => {
                 if self.change_cnt_on {
                     self.connection
-                        .set_changes(self.n_change.load(Ordering::SeqCst));
+                        .set_changes(program_state.n_change.load(Ordering::SeqCst));
                 }
                 connection.set_tx_state(TransactionState::None);
                 *commit_state = CommitState::Ready;