pyturso 0.3.0rc4__tar.gz → 0.3.0rc5__tar.gz

{pyturso-0.3.0rc4 → pyturso-0.3.0rc5}/Cargo.lock

@@ -227,6 +227,12 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -822,7 +828,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core_tester"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -2410,15 +2416,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "julian_day_converter"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2987f71b89b85c812c8484cbf0c5d7912589e77bfdc66fd3e52f760e7859f16"
-dependencies = [
- "chrono",
-]
-
 [[package]]
 name = "kqueue"
 version = "1.0.8"
@@ -2548,7 +2545,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_completion"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2556,7 +2553,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_crypto"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "blake3",
  "data-encoding",
@@ -2569,7 +2566,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_csv"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "csv",
  "mimalloc",
@@ -2579,7 +2576,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_fuzzy"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2587,7 +2584,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_ipaddr"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "ipnetwork",
  "mimalloc",
@@ -2596,7 +2593,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_percentile"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2604,7 +2601,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_regexp"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "mimalloc",
  "regex",
@@ -2613,7 +2610,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sim"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "anyhow",
  "bitflags 2.9.4",
@@ -2649,7 +2646,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sqlite_test_ext"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "cc",
 ]
@@ -3465,7 +3462,7 @@ dependencies = [
 
 [[package]]
 name = "py-turso"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "anyhow",
  "pyo3",
@@ -4211,7 +4208,7 @@ checksum = "d372029cb5195f9ab4e4b9aef550787dce78b124fcaee8d82519925defcd6f0d"
 
 [[package]]
 name = "sql_generation"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "anarchist-readable-name-generator-lib 0.2.0",
  "anyhow",
@@ -4839,8 +4836,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "turso"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
+ "mimalloc",
  "rand 0.9.2",
  "rand_chacha 0.9.0",
  "tempfile",
@@ -4853,7 +4851,7 @@ dependencies = [
 
 [[package]]
 name = "turso-java"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "jni",
  "thiserror 2.0.16",
@@ -4862,7 +4860,7 @@ dependencies = [
 
 [[package]]
 name = "turso_cli"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -4898,12 +4896,13 @@ dependencies = [
 
 [[package]]
 name = "turso_core"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "aegis",
  "aes",
  "aes-gcm",
  "antithesis_sdk",
+ "arc-swap",
  "bitflags 2.9.4",
  "built",
  "bytemuck",
@@ -4916,7 +4915,6 @@ dependencies = [
  "hex",
  "intrusive-collections",
  "io-uring",
- "julian_day_converter",
  "libc",
  "libloading",
  "libm",
@@ -4937,6 +4935,7 @@ dependencies = [
  "roaring",
  "rstest",
  "rusqlite",
+ "rustc-hash",
  "rustix 1.0.7",
  "ryu",
  "serde",
@@ -4958,7 +4957,7 @@ dependencies = [
 
 [[package]]
 name = "turso_dart"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "flutter_rust_bridge",
  "turso_core",
@@ -4966,7 +4965,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "chrono",
  "getrandom 0.3.2",
@@ -4975,7 +4974,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext_tests"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "env_logger 0.11.7",
  "lazy_static",
@@ -4986,7 +4985,7 @@ dependencies = [
 
 [[package]]
 name = "turso_macros"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4995,7 +4994,7 @@ dependencies = [
 
 [[package]]
 name = "turso_node"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "chrono",
  "napi",
@@ -5008,7 +5007,7 @@ dependencies = [
 
 [[package]]
 name = "turso_parser"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "bitflags 2.9.4",
  "criterion",
@@ -5024,7 +5023,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sqlite3"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "env_logger 0.11.7",
  "libc",
@@ -5037,7 +5036,7 @@ dependencies = [
 
 [[package]]
 name = "turso_stress"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "anarchist-readable-name-generator-lib 0.1.2",
  "antithesis_sdk",
@@ -5054,7 +5053,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_engine"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -5081,7 +5080,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_js"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "genawaiter",
  "napi",
@@ -5096,7 +5095,7 @@ dependencies = [
 
 [[package]]
 name = "turso_whopper"
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 dependencies = [
  "anyhow",
  "clap",

{pyturso-0.3.0rc4 → pyturso-0.3.0rc5}/Cargo.toml

@@ -8,29 +8,29 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.3.0-pre.4"
+version = "0.3.0-pre.5"
 authors = ["the Limbo authors"]
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/tursodatabase/turso"
 
 [workspace.dependencies]
-turso = { path = "bindings/rust", version = "0.3.0-pre.4" }
-turso_node = { path = "bindings/javascript", version = "0.3.0-pre.4" }
-limbo_completion = { path = "extensions/completion", version = "0.3.0-pre.4" }
-turso_core = { path = "core", version = "0.3.0-pre.4" }
-turso_sync_engine = { path = "sync/engine", version = "0.3.0-pre.4" }
-limbo_crypto = { path = "extensions/crypto", version = "0.3.0-pre.4" }
-limbo_csv = { path = "extensions/csv", version = "0.3.0-pre.4" }
-turso_ext = { path = "extensions/core", version = "0.3.0-pre.4" }
-turso_ext_tests = { path = "extensions/tests", version = "0.3.0-pre.4" }
-limbo_ipaddr = { path = "extensions/ipaddr", version = "0.3.0-pre.4" }
-turso_macros = { path = "macros", version = "0.3.0-pre.4" }
-limbo_percentile = { path = "extensions/percentile", version = "0.3.0-pre.4" }
-limbo_regexp = { path = "extensions/regexp", version = "0.3.0-pre.4" }
-limbo_uuid = { path = "extensions/uuid", version = "0.3.0-pre.4" }
-turso_parser = { path = "parser", version = "0.3.0-pre.4" }
-limbo_fuzzy = { path = "extensions/fuzzy", version = "0.3.0-pre.4" }
+turso = { path = "bindings/rust", version = "0.3.0-pre.5" }
+turso_node = { path = "bindings/javascript", version = "0.3.0-pre.5" }
+limbo_completion = { path = "extensions/completion", version = "0.3.0-pre.5" }
+turso_core = { path = "core", version = "0.3.0-pre.5" }
+turso_sync_engine = { path = "sync/engine", version = "0.3.0-pre.5" }
+limbo_crypto = { path = "extensions/crypto", version = "0.3.0-pre.5" }
+limbo_csv = { path = "extensions/csv", version = "0.3.0-pre.5" }
+turso_ext = { path = "extensions/core", version = "0.3.0-pre.5" }
+turso_ext_tests = { path = "extensions/tests", version = "0.3.0-pre.5" }
+limbo_ipaddr = { path = "extensions/ipaddr", version = "0.3.0-pre.5" }
+turso_macros = { path = "macros", version = "0.3.0-pre.5" }
+limbo_percentile = { path = "extensions/percentile", version = "0.3.0-pre.5" }
+limbo_regexp = { path = "extensions/regexp", version = "0.3.0-pre.5" }
+limbo_uuid = { path = "extensions/uuid", version = "0.3.0-pre.5" }
+turso_parser = { path = "parser", version = "0.3.0-pre.5" }
+limbo_fuzzy = { path = "extensions/fuzzy", version = "0.3.0-pre.5" }
 sql_generation = { path = "sql_generation" }
 strum = { version = "0.26", features = ["derive"] }
 strum_macros = "0.26"

{pyturso-0.3.0rc4 → pyturso-0.3.0rc5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyturso
-Version: 0.3.0rc4
+Version: 0.3.0rc5
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pyturso-0.3.0rc4 → pyturso-0.3.0rc5}/bindings/python/src/lib.rs

@@ -317,7 +317,7 @@ impl Drop for Connection {
 #[allow(clippy::arc_with_non_send_sync)]
 #[pyfunction(signature = (path))]
 pub fn connect(path: &str) -> Result<Connection> {
-    match turso_core::Connection::from_uri(path, true, false, false, false, false) {
+    match turso_core::Connection::from_uri(path, true, false, false, false, false, false) {
         Ok((io, conn)) => Ok(Connection { conn, _io: io }),
         Err(e) => Err(PyErr::new::<ProgrammingError, _>(format!(
             "Failed to create connection: {e:?}"

{pyturso-0.3.0rc4 → pyturso-0.3.0rc5}/core/Cargo.toml

@@ -57,7 +57,6 @@ regex-syntax = { workspace = true, default-features = false, features = [
     "unicode",
 ] }
 chrono = { workspace = true, default-features = false, features = ["clock"] }
-julian_day_converter = "0.4.5"
 rand = { workspace = true }
 libm = "0.2"
 turso_macros = { workspace = true }
@@ -84,6 +83,8 @@ twox-hash = "2.1.1"
 intrusive-collections = "0.9.7"
 roaring = "0.11.2"
 simsimd = "6.5.3"
+arc-swap = "1.7"
+rustc-hash = "2.0"
 
 [build-dependencies]
 chrono = { workspace = true, default-features = false }

{pyturso-0.3.0rc4 → pyturso-0.3.0rc5}/core/error.rs

@@ -163,6 +163,7 @@ impl From<turso_ext::ResultCode> for LimboError {
 
 pub const SQLITE_CONSTRAINT: usize = 19;
 pub const SQLITE_CONSTRAINT_PRIMARYKEY: usize = SQLITE_CONSTRAINT | (6 << 8);
+#[allow(dead_code)]
 pub const SQLITE_CONSTRAINT_FOREIGNKEY: usize = SQLITE_CONSTRAINT | (7 << 8);
 pub const SQLITE_CONSTRAINT_NOTNULL: usize = SQLITE_CONSTRAINT | (5 << 8);
 pub const SQLITE_FULL: usize = 13; // we want this in autoincrement - incase if user inserts max allowed int

{pyturso-0.3.0rc4 → pyturso-0.3.0rc5}/core/ext/mod.rs

@@ -1,6 +1,11 @@
 #[cfg(feature = "fs")]
 mod dynamic;
 mod vtab_xconnect;
+use crate::index_method::backing_btree::BackingBtreeIndexMethod;
+use crate::index_method::toy_vector_sparse_ivf::VectorSparseInvertedIndexMethod;
+use crate::index_method::{
+    BACKING_BTREE_INDEX_METHOD_NAME, TOY_VECTOR_SPARSE_IVF_INDEX_METHOD_NAME,
+};
 use crate::schema::{Schema, Table};
 #[cfg(all(target_os = "linux", feature = "io_uring", not(miri)))]
 use crate::UringIO;
@@ -162,6 +167,17 @@ impl Database {
     /// Register any built-in extensions that can be stored on the Database so we do not have
     /// to register these once-per-connection, and the connection can just extend its symbol table
     pub fn register_global_builtin_extensions(&self) -> Result<(), String> {
+        {
+            let mut syms = self.builtin_syms.write();
+            syms.index_methods.insert(
+                TOY_VECTOR_SPARSE_IVF_INDEX_METHOD_NAME.to_string(),
+                Arc::new(VectorSparseInvertedIndexMethod),
+            );
+            syms.index_methods.insert(
+                BACKING_BTREE_INDEX_METHOD_NAME.to_string(),
+                Arc::new(BackingBtreeIndexMethod),
+            );
+        }
         let syms = self.builtin_syms.data_ptr();
         // Pass the mutex pointer and the appropriate handler
         let schema_mutex_ptr = &self.schema as *const Mutex<Arc<Schema>> as *mut Mutex<Arc<Schema>>;

{pyturso-0.3.0rc4 → pyturso-0.3.0rc5}/core/functions/datetime.rs

@@ -348,30 +348,35 @@ pub fn exec_julianday(values: &[Register]) -> Value {
 }
 
 fn to_julian_day_exact(dt: &NaiveDateTime) -> f64 {
-    let year = dt.year();
-    let month = dt.month() as i32;
-    let day = dt.day() as i32;
-    let (adjusted_year, adjusted_month) = if month <= 2 {
-        (year - 1, month + 12)
-    } else {
-        (year, month)
-    };
+    // SQLite's computeJD algorithm
+    let mut y = dt.year();
+    let mut m = dt.month() as i32;
+    let d = dt.day() as i32;
+
+    if m <= 2 {
+        y -= 1;
+        m += 12;
+    }
+
+    let a = (y + 4800) / 100;
+    let b = 38 - a + (a / 4);
+    let x1 = 36525 * (y + 4716) / 100;
+    let x2 = 306001 * (m + 1) / 10000;
+
+    // iJD = (sqlite3_int64)((X1 + X2 + D + B - 1524.5) * 86400000)
+    let jd_days = (x1 + x2 + d + b) as f64 - 1524.5;
+    let mut i_jd = (jd_days * 86400000.0) as i64;
+
+    // Add time component in milliseconds
+    // iJD += h*3600000 + m*60000 + (sqlite3_int64)(s*1000 + 0.5)
+    let h_ms = dt.hour() as i64 * 3600000;
+    let m_ms = dt.minute() as i64 * 60000;
+    let s_ms = (dt.second() as f64 * 1000.0 + dt.nanosecond() as f64 / 1_000_000.0 + 0.5) as i64;
 
-    let a = adjusted_year / 100;
-    let b = 2 - a + a / 4;
-    let jd_days = (365.25 * ((adjusted_year + 4716) as f64)).floor()
-        + (30.6001 * ((adjusted_month + 1) as f64)).floor()
-        + (day as f64)
-        + (b as f64)
-        - 1524.5;
-
-    let seconds = dt.hour() as f64 * 3600.0
-        + dt.minute() as f64 * 60.0
-        + dt.second() as f64
-        + (dt.nanosecond() as f64) / 1_000_000_000.0;
-
-    let jd_fraction = seconds / 86400.0;
-    jd_days + jd_fraction
+    i_jd += h_ms + m_ms + s_ms;
+
+    // Convert back to floating point JD
+    i_jd as f64 / 86400000.0
 }
 
 pub fn exec_unixepoch(time_value: &Value) -> Result<Value> {
@@ -490,7 +495,58 @@ fn get_date_time_from_time_value_float(value: f64) -> Option<NaiveDateTime> {
     if value.is_infinite() || value.is_nan() || !is_julian_day_value(value) {
         return None;
     }
-    julian_day_converter::julian_day_to_datetime(value).ok()
+    julian_day_to_datetime(value).ok()
+}
+
+/// Convert a Julian Day number (as f64) to a NaiveDateTime
+/// This uses SQLite's algorithm which converts to integer milliseconds first
+/// to preserve precision, then converts back to date/time components.
+fn julian_day_to_datetime(jd: f64) -> Result<NaiveDateTime> {
+    // SQLite approach: Convert JD to integer milliseconds
+    // iJD = (sqlite3_int64)(jd * 86400000.0 + 0.5)
+    let i_jd = (jd * 86400000.0 + 0.5) as i64;
+
+    // Compute the date (Year, Month, Day) from iJD
+    // Z = (int)((iJD + 43200000)/86400000)
+    let z = ((i_jd + 43200000) / 86400000) as i32;
+
+    // SQLite's algorithm from computeYMD
+    let alpha = ((z as f64 + 32044.75) / 36524.25) as i32 - 52;
+    let a = z + 1 + alpha - ((alpha + 100) / 4) + 25;
+    let b = a + 1524;
+    let c = ((b as f64 - 122.1) / 365.25) as i32;
+    let d = (36525 * (c & 32767)) / 100;
+    let e = ((b - d) as f64 / 30.6001) as i32;
+    let x1 = (30.6001 * e as f64) as i32;
+
+    let day = (b - d - x1) as u32;
+    let month = if e < 14 { e - 1 } else { e - 13 } as u32;
+    let year = if month > 2 { c - 4716 } else { c - 4715 };
+
+    // Compute the time (Hour, Minute, Second) from iJD
+    // day_ms = (int)((iJD + 43200000) % 86400000)
+    let day_ms = ((i_jd + 43200000) % 86400000) as i32;
+
+    // s = (day_ms % 60000) / 1000.0
+    let s_millis = day_ms % 60000;
+    let seconds = (s_millis / 1000) as u32;
+    let millis = (s_millis % 1000) as u32;
+
+    // day_min = day_ms / 60000
+    let day_min = day_ms / 60000;
+    let minutes = (day_min % 60) as u32;
+    let hours = (day_min / 60) as u32;
+
+    // Create the date
+    let date = NaiveDate::from_ymd_opt(year, month, day)
+        .ok_or_else(|| crate::LimboError::InternalError("Invalid date".to_string()))?;
+
+    // Create time with millisecond precision converted to nanoseconds
+    let nanos = millis * 1_000_000;
+    let time = NaiveTime::from_hms_nano_opt(hours, minutes, seconds, nanos)
+        .ok_or_else(|| crate::LimboError::InternalError("Invalid time".to_string()))?;
+
+    Ok(NaiveDateTime::new(date, time))
 }
 
 fn is_leap_second(dt: &NaiveDateTime) -> bool {
@@ -1584,17 +1640,15 @@ mod tests {
         assert_eq!(weekday_sunday_based(&dt), 5);
     }
 
-    #[allow(deprecated)]
     #[test]
     fn test_apply_modifier_julianday() {
-        use julian_day_converter::*;
-
         let dt = create_datetime(2000, 1, 1, 12, 0, 0);
-        let julian_day = &dt.to_jd();
-        let mut dt_result = NaiveDateTime::default();
-        if let Some(ndt) = JulianDay::from_jd(*julian_day) {
-            dt_result = ndt;
-        }
+
+        // Convert datetime to julian day using our implementation
+        let julian_day_value = to_julian_day_exact(&dt);
+
+        // Convert back
+        let dt_result = julian_day_to_datetime(julian_day_value).unwrap();
         assert_eq!(dt_result, dt);
     }