Merge branch 'main' into ptrmap-data-corruption

Author: ddwalias

README.md

@@ -10,9 +10,10 @@
 <p align="center">
   <a title="Build Status" target="_blank" href="https://github.com/tursodatabase/turso/actions/workflows/rust.yml"><img src="https://img.shields.io/github/actions/workflow/status/tursodatabase/turso/rust.yml?style=flat-square"></a>
   <a title="Releases" target="_blank" href="https://github.com/tursodatabase/turso/releases"><img src="https://img.shields.io/github/release/tursodatabase/turso?style=flat-square&color=9CF"></a>
-  <a title="Rust" target="_blank" href="https://crates.io/crates/turso"><img alt="PyPI" src="https://img.shields.io/crates/v/turso"></a>
-  <a title="JavaScript" target="_blank" href="https://www.npmjs.com/package/@tursodatabase/database"><img alt="PyPI" src="https://img.shields.io/npm/v/@tursodatabase/database"></a>
+  <a title="Rust" target="_blank" href="https://crates.io/crates/turso"><img alt="Crate" src="https://img.shields.io/crates/v/turso"></a>
+  <a title="JavaScript" target="_blank" href="https://www.npmjs.com/package/@tursodatabase/database"><img alt="NPM" src="https://img.shields.io/npm/v/@tursodatabase/database"></a>
   <a title="Python" target="_blank" href="https://pypi.org/project/pyturso/"><img alt="PyPI" src="https://img.shields.io/pypi/v/pyturso"></a>
+  <a title="Java" target="_blank" href="https://central.sonatype.com/artifact/tech.turso/turso"><img alt="Maven Central" src="https://img.shields.io/maven-central/v/tech.turso/turso"></a>
   <a title="MIT" target="_blank" href="https://github.com/tursodatabase/turso/blob/main/LICENSE.md"><img src="http://img.shields.io/badge/license-MIT-orange.svg?style=flat-square"></a>
   <br>
   <a title="GitHub Pull Requests" target="_blank" href="https://github.com/tursodatabase/turso/pulls"><img src="https://img.shields.io/github/issues-pr-closed/tursodatabase/turso.svg?style=flat-square&color=FF9966"></a>
@@ -398,12 +399,14 @@ Even during Alpha, if you find a bug that leads to a data corruption and demonst
 how our simulator failed to catch it, you can get up to $1,000.00. As the project matures we will
 increase the size of the prize, and the scope of the bugs.
 
-More details [here](https://turso.algora.io).
+List of rewarded cases:
 
-You can see an example of an awarded case on [#2049](https://github.com/tursodatabase/turso/issues/2049).
+* B-Tree interior cell replacement issue in btrees with depth >=3 ([#2106](https://github.com/tursodatabase/turso/issues/2106))
+* Don't allow autovacuum to be flipped on non-empty databases ([#3830](https://github.com/tursodatabase/turso/pull/3830))
 
-Turso core staff are not eligible.
+More details [here](https://turso.algora.io).
 
+Turso core staff are not eligible.
 
 ## FAQ
 

bindings/java/src/main/java/tech/turso/jdbc4/JDBC4PreparedStatement.java

@@ -189,7 +189,47 @@ public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQ
 
   @Override
   public void setObject(int parameterIndex, Object x) throws SQLException {
-    // TODO
+    requireNonNull(this.statement);
+    if (x == null) {
+      this.statement.bindNull(parameterIndex);
+      return;
+    }
+    if (x instanceof String) {
+      setString(parameterIndex, (String) x);
+    } else if (x instanceof Integer) {
+      setInt(parameterIndex, (Integer) x);
+    } else if (x instanceof Long) {
+      setLong(parameterIndex, (Long) x);
+    } else if (x instanceof Boolean) {
+      setBoolean(parameterIndex, (Boolean) x);
+    } else if (x instanceof Double) {
+      setDouble(parameterIndex, (Double) x);
+    } else if (x instanceof Float) {
+      setFloat(parameterIndex, (Float) x);
+    } else if (x instanceof Byte) {
+      setByte(parameterIndex, (Byte) x);
+    } else if (x instanceof Short) {
+      setShort(parameterIndex, (Short) x);
+    } else if (x instanceof byte[]) {
+      setBytes(parameterIndex, (byte[]) x);
+    } else if (x instanceof Timestamp) {
+      setTimestamp(parameterIndex, (Timestamp) x);
+    } else if (x instanceof Date) {
+      setDate(parameterIndex, (Date) x);
+    } else if (x instanceof Time) {
+      setTime(parameterIndex, (Time) x);
+    } else if (x instanceof BigDecimal) {
+      setBigDecimal(parameterIndex, (BigDecimal) x);
+    } else if (x instanceof Blob
+        || x instanceof Clob
+        || x instanceof InputStream
+        || x instanceof Reader) {
+      throw new SQLException(
+          "setObject does not yet support LOB or Stream types because the corresponding set methods are unimplemented. Type found: "
+              + x.getClass().getName());
+    } else {
+      throw new SQLException("Unsupported object type in setObject: " + x.getClass().getName());
+    }
   }
 
   @Override

bindings/java/src/test/java/tech/turso/jdbc4/JDBC4PreparedStatementTest.java

@@ -338,6 +338,56 @@ void testInsertMultipleTypes() throws SQLException {
     assertArrayEquals(new byte[] {4, 5, 6}, rs.getBytes(4));
   }
 
+  @Test
+  void testSetObjectCoversAllSupportedTypes() throws SQLException {
+    connection
+        .prepareStatement(
+            "CREATE TABLE test ("
+                + "col1 INTEGER, "
+                + "col2 REAL, "
+                + "col3 TEXT, "
+                + "col4 BLOB, "
+                + "col5 INTEGER, "
+                + "col6 TEXT, "
+                + "col7 TEXT, "
+                + "col8 TEXT, "
+                + "col9 TEXT"
+                + ")")
+        .execute();
+
+    PreparedStatement stmt =
+        connection.prepareStatement("INSERT INTO test VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
+
+    stmt.setObject(1, 42);
+    stmt.setObject(2, 3.141592d);
+    stmt.setObject(3, "string_value");
+    stmt.setObject(4, new byte[] {1, 2, 3});
+    stmt.setObject(5, 1L);
+    stmt.setObject(6, java.sql.Date.valueOf("2025-10-30"));
+    stmt.setObject(7, java.sql.Time.valueOf("10:45:00"));
+    stmt.setObject(8, java.sql.Timestamp.valueOf("2025-10-30 10:45:00"));
+    stmt.setObject(9, new java.math.BigDecimal("12345.6789"));
+
+    stmt.execute();
+
+    PreparedStatement stmt2 = connection.prepareStatement("SELECT * FROM test;");
+    ResultSet rs = stmt2.executeQuery();
+
+    assertTrue(rs.next());
+    assertEquals(42, rs.getInt(1));
+    assertEquals(3.141592d, rs.getDouble(2), 0.000001);
+    assertEquals("string_value", rs.getString(3));
+    assertArrayEquals(new byte[] {1, 2, 3}, rs.getBytes(4));
+    assertTrue(rs.getBoolean(5));
+    assertEquals(java.sql.Date.valueOf("2025-10-30"), rs.getDate(6));
+    assertEquals(java.sql.Time.valueOf("10:45:00"), rs.getTime(7));
+    assertEquals(java.sql.Timestamp.valueOf("2025-10-30 10:45:00"), rs.getTimestamp(8));
+    String decimalText = rs.getString(9);
+    assertEquals(
+        new java.math.BigDecimal("12345.6789").stripTrailingZeros(),
+        new java.math.BigDecimal(decimalText).stripTrailingZeros());
+  }
+
   @Test
   void execute_insert_should_return_number_of_inserted_elements() throws Exception {
     connection.prepareStatement("CREATE TABLE test (col INTEGER)").execute();

bindings/python/src/lib.rs

@@ -6,7 +6,7 @@ use std::cell::RefCell;
 use std::num::NonZeroUsize;
 use std::rc::Rc;
 use std::sync::Arc;
-use turso_core::Value;
+use turso_core::{DatabaseOpts, Value};
 
 mod errors;
 
@@ -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, false) {
+    match turso_core::Connection::from_uri(path, DatabaseOpts::default()) {
         Ok((io, conn)) => Ok(Connection { conn, _io: io }),
         Err(e) => Err(PyErr::new::<ProgrammingError, _>(format!(
             "Failed to create connection: {e:?}"

bindings/rust/Cargo.toml

@@ -10,18 +10,19 @@ repository.workspace = true
 description = "Turso Rust API"
 
 [features]
-default = ["experimental_indexes"]
+default = ["experimental_indexes", "mimalloc"]
 conn_raw_api = ["turso_core/conn_raw_api"]
 experimental_indexes = []
 antithesis = ["turso_core/antithesis"]
 tracing_release = ["turso_core/tracing_release"]
+mimalloc = ["dep:mimalloc"]
 
 [dependencies]
 turso_core = { workspace = true, features = ["io_uring"] }
 thiserror = { workspace = true }
 tracing-subscriber.workspace = true
 tracing.workspace = true
-mimalloc = { workspace = true }
+mimalloc = { workspace = true, optional = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }

bindings/rust/src/lib.rs

@@ -32,7 +32,7 @@
 //! # }
 //! ```
 
-#[cfg(all(not(target_family = "wasm"), not(miri)))]
+#[cfg(all(feature = "mimalloc", not(target_family = "wasm"), not(miri)))]
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 

cli/Cargo.toml

@@ -49,12 +49,13 @@ serde_json = "1.0"
 termimad = "0.30"
 include_dir = "0.7"
 rand = "0.8"
-mimalloc = { workspace = true }
+mimalloc = { workspace = true, optional = true }
 
 [features]
-default = ["io_uring"]
+default = ["io_uring", "mimalloc"]
 io_uring = ["turso_core/io_uring"]
 tracing_release = ["turso_core/tracing_release"]
+mimalloc = ["dep:mimalloc"]
 
 [build-dependencies]
 syntect = { git = "https://github.com/trishume/syntect.git", rev = "64644ffe064457265cbcee12a0c1baf9485ba6ee" }

cli/app.rs

@@ -32,7 +32,8 @@ use std::{
 use tracing_appender::non_blocking::WorkerGuard;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
 use turso_core::{
-    Connection, Database, LimboError, OpenFlags, QueryMode, Statement, StepResult, Value,
+    Connection, Database, DatabaseOpts, LimboError, OpenFlags, QueryMode, Statement, StepResult,
+    Value,
 };
 
 #[derive(Parser, Debug)]
@@ -80,6 +81,8 @@ pub struct Opts {
     pub experimental_encryption: bool,
     #[clap(long, help = "Enable experimental index method feature")]
     pub experimental_index_method: bool,
+    #[clap(long, help = "Enable experimental autovacuum feature")]
+    pub experimental_autovacuum: bool,
 }
 
 const PROMPT: &str = "turso> ";
@@ -186,15 +189,17 @@ impl Limbo {
             .as_ref()
             .map_or(":memory:".to_string(), |p| p.to_string_lossy().to_string());
         let indexes_enabled = opts.experimental_indexes.unwrap_or(true);
+
         let (io, conn) = if db_file.contains([':', '?', '&', '#']) {
             Connection::from_uri(
                 &db_file,
-                indexes_enabled,
-                opts.experimental_mvcc,
-                opts.experimental_views,
-                opts.experimental_strict,
-                opts.experimental_encryption,
-                opts.experimental_index_method,
+                DatabaseOpts::new()
+                    .with_indexes(indexes_enabled)
+                    .with_mvcc(opts.experimental_mvcc)
+                    .with_views(opts.experimental_views)
+                    .with_strict(opts.experimental_strict)
+                    .with_encryption(opts.experimental_encryption)
+                    .with_index_method(opts.experimental_index_method),
             )?
         } else {
             let flags = if opts.readonly {
@@ -213,6 +218,7 @@ impl Limbo {
                     .with_strict(opts.experimental_strict)
                     .with_encryption(opts.experimental_encryption)
                     .with_index_method(opts.experimental_index_method)
+                    .with_autovacuum(opts.experimental_autovacuum)
                     .turso_cli(),
                 None,
             )?;

cli/main.rs

@@ -16,7 +16,7 @@ use std::{
     sync::{atomic::Ordering, LazyLock},
 };
 
-#[cfg(all(not(target_family = "wasm"), not(miri)))]
+#[cfg(all(feature = "mimalloc", not(target_family = "wasm"), not(miri)))]
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 

cli/mcp_server.rs

@@ -408,7 +408,7 @@ impl TursoMcpServer {
 
         // Open the new database connection
         let conn = if path == ":memory:" || path.contains([':', '?', '&', '#']) {
-            match Connection::from_uri(&path, true, false, false, false, false, false) {
+            match Connection::from_uri(&path, DatabaseOpts::default()) {
                 Ok((_io, c)) => c,
                 Err(e) => return format!("Failed to open database '{path}': {e}"),
             }
@@ -417,7 +417,9 @@ impl TursoMcpServer {
                 &path,
                 None::<&str>,
                 OpenFlags::default(),
-                DatabaseOpts::new().with_indexes(true),
+                DatabaseOpts::new()
+                    .with_indexes(true)
+                    .with_autovacuum(false),
                 None,
             ) {
                 Ok((_io, db)) => match db.connect() {