Distinguish between checkpoints (WAL-only, implementation specific) and

savepoints (Btree internal implementation of COMMIT/ROLLBACK subtransactions)
and SQL SAVEPOINT (identical name for SQL-level subtransactions)

FossilOrigin-Name: ae686ab6a84ad19fec5873034e873b3d8d933a792b9742626627fa0677002a08

diff --git a/manifest b/manifest
index ec631f1b7e38ee82ef2f6326d84428ff007e34b6..604dbfdc898142fa39959171a8f873d7a9acdf02 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 3d35fa0be866213274fc09250225b345f6b08a9b4ec373d53d95e627e24512be
-C Reset\sto\strunk's\sfunc.\sStill\slearning\sFossil.
-D 2020-09-25T14:26:49.818
+C Distinguish\sbetween\scheckpoints\s(WAL-only,\simplementation\sspecific)\sand\s\nsavepoints\s(Btree\sinternal\simplementation\sof\sCOMMIT/ROLLBACK\ssubtransactions)\s\nand\sSQL\sSAVEPOINT\s(identical\sname\sfor\sSQL-level\ssubtransactions)
+D 2020-09-25T16:54:55.839
 F ext/expert/expert1.test dba6e752cc701621771f925f3872b183fa688f7b4a9f4822631fc02bdbffc45a
 F ext/expert/sqlite3expert.c 2778d9f06b3a8bfa859cb6b75b82f004477bf5dd78edd17d954319750ca963f3
 F ext/fts5/fts5Int.h ba835c165bb87650fc806008969799a7a1fbe3e221fd5a850dd044eb6a87b243
@@ -13,7 +13,7 @@ F ext/fts5/test/fts5hash.test dc7bc7e0cdeb42cfce31294ad2f8fcf43192bfd0145bb7f3ec
 F ext/fts5/test/fts5integrity.test e387b2bd1c83e50f4a12f58a5fd399111bbab36be2f1c9fd5bb974be08a32de6
 F ext/rtree/rtree.c 60f6f1675134201974be4189dbd219494c13e1ed30e80bd92ae0dcc86df1b035
 F src/btree.c fb7970654479f968ab09321f6a6c8b796174860b641f7d8879f221dd6667e272
-F src/btree.h 3bf68d60824f6495904ceb0df9102a3413fed933d80c43aefc8e094875105e30
+F src/btree.h c7fc07ab80a5ab90b0390715844965d63cc4fe6c860ab740f0383d9cef56ae55
 F src/pragma.c 6daaaecc26a4b09481d21722525b079ce756751a43a79cc1d8f122d686806193
 F src/select.c 6c3f7d60295f06ce7fa128bb23b1159648f0aa96a78c257af35dfef727ac63f1
 F src/sqlite.h.in cb9f0862e8d0f8691de95b18439ab60666f868c83bc65e3a17f0a0b44cc8f8a9
@@ -22,7 +22,7 @@ F src/wherecode.c 9afd600ca9fe831f342121cca48ad8839c8a18ca4e0372518a0a3c8123a8f0
 F test/with1.test 323659eaf309787add657d05e5943e437a7a3494f2b6602a0deb18fdebc1ab4c
 F tool/lemon.c 70eedc31614a58fe31a71025c17ebd1502a6ce9cfef0ed5e33acb0b5b737b291
 F tool/lempar.c 0e1d5eeb9736108d3dba782a9dd56f4e7cb69006b6ee181308b7ebfb15313a12
-P 78d8db7cb73284644cde1636a14e4e3598e1a2a7e94a04dfc7406422aab93ae5
-R bc0e1702bf8a1aafdab8ae0b180ad2bf
+P a4840cf5c682a22f32eb1890fc4ecc35a367d967142b284e5993c7faf512d71e
+R 2c433bcd7399575f9d5fbf6f659701f4
 U shearer
-Z 9442bc333cd0ee23ba290ef720a3f91e
+Z 9131b8e126bb25cdee7fb1f0672e4c25

diff --git a/manifest.uuid b/manifest.uuid
index 34681099661e19fe5b85741f13a1d67115044b2e..982d27e045ddd9efc691cef62e89ce34dd50e3ba 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4840cf5c682a22f32eb1890fc4ecc35a367d967142b284e5993c7faf512d71e
\ No newline at end of file
+ae686ab6a84ad19fec5873034e873b3d8d933a792b9742626627fa0677002a08
\ No newline at end of file

diff --git a/src/btree.h b/src/btree.h
index dc2a223801b3adaeacc5f7b7bcf9843d88343a57..d9714fa2bcfee4a4d2dafa8c95a19bd59a4622db 100644 (file)
--- a/src/btree.h
+++ b/src/btree.h
@@ -172,9 +172,14 @@ int sqlite3BtreeBeginStmt(Btree*,int);
 int sqlite3BtreeCreateTable(Btree*, Pgno*, int flags);
 int sqlite3BtreeTxnState(Btree*);
 int sqlite3BtreeIsInBackup(Btree*);
+
+/* A savepoint refers to transactions implemented with or without WAL. */
+/* References to 'savepoint' in btree.c relate to protected subtransactions */
+/* within the Btree, which relate to SQL COMMIT/ROLLBACK in general */
+/* including the SQL-level SAVEPOINT statement. */
 int sqlite3BtreeSavepoint(Btree *, int, int);
 
-/* A checkpoint is not the same as a savepoint. More research needed */
+/* A checkpoint refers to only to WAL. See https://sqlite.org/wal.html#ckpt */
 #ifndef SQLITE_OMIT_WAL
   int sqlite3BtreeCheckpoint(Btree*, int, int *, int *);  
 #endif