Change the name of the iDataVersion field of Btree to iBDataVersion to make

it distinct from Pager.iDataVersion.

FossilOrigin-Name: e4c44c0bca317c03f8e6d3aa7cc88e5f96159a3d91c07257d408f7db028fd151

diff --git a/manifest b/manifest
index 2aa2055a9bcdbd348d344bb89e1855b3986c3c05..70590b0a4d972c007d1a8e7451be9f3f66cc4838 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.35.2
-D 2021-03-17T19:07:21.223
+C Change\sthe\sname\sof\sthe\siDataVersion\sfield\sof\sBtree\sto\siBDataVersion\sto\smake\nit\sdistinct\sfrom\sPager.iDataVersion.
+D 2021-03-18T12:36:09.974
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,9 +483,9 @@ F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c bafa3a2e8b6622a3aa8791f90c8ecc70e8ae551ba9023f865213890f5b8a8994
+F src/btree.c f5334a1c0960dc0bc74fd0b263e352e8ba632f455b6107594c59cb0492efc4af
 F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
-F src/btreeInt.h 7614cae30f95b6aed0c7cac7718276a55cfe2c77058cbfd8bef5b75329757331
+F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 F src/build.c fec73c39d756f31d35ccbaa80fe1e040a8d675a318d4d30f41c444167bf3b860
 F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@ -1910,9 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0ed7eb9115510511f13dca715bb2b178580648517d8d30436a992d70a2e85ac1
-R 6b9cbc5338ab96ec85af6f269ca8689c
-T +sym-release *
-T +sym-version-3.35.2 *
+P ea80f3002f4120f5dcee76e8779dfdc88e1e096c5cdd06904c20fd26d50c3827
+R b0277a2c96226726a6a1ac5f90403a49
 U drh
-Z df8a52cb5f4a5da779c9bf4ff3cf1b0f
+Z 2b062f4ea76948f8d8e63fb487249a52

diff --git a/manifest.uuid b/manifest.uuid
index a2044fac2f204287271a6adc6bb04da93cd6c6fd..94f7b73bd4bde7abb7cfd22858616711067a7209 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea80f3002f4120f5dcee76e8779dfdc88e1e096c5cdd06904c20fd26d50c3827
\ No newline at end of file
+e4c44c0bca317c03f8e6d3aa7cc88e5f96159a3d91c07257d408f7db028fd151
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 709445b16c5f2962c1b32443aef197c5ec3df93a..500421ac04722eb73ab4fa2fbd596f59f19e08e5 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -4131,7 +4131,7 @@ int sqlite3BtreeCommitPhaseTwo(Btree *p, int bCleanup){
       sqlite3BtreeLeave(p);
       return rc;
     }
-    p->iDataVersion--;  /* Compensate for pPager->iDataVersion++; */
+    p->iBDataVersion--;  /* Compensate for pPager->iDataVersion++; */
     pBt->inTransaction = TRANS_READ;
     btreeClearHasContent(pBt);
   }
@@ -9654,7 +9654,7 @@ void sqlite3BtreeGetMeta(Btree *p, int idx, u32 *pMeta){
   assert( idx>=0 && idx<=15 );
 
   if( idx==BTREE_DATA_VERSION ){
-    *pMeta = sqlite3PagerDataVersion(pBt->pPager) + p->iDataVersion;
+    *pMeta = sqlite3PagerDataVersion(pBt->pPager) + p->iBDataVersion;
   }else{
     *pMeta = get4byte(&pBt->pPage1->aData[36 + idx*4]);
   }

diff --git a/src/btreeInt.h b/src/btreeInt.h
index 851b8e6c1d1448c8db4cf7cff326f3f5a030629d..37c07fe93be6a26a6a2a3fa2e0209324915b658a 100644 (file)
--- a/src/btreeInt.h
+++ b/src/btreeInt.h
@@ -350,7 +350,7 @@ struct Btree {
   u8 hasIncrblobCur; /* True if there are one or more Incrblob cursors */
   int wantToLock;    /* Number of nested calls to sqlite3BtreeEnter() */
   int nBackup;       /* Number of backup operations reading this btree */
-  u32 iDataVersion;  /* Combines with pBt->pPager->iDataVersion */
+  u32 iBDataVersion; /* Combines with pBt->pPager->iDataVersion */
   Btree *pNext;      /* List of other sharable Btrees from the same db */
   Btree *pPrev;      /* Back pointer of the same list */
 #ifdef SQLITE_DEBUG