diff options
| author | drh <drh@noemail.net> | 2016-05-21 12:29:04 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-05-21 12:29:04 +0000 |
| commit | 09a4e92c6da38a43c6cf774d18d101a8d322eb33 (patch) | |
| tree | 7e1aff2dd36f2fd84dc2d4eebd244e14518eecb2 | |
| parent | cb89f4aba8e226adca32c5dad02a21220b80f177 (diff) | |
| download | sqlite-09a4e92c6da38a43c6cf774d18d101a8d322eb33.tar.gz sqlite-09a4e92c6da38a43c6cf774d18d101a8d322eb33.zip | |
Yet another minor size reduction and performance increase in the b-tree
insert logic.
FossilOrigin-Name: 1dbaf7a119edc5150a5d4be1b72f652a574e5bc5
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/btree.c | 4 |
3 files changed, 10 insertions, 8 deletions
@@ -1,5 +1,5 @@ -C Small\ssize\sreduction\sand\sperformance\sincrease\sin\sthe\ssqlite3BtreeInsert()\nlogic. -D 2016-05-21T11:23:26.914 +C Yet\sanother\sminor\ssize\sreduction\sand\sperformance\sincrease\sin\sthe\sb-tree\ninsert\slogic. +D 2016-05-21T12:29:04.510 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7 @@ -322,7 +322,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240 F src/backup.c 6df65fdd569c901a418887a1a76f82ec35044556 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73 -F src/btree.c ab4ab00fa42b9f31a3c4f4232ab7dffe15a37728 +F src/btree.c da39b19be8a0fad4eb8a3d9e2d95a8ccc3eb8dd1 F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/build.c 785fa789319d93c6ae20efbd01d4da9ce8f8a793 @@ -1492,7 +1492,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 8e366f18f5bbd594390e7b091083e99639de324e -R 59f3ac52df516414b0292061ce466d2b +P 656aa1ecf5129ae43c56a990e95038b5d8cbdcee +R 213b2db355637b4ec446a3f8344f0ebf U drh -Z 1ed41a6ca1c9810f6f5090ac3b0958c0 +Z 69c744da391089b891fa26fe7438d9c6 diff --git a/manifest.uuid b/manifest.uuid index 6b45ee4bc..d7ffdbf57 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -656aa1ecf5129ae43c56a990e95038b5d8cbdcee
\ No newline at end of file +1dbaf7a119edc5150a5d4be1b72f652a574e5bc5
\ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 033d9c24c..2e862ff69 100644 --- a/src/btree.c +++ b/src/btree.c @@ -8059,6 +8059,7 @@ int sqlite3BtreeInsert( assert( pPage->leaf ); } insertCell(pPage, idx, newCell, szNew, 0, 0, &rc); + assert( pPage->nOverflow==0 || rc==SQLITE_OK ); assert( rc!=SQLITE_OK || pPage->nCell>0 || pPage->nOverflow>0 ); /* If no error has occurred and pPage has an overflow cell, call balance() @@ -8082,7 +8083,8 @@ int sqlite3BtreeInsert( ** row without seeking the cursor. This can be a big performance boost. */ pCur->info.nSize = 0; - if( rc==SQLITE_OK && pPage->nOverflow ){ + if( pPage->nOverflow ){ + assert( rc==SQLITE_OK ); pCur->curFlags &= ~(BTCF_ValidNKey); rc = balance(pCur); |