Skip to content

Commit

Permalink
libsql-ffi: Update bundled SQLite code
Browse files Browse the repository at this point in the history
  • Loading branch information
penberg committed Nov 26, 2024
1 parent c9217df commit e2e3a6e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 10 deletions.
15 changes: 10 additions & 5 deletions libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c
Original file line number Diff line number Diff line change
Expand Up @@ -183219,6 +183219,7 @@ int libsql_wal_frame_count(
sqlite3_mutex_enter(db->mutex);
pPager = sqlite3BtreePager(db->aDb[0].pBt);
rc = sqlite3PagerWalFrameCount(pPager, pnFrame);
sqlite3Error(db, rc);
sqlite3_mutex_leave(db->mutex);
return rc;
#endif
Expand All @@ -183244,12 +183245,13 @@ int libsql_wal_get_frame(
if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
#endif

sqlite3_mutex_enter(db->mutex);
pPager = sqlite3BtreePager(db->aDb[0].pBt);
rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf);
sqlite3_mutex_leave(db->mutex);
sqlite3_mutex_enter(db->mutex);
pPager = sqlite3BtreePager(db->aDb[0].pBt);
rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf);
sqlite3Error(db, rc);
sqlite3_mutex_leave(db->mutex);

return rc;
return rc;
#endif
}

Expand All @@ -183276,6 +183278,7 @@ int libsql_wal_insert_begin(sqlite3 *db) {
goto out_unlock;
}
out_unlock:
sqlite3Error(db, rc);
sqlite3_mutex_leave(db->mutex);
return rc;
}
Expand All @@ -183291,6 +183294,7 @@ int libsql_wal_insert_end(sqlite3 *db) {
goto out_unlock;
}
out_unlock:
sqlite3Error(db, rc);
sqlite3_mutex_leave(db->mutex);
return rc;
}
Expand Down Expand Up @@ -183322,6 +183326,7 @@ int libsql_wal_insert_frame(
goto out_unlock;
}
out_unlock:
sqlite3Error(db, rc);
sqlite3_mutex_leave(db->mutex);

return rc;
Expand Down
15 changes: 10 additions & 5 deletions libsql-ffi/bundled/src/sqlite3.c
Original file line number Diff line number Diff line change
Expand Up @@ -183219,6 +183219,7 @@ int libsql_wal_frame_count(
sqlite3_mutex_enter(db->mutex);
pPager = sqlite3BtreePager(db->aDb[0].pBt);
rc = sqlite3PagerWalFrameCount(pPager, pnFrame);
sqlite3Error(db, rc);
sqlite3_mutex_leave(db->mutex);
return rc;
#endif
Expand All @@ -183244,12 +183245,13 @@ int libsql_wal_get_frame(
if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
#endif

sqlite3_mutex_enter(db->mutex);
pPager = sqlite3BtreePager(db->aDb[0].pBt);
rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf);
sqlite3_mutex_leave(db->mutex);
sqlite3_mutex_enter(db->mutex);
pPager = sqlite3BtreePager(db->aDb[0].pBt);
rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf);
sqlite3Error(db, rc);
sqlite3_mutex_leave(db->mutex);

return rc;
return rc;
#endif
}

Expand All @@ -183276,6 +183278,7 @@ int libsql_wal_insert_begin(sqlite3 *db) {
goto out_unlock;
}
out_unlock:
sqlite3Error(db, rc);
sqlite3_mutex_leave(db->mutex);
return rc;
}
Expand All @@ -183291,6 +183294,7 @@ int libsql_wal_insert_end(sqlite3 *db) {
goto out_unlock;
}
out_unlock:
sqlite3Error(db, rc);
sqlite3_mutex_leave(db->mutex);
return rc;
}
Expand Down Expand Up @@ -183322,6 +183326,7 @@ int libsql_wal_insert_frame(
goto out_unlock;
}
out_unlock:
sqlite3Error(db, rc);
sqlite3_mutex_leave(db->mutex);

return rc;
Expand Down

0 comments on commit e2e3a6e

Please sign in to comment.