aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrh <>2022-11-19 14:18:48 +0000
committerdrh <>2022-11-19 14:18:48 +0000
commit1e62057436a904f02e710adb264f539c51a0b66c (patch)
tree28361622ce8e9424b6fdacadf1d0fb5aea12c32f
parentbf9b994f52f076fa955c2d9aabe1c6970f30d205 (diff)
downloadsqlite-1e62057436a904f02e710adb264f539c51a0b66c.tar.gz
sqlite-1e62057436a904f02e710adb264f539c51a0b66c.zip
Improved comments on the pageFreeArray() routine of btree.c. No changes to
code. FossilOrigin-Name: 0c2adc6d3547b07e950ae49f07f688f71a21b3ad5a51f16f0e8d49ab91564582
-rw-r--r--manifest12
-rw-r--r--manifest.uuid2
-rw-r--r--src/btree.c7
3 files changed, 12 insertions, 9 deletions
diff --git a/manifest b/manifest
index 4507d9d17..9d1924cb8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Streamline\sthe\sdecodeFlags()\sroutine\sin\sbtree.c\sfor\sa\ssmall\sperformance\nincrease.
-D 2022-11-19T13:09:03.004
+C Improved\scomments\son\sthe\spageFreeArray()\sroutine\sof\sbtree.c.\s\sNo\schanges\sto\ncode.
+D 2022-11-19T14:18:48.226
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -578,7 +578,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c 405994e58bdf8f58adb5b238cda4b428de2bfe67e8dac5577082f2fd70faeade
+F src/btree.c c98cf491cbb8aa930bc9deb2cf794d2a32005c97c9cde01b7b8a10ef7c3d8451
F src/btree.h 4fcbb0b041013071dd5e9f53c538d49916c092e6ad8842185985e5270a0792de
F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
F src/build.c d3e43e950e4e377c1d451a4862556792acdef1faba14a03f899d30d09731c48b
@@ -2057,8 +2057,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2e783670e10b59e67c14b0db7f4803b41790cc7730de221d54fa2d4483cfba33
-R b0bb099cec1bed805505fb24b4006305
+P 4cb285210b4a2b14c80962bf2ecb35be310d3444c329c15d86b3073096455704
+R 08dfc1f1d36db05c00bfb06ac1037121
U drh
-Z 40c7b0608af0db932c6182b2b48b07d6
+Z 7815819acfb2ddb8c0f5e3f3b0dc41f8
# Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e95384805..b2733321b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4cb285210b4a2b14c80962bf2ecb35be310d3444c329c15d86b3073096455704 \ No newline at end of file
+0c2adc6d3547b07e950ae49f07f688f71a21b3ad5a51f16f0e8d49ab91564582 \ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 569b596c5..33762cc90 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -7448,8 +7448,8 @@ static int pageFreeArray(
int nRet = 0;
int i;
int iEnd = iFirst + nCell;
- u8 *pFree = 0;
- int szFree = 0;
+ u8 *pFree = 0; /* \__ Parameters for pending call to */
+ int szFree = 0; /* / freeSpace() */
for(i=iFirst; i<iEnd; i++){
u8 *pCell = pCArray->apCell[i];
@@ -7470,6 +7470,9 @@ static int pageFreeArray(
return 0;
}
}else{
+ /* The current cell is adjacent to and before the pFree cell.
+ ** Combine the two regions into one to reduce the number of calls
+ ** to freeSpace(). */
pFree = pCell;
szFree += sz;
}