mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove an unnecessary branch in the sqlite3LogEstToInt() routine.

Browse Source 
FossilOrigin-Name: da81d7afeb0566a09a505ba5fce901e991e4a029
This commit is contained in:
drh 2016-04-05 23:39:53 +00:00
parent ed06a131da
commit 40dc357a01
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Carry\stable\scolumn\stypes\sthrough\sinto\sVIEW\sdefinitions,\swhere\spossible. C Remove\san\sunnecessary\sbranch\sin\sthe\ssqlite3LogEstToInt()\sroutine.
D 2016-04-05T20:59:12.069 D 2016-04-05T23:39:53.536
F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.in eba680121821b8a60940a81454316f47a341487a
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 1f123a0757f6f04f0341accb46457e116817159a F Makefile.msc 1f123a0757f6f04f0341accb46457e116817159a
@ -439,7 +439,7 @@ F src/treeview.c e4b41a37530a191579d3c53142cc44ee2eb99373
F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280 F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
F src/update.c 3e67ab3c0814635f355fb1f8ab010a2b9e016e7d F src/update.c 3e67ab3c0814635f355fb1f8ab010a2b9e016e7d
F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
F src/util.c 8873d696c9ccc4206058c402e09e101f1b81561a F src/util.c 19509465217b673b38d5804a72778908b138953f
F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52 F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
F src/vdbe.c 936166d3dc5aa00364877603f545707896c1519e F src/vdbe.c 936166d3dc5aa00364877603f545707896c1519e
F src/vdbe.h c16ba943d407baa1c7085eefea73a063fc631863 F src/vdbe.h c16ba943d407baa1c7085eefea73a063fc631863
@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 0bf9926c7a7865694edd48535777248e73d86bbf P fb555c3c2af7f5e62ff839658f4fba7b645d3a68
R c7f5a7683cc4a0d14362e20e6891847a R 7154c3cc804ee2fc9b7c1578477c3cf7
U drh U drh
Z ec8e2cff7764d808576889c190bbf60c Z c58518044f9cf200f41dd76757fdb4e4

2
manifest.uuid
View File

@ -1 +1 @@
fb555c3c2af7f5e62ff839658f4fba7b645d3a68 da81d7afeb0566a09a505ba5fce901e991e4a029

1
src/util.c
View File

@ -1448,7 +1448,6 @@ LogEst sqlite3LogEstFromDouble(double x){
*/ */
u64 sqlite3LogEstToInt(LogEst x){ u64 sqlite3LogEstToInt(LogEst x){
u64 n; u64 n;
if( x<10 ) return 1;
n = x%10; n = x%10;
x /= 10; x /= 10;
if( n>=5 ) n -= 2; if( n>=5 ) n -= 2;