Merge branch 'tursodatabase:main' into main

Author: kunjee17

.github/workflows/golang-bindings.yml

@@ -68,8 +68,7 @@ jobs:
         path: "go-libsql"
 
     - name: Copy sql-experimental library to go-libsql
-      run: cp target/release/libsql_experimental.a go-libsql/lib/darwin_amd64/
-           && cp target/release/libsql_experimental.a go-libsql/lib/darwin_arm64/
+      run: cp target/release/libsql_experimental.a go-libsql/lib/darwin_arm64/
            && cp target/release/libsql_experimental.a go-libsql/lib/linux_amd64/
            && cp target/release/libsql_experimental.a go-libsql/lib/linux_arm64/
            && cp bindings/c/include/libsql.h go-libsql/lib/include/

Cargo.lock

@@ -720,13 +720,13 @@ pub unsafe extern "C" fn libsql_query_stmt(
         Ok(rows) => {
             let rows = Box::leak(Box::new(libsql_rows { result: rows }));
             *out_rows = libsql_rows_t::from(rows);
+            0
         }
         Err(e) => {
             set_err_msg(format!("Error executing statement: {}", e), out_err_msg);
-            return 1;
+            1
         }
-    };
-    0
+    }
 }
 
 #[no_mangle]
@@ -791,13 +791,13 @@ pub unsafe extern "C" fn libsql_query(
         Ok(rows) => {
             let rows = Box::leak(Box::new(libsql_rows { result: rows }));
             *out_rows = libsql_rows_t::from(rows);
+            0
         }
         Err(e) => {
             set_err_msg(format!("Error executing statement: {}", e), out_err_msg);
-            return 1;
+            1
         }
-    };
-    0
+    }
 }
 
 #[no_mangle]

bindings/c/src/lib.rs

@@ -43,3 +43,4 @@ sqlean-extensions = [
     "sqlean-extension-stats",
     "sqlean-extension-text"
 ]
+libsql-disable-checkpoint-downgrade = []

libsql-ffi/Cargo.toml

@@ -274,12 +274,17 @@ pub fn build_bundled(out_dir: &str, out_path: &Path) {
         cfg.file(&sqlean);
 
         cfg.include(format!("{BUNDLED_DIR}/sqlean/"));
+        cfg.include(format!("{BUNDLED_DIR}/src/"));
     }
 
     if cfg!(feature = "wasmtime-bindings") {
         cfg.flag("-DLIBSQL_ENABLE_WASM_RUNTIME=1");
     }
 
+    if cfg!(feature = "libsql-disable-checkpoint-downgrade") {
+        cfg.flag("-DLIBSQL_DISABLE_CHECKPOINT_DOWNGRADE=1");
+    }
+
     if cfg!(feature = "bundled-sqlcipher") {
         cfg.flag("-DSQLITE_HAS_CODEC").flag("-DSQLITE_TEMP_STORE=2");
 

libsql-ffi/build.rs

@@ -5779,6 +5779,8 @@ SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt);
 SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
 
 
+SQLITE_API void libsql_stmt_interrupt(sqlite3_stmt *stmt);
+
 /*
 ** CAPI3REF: Create Or Redefine SQL Functions
 ** KEYWORDS: {function creation routines}
@@ -10953,15 +10955,6 @@ SQLITE_API void *libsql_close_hook(sqlite3 *db, void (*xClose)(void *pCtx, sqlit
 */
 SQLITE_API int libsql_wal_disable_checkpoint(sqlite3 *db);
 
-/*
-** CAPI3REF: Get the checkpoint sequence counter of the WAL file
-** METHOD: sqlite3
-**
-** ^The [libsql_wal_checkpoint_seq_count(D,P)] interface returns the checkpoint sequence counter
-** of the WAL file for [database connection] D into *P.
-*/
-SQLITE_API int libsql_wal_checkpoint_seq_count(sqlite3 *db, unsigned int *pnCkpt);
-
 /*
 ** CAPI3REF: Get the number of frames in the WAL file
 ** METHOD: sqlite3
@@ -14045,9 +14038,6 @@ typedef struct libsql_wal_methods {
   ** response to a ROLLBACK TO command. */
   int (*xSavepointUndo)(wal_impl* pWal, unsigned int *aWalData);
 
-  /* Return the current checkpoint generation in the WAL file. */
-  int (*xCheckpointSeqCount)(wal_impl* pWal, unsigned int *pnCkpt);
-
   /* Return the number of frames in the WAL */
   int (*xFrameCount)(wal_impl* pWal, int, unsigned int *);
 
@@ -24207,6 +24197,7 @@ struct Vdbe {
   int nScan;              /* Entries in aScan[] */
   ScanStatus *aScan;      /* Scan definitions for sqlite3_stmt_scanstatus() */
 #endif
+  u8 isInterrupted;      /* True if the statement has been interrupted */
 };
 
 void libsql_inc_row_read(Vdbe *p, int count);
@@ -57366,9 +57357,6 @@ typedef struct libsql_wal_methods {
   ** response to a ROLLBACK TO command. */
   int (*xSavepointUndo)(wal_impl* pWal, unsigned int *aWalData);
 
-  /* Return the current checkpoint generation in the WAL file. */
-  int (*xCheckpointSeqCount)(wal_impl* pWal, unsigned int *pnCkpt);
-
   /* Return the number of frames in the WAL */
   int (*xFrameCount)(wal_impl* pWal, int, unsigned int *);
 
@@ -65297,18 +65285,6 @@ SQLITE_PRIVATE int sqlite3PagerCloseWal(Pager *pPager, sqlite3 *db){
   return rc;
 }
 
-/**
-** Return the current checkpoint generation in the WAL file.
-**/
-SQLITE_PRIVATE int sqlite3PagerWalCheckpointSeqCount(Pager *pPager, unsigned int *pnCkpt){
-  if( pagerUseWal(pPager) ){
-    return pPager->wal->methods.xCheckpointSeqCount(pPager->wal->pData, pnCkpt);
-  } else {
-    *pnCkpt = 0;
-    return SQLITE_OK;
-  }
-}
-
 /**
 ** Return the number of frames in the WAL file.
 **
@@ -67671,9 +67647,11 @@ static int walCheckpoint(
           if (xCb) {
               rc = (xCb)(pCbData, mxSafeFrame, NULL, 0, 0, 0);
           }
-          i64 szDb = pWal->hdr.nPage*(i64)szPage;
-          testcase( IS_BIG_INT(szDb) );
-          rc = sqlite3OsTruncate(pWal->pDbFd, szDb);
+          if( rc==SQLITE_OK ){
+            i64 szDb = pWal->hdr.nPage*(i64)szPage;
+            testcase( IS_BIG_INT(szDb) );
+            rc = sqlite3OsTruncate(pWal->pDbFd, szDb);
+          }
           if( rc==SQLITE_OK ){
             rc = sqlite3OsSync(pWal->pDbFd, CKPT_SYNC_FLAGS(sync_flags));
           }
@@ -69561,11 +69539,6 @@ static int walFrames(
   return rc;
 }
 
-SQLITE_PRIVATE int sqlite3WalCheckpointSeqCount(Wal *pWal, unsigned int *pnCkpt){
-  *pnCkpt = pWal->nCkpt;
-  return SQLITE_OK;
-}
-
 SQLITE_PRIVATE int sqlite3WalFrameCount(Wal *pWal, int locked, unsigned int *pnFrames){
   int rc = SQLITE_OK;
   if( locked==0 ) {
@@ -69671,13 +69644,21 @@ static int sqlite3WalCheckpoint(
     */
     if( eMode!=SQLITE_CHECKPOINT_PASSIVE ){
       rc = walBusyLock(pWal, xBusy2, pBusyArg, WAL_WRITE_LOCK, 1);
+#ifndef LIBSQL_DISABLE_CHECKPOINT_DOWNGRADE
       if( rc==SQLITE_OK ){
         pWal->writeLock = 1;
       }else if( rc==SQLITE_BUSY ){
         eMode2 = SQLITE_CHECKPOINT_PASSIVE;
         xBusy2 = 0;
         rc = SQLITE_OK;
       }
+#else
+      // checkpoint downgrade can be undesirable behaviour especially in case of custom VWal implementation
+      // LIBSQL_DISABLE_CHECKPOINT_DOWNGRADE compile time option disables downgrade of checkpoint mode
+      if( rc==SQLITE_OK ){
+        pWal->writeLock = 1;
+      }
+#endif
     }
   }
 
@@ -70085,7 +70066,6 @@ static int sqlite3WalOpen(
     out->methods.xUndo = (int (*)(wal_impl *, int (*)(void *, unsigned int), void *))sqlite3WalUndo;
     out->methods.xSavepoint = (void (*)(wal_impl *, unsigned int *))sqlite3WalSavepoint;
     out->methods.xSavepointUndo = (int (*)(wal_impl *, unsigned int *))sqlite3WalSavepointUndo;
-    out->methods.xCheckpointSeqCount = (int (*)(wal_impl *, unsigned int *))sqlite3WalCheckpointSeqCount;
     out->methods.xFrameCount = (int (*)(wal_impl *, int, unsigned int *))sqlite3WalFrameCount;
     out->methods.xFrames = (int (*)(wal_impl *, int, libsql_pghdr *, unsigned int, int, int, int *))sqlite3WalFrames;
     out->methods.xCheckpoint = (int (*)(wal_impl *, sqlite3 *, int, int (*)(void *), void *, int, int, unsigned char *, int *, int *, int (*)(void*, int, const unsigned char*, int, int, int), void*))sqlite3WalCheckpoint;
@@ -89506,6 +89486,7 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
 #ifdef SQLITE_DEBUG
   p->nWrite = 0;
 #endif
+  p->isInterrupted = 0;
 
   /* Save profiling information from this VDBE run.
   */
@@ -92310,6 +92291,18 @@ static int sqlite3Step(Vdbe *p){
   return (rc&db->errMask);
 }
 
+/*
+** Interrupt the statement.
+*/
+void libsql_stmt_interrupt(sqlite3_stmt *pStmt){
+  Vdbe *v = (Vdbe*)pStmt;  /* the prepared statement */
+  if( vdbeSafetyNotNull(v) ){
+    (void)SQLITE_MISUSE_BKPT;
+    return;
+  }
+  v->isInterrupted = 1;
+}
+
 /*
 ** This is the top-level implementation of sqlite3_step().  Call
 ** sqlite3Step() to do most of the work.  If a schema error occurs,
@@ -92325,6 +92318,12 @@ SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){
     return SQLITE_MISUSE_BKPT;
   }
   db = v->db;
+  if( v->isInterrupted ){
+    rc = SQLITE_INTERRUPT;
+    v->rc = rc;
+    db->errCode = rc;
+    return rc;
+  }
   sqlite3_mutex_enter(db->mutex);
   while( (rc = sqlite3Step(v))==SQLITE_SCHEMA
          && cnt++ < SQLITE_MAX_SCHEMA_RETRY ){
@@ -183240,30 +183239,6 @@ int libsql_wal_disable_checkpoint(sqlite3 *db) {
   return SQLITE_OK;
 }
 
-/*
-** Return the checkpoint sequence counter of the given database.
-*/
-int libsql_wal_checkpoint_seq_count(sqlite3 *db, unsigned int *pnCkpt) {
-  int rc = SQLITE_OK;
-  Pager *pPager;
-
-#ifdef SQLITE_OMIT_WAL
-  *pnFrame = 0;
-  return SQLITE_OK;
-#else
-#ifdef SQLITE_ENABLE_API_ARMOR
-  if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
-#endif
-
-  sqlite3_mutex_enter(db->mutex);
-  pPager = sqlite3BtreePager(db->aDb[0].pBt);
-  rc = sqlite3PagerWalCheckpointSeqCount(pPager, pnCkpt);
-  sqlite3Error(db, rc);
-  sqlite3_mutex_leave(db->mutex);
-  return rc;
-#endif
-}
-
 /*
 ** Return the number of frames in the WAL of the given database.
 */

libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c

@@ -940,7 +940,7 @@ extern "C" {
 extern "C" {
     pub fn sqlite3_vmprintf(
         arg1: *const ::std::os::raw::c_char,
-        arg2: va_list,
+        arg2: *mut __va_list_tag,
     ) -> *mut ::std::os::raw::c_char;
 }
 extern "C" {
@@ -956,7 +956,7 @@ extern "C" {
         arg1: ::std::os::raw::c_int,
         arg2: *mut ::std::os::raw::c_char,
         arg3: *const ::std::os::raw::c_char,
-        arg4: va_list,
+        arg4: *mut __va_list_tag,
     ) -> *mut ::std::os::raw::c_char;
 }
 extern "C" {
@@ -1538,6 +1538,9 @@ extern "C" {
 extern "C" {
     pub fn sqlite3_reset(pStmt: *mut sqlite3_stmt) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn libsql_stmt_interrupt(stmt: *mut sqlite3_stmt);
+}
 extern "C" {
     pub fn sqlite3_create_function(
         db: *mut sqlite3,
@@ -2503,7 +2506,7 @@ extern "C" {
     pub fn sqlite3_str_vappendf(
         arg1: *mut sqlite3_str,
         zFormat: *const ::std::os::raw::c_char,
-        arg2: va_list,
+        arg2: *mut __va_list_tag,
     );
 }
 extern "C" {
@@ -2866,12 +2869,6 @@ extern "C" {
 extern "C" {
     pub fn libsql_wal_disable_checkpoint(db: *mut sqlite3) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn libsql_wal_checkpoint_seq_count(
-        db: *mut sqlite3,
-        pnCkpt: *mut ::std::os::raw::c_uint,
-    ) -> ::std::os::raw::c_int;
-}
 extern "C" {
     pub fn libsql_wal_frame_count(
         arg1: *mut sqlite3,
@@ -3361,12 +3358,6 @@ pub struct libsql_wal_methods {
             aWalData: *mut ::std::os::raw::c_uint,
         ) -> ::std::os::raw::c_int,
     >,
-    pub xCheckpointSeqCount: ::std::option::Option<
-        unsafe extern "C" fn(
-            pWal: *mut wal_impl,
-            pnCkpt: *mut ::std::os::raw::c_uint,
-        ) -> ::std::os::raw::c_int,
-    >,
     pub xFrameCount: ::std::option::Option<
         unsafe extern "C" fn(
             pWal: *mut wal_impl,
@@ -3582,4 +3573,12 @@ extern "C" {
 extern "C" {
     pub static sqlite3_wal_manager: libsql_wal_manager;
 }
-pub type __builtin_va_list = *mut ::std::os::raw::c_char;
+pub type __builtin_va_list = [__va_list_tag; 1usize];
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct __va_list_tag {
+    pub gp_offset: ::std::os::raw::c_uint,
+    pub fp_offset: ::std::os::raw::c_uint,
+    pub overflow_arg_area: *mut ::std::os::raw::c_void,
+    pub reg_save_area: *mut ::std::os::raw::c_void,
+}

libsql-ffi/bundled/bindings/bindgen.rs

@@ -1555,6 +1555,9 @@ extern "C" {
 extern "C" {
     pub fn sqlite3_reset(pStmt: *mut sqlite3_stmt) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn libsql_stmt_interrupt(stmt: *mut sqlite3_stmt);
+}
 extern "C" {
     pub fn sqlite3_create_function(
         db: *mut sqlite3,
@@ -2883,12 +2886,6 @@ extern "C" {
 extern "C" {
     pub fn libsql_wal_disable_checkpoint(db: *mut sqlite3) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn libsql_wal_checkpoint_seq_count(
-        db: *mut sqlite3,
-        pnCkpt: *mut ::std::os::raw::c_uint,
-    ) -> ::std::os::raw::c_int;
-}
 extern "C" {
     pub fn libsql_wal_frame_count(
         arg1: *mut sqlite3,
@@ -3873,12 +3870,6 @@ pub struct libsql_wal_methods {
             aWalData: *mut ::std::os::raw::c_uint,
         ) -> ::std::os::raw::c_int,
     >,
-    pub xCheckpointSeqCount: ::std::option::Option<
-        unsafe extern "C" fn(
-            pWal: *mut wal_impl,
-            pnCkpt: *mut ::std::os::raw::c_uint,
-        ) -> ::std::os::raw::c_int,
-    >,
     pub xFrameCount: ::std::option::Option<
         unsafe extern "C" fn(
             pWal: *mut wal_impl,