Remove unreachable branches in decodeIntArray() when compiling without

STAT3 or STAT4.

FossilOrigin-Name: 80e1baa5c225c78902e08dbea9d577ff5757847f

diff --git a/manifest b/manifest
index 8a54593787a3b7bf0e99493223f17e745d0cbb29..8f581e16e19d4084a62e8ade4a5d3f99a8323e4a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sthe\saccuracy\sof\sthe\sestimates\sused\swhen\ssearching\san\sindex\sfor\svalues\snot\spresent\sin\sany\sstat4\ssamples.
-D 2014-10-06T14:37:48.824
+C Remove\sunreachable\sbranches\sin\sdecodeIntArray()\swhen\scompiling\swithout\nSTAT3\sor\sSTAT4.
+D 2014-10-06T18:33:49.122
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -166,7 +166,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c ba266a779bc7ce10e52e59e7d3dc79fa342e8fdb
-F src/analyze.c ee85c504829aea05489ed0c67cbcd68d6a1ea7dd
+F src/analyze.c 8c322e1ecc08909526dbd5ab4421889d05f2263d
 F src/attach.c f4e94df2d1826feda65eb0939f7f6f5f923a0ad9
 F src/auth.c d8abcde53426275dab6243b441256fcd8ccbebb2
 F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
@@ -1202,7 +1202,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 418f3c9ad28672e5fe38d772d34e7cf8d26bc0e1 fc619be057975b8be6d0958024c5d436edbdf084
-R 08d6dd1c11aa3044fd1c3c851cac54a0
-U dan
-Z 0fcae61ad3d53701c4c43039d043043c
+P 3aff9a9cac7aa994dfdaa0ab5c23ae73a1e820f0
+R 2a9f3a3ac6efdd67ef1666d9c29f8a31
+U drh
+Z 0a50a0d9b770dc9e76964bc37ef2d3c3

diff --git a/manifest.uuid b/manifest.uuid
index 3fb60d9ba87b27cb587510dbbb31732a51bc29b5..3d0480e133a5c73a1554a50ae5588c5fe8adff04 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3aff9a9cac7aa994dfdaa0ab5c23ae73a1e820f0
\ No newline at end of file
+80e1baa5c225c78902e08dbea9d577ff5757847f
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 6b244dd9a70ae206f77b5574839d3c610bdd183e..7d36f013189bfee7b3fb55d78fb88afe629a1918 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -1437,7 +1437,7 @@ static void decodeIntArray(
 #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
   if( z==0 ) z = "";
 #else
-  if( NEVER(z==0) ) z = "";
+  assert( z!=0 );
 #endif
   for(i=0; *z && i<nOut; i++){
     v = 0;
@@ -1446,16 +1446,14 @@ static void decodeIntArray(
       z++;
     }
 #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
-    if( aOut ){
-      aOut[i] = v;
-    }
+    if( aOut ) aOut[i] = v;
+    if( aLog ) aLog[i] = sqlite3LogEst(v);
 #else
     assert( aOut==0 );
     UNUSED_PARAMETER(aOut);
+    assert( aLog!=0 );
+    aLog[i] = sqlite3LogEst(v);
 #endif
-    if( aLog ){
-      aLog[i] = sqlite3LogEst(v);
-    }
     if( *z==' ' ) z++;
   }
 #ifndef SQLITE_ENABLE_STAT3_OR_STAT4