Merge pull request tursodatabase#1970 from tursodatabase/libsql-disable-checkpoint-downgrade

Libsql disable checkpoint downgrade

Author: sivukhin

libsql-ffi/Cargo.toml

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

libsql-ffi/build.rs

@@ -281,6 +281,10 @@ pub fn build_bundled(out_dir: &str, out_path: &Path) {
         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/bundled/SQLite3MultipleCiphers/src/sqlite3.c

@@ -69644,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
     }
   }
 

libsql-ffi/bundled/bindings/bindgen.rs

@@ -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" {
@@ -2506,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" {
@@ -3573,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/src/sqlite3-sqlean-generated.c

@@ -0,0 +1,39 @@
+// Generated by build.rs
+
+
+#include "sqlite3.c"
+SQLITE_EXTENSION_INIT1
+
+#include "crypto/extension.h"
+#include "fuzzy/extension.h"
+#include "math/extension.h"
+#include "stats/extension.h"
+#include "text/extension.h"
+#include "uuid/extension.h"
+
+#include "sqlean.h"
+
+static void sqlean_version(sqlite3_context* context, int argc, sqlite3_value** argv) {
+    sqlite3_result_text(context, SQLEAN_VERSION, -1, SQLITE_STATIC);
+}
+
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int sqlite3_sqlean_init(sqlite3* db, char** errmsg_ptr, const sqlite3_api_routines* api) {
+    (void)errmsg_ptr;
+    SQLITE_EXTENSION_INIT2(api);
+    static const int flags = SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC;
+    sqlite3_create_function(db, "sqlean_version", 0, flags, 0, sqlean_version, 0, 0);
+    crypto_init(db);
+    fuzzy_init(db);
+    math_init(db);
+    stats_init(db);
+    text_init(db);
+    uuid_init(db);
+    return SQLITE_OK;
+}
+
+int core_init(const char* dummy) {
+    return sqlite3_auto_extension((void*)sqlite3_sqlean_init);
+}

libsql-ffi/bundled/src/sqlite3.c

@@ -69644,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
     }
   }
 

libsql-sqlite3/src/wal.c

@@ -4131,13 +4131,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
     }
   }