libsql-ffi: Update SQLite bundle

Author: penberg

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

@@ -70,6 +70,7 @@
 **    src/sqlite3ext.h
 **    src/sqliteInt.h
 **    src/status.c
+**    src/test1.c
 **    src/test2.c
 **    src/test3.c
 **    src/test8.c
@@ -90201,7 +90202,7 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
 #ifdef SQLITE_DEBUG
   p->nWrite = 0;
 #endif
-  p->isInterrupted = 0;
+  AtomicStore(&p->isInterrupted, 0);
 
   /* Save profiling information from this VDBE run.
   */
@@ -93043,7 +93044,9 @@ void libsql_stmt_interrupt(sqlite3_stmt *pStmt){
     (void)SQLITE_MISUSE_BKPT;
     return;
   }
-  v->isInterrupted = 1;
+  /* Set atomically: this may be called from a different thread than the one
+  ** executing the statement, mirroring sqlite3_interrupt(). */
+  AtomicStore(&v->isInterrupted, 1);
 }
 
 /*
@@ -93061,7 +93064,7 @@ SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){
     return SQLITE_MISUSE_BKPT;
   }
   db = v->db;
-  if( v->isInterrupted ){
+  if( AtomicLoad(&v->isInterrupted) ){
     rc = SQLITE_INTERRUPT;
     v->rc = rc;
     db->errCode = rc;
@@ -95105,6 +95108,12 @@ SQLITE_API int sqlite3_search_count = 0;
 */
 #ifdef SQLITE_TEST
 SQLITE_API int sqlite3_interrupt_count = 0;
+/*
+** As above, but simulates a statement-level interrupt
+** (libsql_stmt_interrupt()) on the statement that is currently executing,
+** rather than a connection-wide sqlite3_interrupt().
+*/
+SQLITE_API int sqlite3_stmt_interrupt_count = 0;
 #endif
 
 /*
@@ -95928,7 +95937,9 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
   p->iCurrentTime = 0;
   assert( p->explain==0 );
   db->busyHandler.nBusy = 0;
-  if( AtomicLoad(&db->u1.isInterrupted) ) goto abort_due_to_interrupt;
+  if( AtomicLoad(&db->u1.isInterrupted) || AtomicLoad(&p->isInterrupted) ){
+    goto abort_due_to_interrupt;
+  }
   sqlite3VdbeIOTraceSql(p);
 #ifdef SQLITE_DEBUG
   sqlite3BeginBenignMalloc();
@@ -95997,6 +96008,12 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
         sqlite3_interrupt(db);
       }
     }
+    if( sqlite3_stmt_interrupt_count>0 ){
+      sqlite3_stmt_interrupt_count--;
+      if( sqlite3_stmt_interrupt_count==0 ){
+        libsql_stmt_interrupt((sqlite3_stmt*)p);
+      }
+    }
 #endif
 
     /* Sanity checking on other operands */
@@ -96118,7 +96135,9 @@ case OP_Goto: {             /* jump */
   ** checks on every opcode.  This helps sqlite3_step() to run about 1.5%
   ** faster according to "valgrind --tool=cachegrind" */
 check_for_interrupt:
-  if( AtomicLoad(&db->u1.isInterrupted) ) goto abort_due_to_interrupt;
+  if( AtomicLoad(&db->u1.isInterrupted) || AtomicLoad(&p->isInterrupted) ){
+    goto abort_due_to_interrupt;
+  }
 #ifndef SQLITE_OMIT_PROGRESS_CALLBACK
   /* Call the progress callback if it is configured and the required number
   ** of VDBE ops have been executed (either since this invocation of
@@ -104463,7 +104482,7 @@ default: {          /* This is really OP_Noop, OP_Explain */
   ** flag.
   */
 abort_due_to_interrupt:
-  assert( AtomicLoad(&db->u1.isInterrupted) );
+  assert( AtomicLoad(&db->u1.isInterrupted) || AtomicLoad(&p->isInterrupted) );
   rc = SQLITE_INTERRUPT;
   goto abort_due_to_error;
 }

libsql-ffi/bundled/src/sqlite3.c

@@ -70,6 +70,7 @@
 **    src/sqlite3ext.h
 **    src/sqliteInt.h
 **    src/status.c
+**    src/test1.c
 **    src/test2.c
 **    src/test3.c
 **    src/test8.c
@@ -90201,7 +90202,7 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
 #ifdef SQLITE_DEBUG
   p->nWrite = 0;
 #endif
-  p->isInterrupted = 0;
+  AtomicStore(&p->isInterrupted, 0);
 
   /* Save profiling information from this VDBE run.
   */
@@ -93043,7 +93044,9 @@ void libsql_stmt_interrupt(sqlite3_stmt *pStmt){
     (void)SQLITE_MISUSE_BKPT;
     return;
   }
-  v->isInterrupted = 1;
+  /* Set atomically: this may be called from a different thread than the one
+  ** executing the statement, mirroring sqlite3_interrupt(). */
+  AtomicStore(&v->isInterrupted, 1);
 }
 
 /*
@@ -93061,7 +93064,7 @@ SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){
     return SQLITE_MISUSE_BKPT;
   }
   db = v->db;
-  if( v->isInterrupted ){
+  if( AtomicLoad(&v->isInterrupted) ){
     rc = SQLITE_INTERRUPT;
     v->rc = rc;
     db->errCode = rc;
@@ -95105,6 +95108,12 @@ SQLITE_API int sqlite3_search_count = 0;
 */
 #ifdef SQLITE_TEST
 SQLITE_API int sqlite3_interrupt_count = 0;
+/*
+** As above, but simulates a statement-level interrupt
+** (libsql_stmt_interrupt()) on the statement that is currently executing,
+** rather than a connection-wide sqlite3_interrupt().
+*/
+SQLITE_API int sqlite3_stmt_interrupt_count = 0;
 #endif
 
 /*
@@ -95928,7 +95937,9 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
   p->iCurrentTime = 0;
   assert( p->explain==0 );
   db->busyHandler.nBusy = 0;
-  if( AtomicLoad(&db->u1.isInterrupted) ) goto abort_due_to_interrupt;
+  if( AtomicLoad(&db->u1.isInterrupted) || AtomicLoad(&p->isInterrupted) ){
+    goto abort_due_to_interrupt;
+  }
   sqlite3VdbeIOTraceSql(p);
 #ifdef SQLITE_DEBUG
   sqlite3BeginBenignMalloc();
@@ -95997,6 +96008,12 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
         sqlite3_interrupt(db);
       }
     }
+    if( sqlite3_stmt_interrupt_count>0 ){
+      sqlite3_stmt_interrupt_count--;
+      if( sqlite3_stmt_interrupt_count==0 ){
+        libsql_stmt_interrupt((sqlite3_stmt*)p);
+      }
+    }
 #endif
 
     /* Sanity checking on other operands */
@@ -96118,7 +96135,9 @@ case OP_Goto: {             /* jump */
   ** checks on every opcode.  This helps sqlite3_step() to run about 1.5%
   ** faster according to "valgrind --tool=cachegrind" */
 check_for_interrupt:
-  if( AtomicLoad(&db->u1.isInterrupted) ) goto abort_due_to_interrupt;
+  if( AtomicLoad(&db->u1.isInterrupted) || AtomicLoad(&p->isInterrupted) ){
+    goto abort_due_to_interrupt;
+  }
 #ifndef SQLITE_OMIT_PROGRESS_CALLBACK
   /* Call the progress callback if it is configured and the required number
   ** of VDBE ops have been executed (either since this invocation of
@@ -104463,7 +104482,7 @@ default: {          /* This is really OP_Noop, OP_Explain */
   ** flag.
   */
 abort_due_to_interrupt:
-  assert( AtomicLoad(&db->u1.isInterrupted) );
+  assert( AtomicLoad(&db->u1.isInterrupted) || AtomicLoad(&p->isInterrupted) );
   rc = SQLITE_INTERRUPT;
   goto abort_due_to_error;
 }