Avoid an unnecessary OP_IfNull while doing an indexed search.

FossilOrigin-Name: 5196000930600d0cd931b87e864507791b9dab08

diff --git a/manifest b/manifest
index 89efd23eb76bab1f84b52d3377ba423046557dee..1bdb81fbcbcaf33a68db1edd85eefe48055db6a3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adjust\sthe\sSQLITE_MALLOCSIZE\sdefines,\sprimarily\sto\smake\ssure\s_msize\sgets\sused\swith\sMSVC\swhen\sappropriate.
-D 2013-11-12T21:37:04.790
+C Avoid\san\sunnecessary\sOP_IfNull\swhile\sdoing\san\sindexed\ssearch.
+D 2013-11-13T08:55:02.907
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8a07bebafbfda0eb67728f4bd15a36201662d1a1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -293,7 +293,7 @@ F src/vtab.c 5a423b042eb1402ef77697d03d6a67378d97bc8d
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c e9e593d5bb798c3e67fc3893dfe7055c9e7d8d74
-F src/where.c 48404454d772af51f9075a33b485bd2270f31dd3
+F src/where.c 346944c20b9c1ac191f16cfc1100dfbe58fa98d4
 F src/whereInt.h 63c8345d01d12ded6250b72e7c16855f0a358041
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1138,7 +1138,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P ddacd10105c6df2d3a9d707947e72c62e88212eb
-R a1432779dd22915a7d5838c89a07f3c3
-U mistachkin
-Z f4a84974fe637056c9ba67de537af83a
+P 4e7e805e1139b2dc05d85e86e5c8254e5d361bf2
+R 24bac22755e297cd5d201f4faa2841ac
+U drh
+Z b52683f99c1f13f39fe1493c1b7d78a3

diff --git a/manifest.uuid b/manifest.uuid
index 54f0297c7aae95e17efd533ac06e2241ab20953c..5a991f73f97e11fe66d12f39e0bd31705d9b0d6b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e7e805e1139b2dc05d85e86e5c8254e5d361bf2
\ No newline at end of file
+5196000930600d0cd931b87e864507791b9dab08
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 10383ce4119594a32665e1eb1ddcebd6781d6d83..617d373cbb77bcc2fd58e87d0957704b12379e2c 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3116,8 +3116,12 @@ static Bitmask codeOneLoopStart(
     r1 = sqlite3GetTempReg(pParse);
     testcase( pLoop->wsFlags & WHERE_BTM_LIMIT );
     testcase( pLoop->wsFlags & WHERE_TOP_LIMIT );
-    if( (pLoop->wsFlags & (WHERE_BTM_LIMIT|WHERE_TOP_LIMIT))!=0 ){
+    if( (pLoop->wsFlags & (WHERE_BTM_LIMIT|WHERE_TOP_LIMIT))!=0 
+     && (j = pIdx->aiColumn[nEq])>=0 
+     && pIdx->pTable->aCol[j].notNull==0 
+    ){
       sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, nEq, r1);
+      VdbeComment((v, "%s", pIdx->pTable->aCol[j].zName));
       sqlite3VdbeAddOp2(v, OP_IsNull, r1, addrCont);
     }
     sqlite3ReleaseTempReg(pParse, r1);