database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Add an assert() to the btree rebalancer in order to silence a

Browse Source 
clang/scan-build warning.

FossilOrigin-Name: 6730579cf5c6c74cb293e7237d896d3a3a36b691
This commit is contained in:
drh
2012-08-14 18:43:39 +00:00
parent c16eb6934d
commit ec73930adc
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Update\sthe\sspellfix\svirtual\stable\sto\sthe\slatest\sdevelopment\scode. C Add\san\sassert()\sto\sthe\sbtree\srebalancer\sin\sorder\sto\ssilence\sa\s\nclang/scan-build\swarning.
D 2012-08-14T17:29:27.517 D 2012-08-14T18:43:39.547
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -123,7 +123,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910 F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
F src/btree.c fe84910555e103013455e21571ac8bbed23c5c50 F src/btree.c 82b6fcbec3101ff951f47797f407d5eb5d06fa44
F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2 F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
F src/build.c 0f6b40ad6211dcaba6159d0f9a297f0704f22142 F src/build.c 0f6b40ad6211dcaba6159d0f9a297f0704f22142
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
P 1de2237d005fa1a1e1d034820d17daf64a860f81 P 6954fef006431d153de6e63e362b8d260ebeb1c6
R c6a6a5e27cc06765fbb21bed044152b3 R c7501b04ad663e9c70817cec3b4cff7e
U drh U drh
Z f62627106b46abb8dea1d772e4525d54 Z aedea036152f85450c01ebb017cff317

2
manifest.uuid
View File

@@ -1 +1 @@
6954fef006431d153de6e63e362b8d260ebeb1c6 6730579cf5c6c74cb293e7237d896d3a3a36b691

2
src/btree.c
View File

@@ -6473,6 +6473,7 @@ static int balance_nonroot(
** sibling page j. If the siblings are not leaf pages of an ** sibling page j. If the siblings are not leaf pages of an
** intkey b-tree, then cell i was a divider cell. */ ** intkey b-tree, then cell i was a divider cell. */
assert( j+1 < ArraySize(apCopy) ); assert( j+1 < ArraySize(apCopy) );
assert( j+1 < nOld );
pOld = apCopy[++j]; pOld = apCopy[++j];
iNextOld = i + !leafData + pOld->nCell + pOld->nOverflow; iNextOld = i + !leafData + pOld->nCell + pOld->nOverflow;
if( pOld->nOverflow ){ if( pOld->nOverflow ){
@@ -8307,4 +8308,3 @@ void sqlite3BtreeCursorHints(BtCursor *pCsr, unsigned int mask){
assert( mask==BTREE_BULKLOAD || mask==0 ); assert( mask==BTREE_BULKLOAD || mask==0 );
pCsr->hints = mask; pCsr->hints = mask;
} }