Add an extra fault-injection test to sortfault.test. Remove an unreachable branch...

FossilOrigin-Name: a33a366ba8a0da81ddd895d552a348441ef8529a

diff --git a/manifest b/manifest
index 917d67a6b3ef3c54919f6a04b758c6744e3cb8f7..903e7795ef34dbc2b122a130cdc6235b7085295e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\srace\scondition\sin\sthe\ssorter.
-D 2014-05-03T19:33:00.713
+C Add\san\sextra\sfault-injection\stest\sto\ssortfault.test.\sRemove\san\sunreachable\sbranch\sfrom\svdbesort.c.
+D 2014-05-03T20:43:13.986
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -287,7 +287,7 @@ F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 F src/vdbeaux.c 44d4d1f5711f71eaf0d624de5c3e4976fe4e180b
 F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
 F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
-F src/vdbesort.c c443cdf00fc8b90b17fbeaa1ad833d3091b0bf5c
+F src/vdbesort.c db67b5b54c476163f3068a194a734c394ecb675e
 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@ -824,7 +824,7 @@ F test/softheap1.test 40562fe6cac6d9827b7b42b86d45aedf12c15e24
 F test/sort.test 2af626b7963eddb8c93b6c87babf81396c379ef5
 F test/sort2.test c5e25eb674689e291d06b5209fe8d337ae0ec010
 F test/sort3.test 6178ade30810ac9166fcdf14b7065e49c0f534e2
-F test/sortfault.test f875d29c58b2eafdca1b51c0810075570d5a3cbc
+F test/sortfault.test f2f94227d97f7efb6351aff29e77498e877d6216
 F test/speed1.test f2974a91d79f58507ada01864c0e323093065452
 F test/speed1p.explain d841e650a04728b39e6740296b852dccdca9b2cb
 F test/speed1p.test b180e98609c7677382cf618c0ec9b69f789033a8
@@ -1170,7 +1170,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 3a66c4e1bf311d38668dfcdcd77867feff6db7bd
-R 07ad433b1f531db0a3f09b334b377488
+P 32ccf3ae18531682dfd039fa8df6ad9a907ac455
+R 5ede29f57c1094d89ff6cfb82c23c871
 U dan
-Z 8b4c7c15ef224489143b17033ef5ced9
+Z 83a8a7f60269415a80d26ca6a02bda49

diff --git a/manifest.uuid b/manifest.uuid
index 6bfb75656cc1eaaba161895513d04fe2fc5ef909..4a6d01e399ba9ecd0d3db967a0a50c4a63964cf0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32ccf3ae18531682dfd039fa8df6ad9a907ac455
\ No newline at end of file
+a33a366ba8a0da81ddd895d552a348441ef8529a
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index 5676d96e3781d0f8ab33218d5c72bbebbcc9f76a..d0a6be84c9652da16540f829752725721deb6ec1 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -1807,11 +1807,9 @@ static int vdbeIncrNew(
 /*
 ** Set the "use-threads" flag on object pIncr.
 */
-static void vdbeIncrSetThreads(IncrMerger *pIncr, int bUseThread){
-  if( bUseThread ){
-    pIncr->bUseThread = 1;
-    pIncr->pTask->file2.iEof -= pIncr->mxSz;
-  }
+static void vdbeIncrSetThreads(IncrMerger *pIncr){
+  pIncr->bUseThread = 1;
+  pIncr->pTask->file2.iEof -= pIncr->mxSz;
 }
 #endif /* SQLITE_MAX_WORKER_THREADS>0 */
 
@@ -2193,11 +2191,11 @@ static int vdbeSorterSetupMerge(VdbeSorter *pSorter){
       if( rc==SQLITE_OK ){
         rc = vdbeIncrNew(pLast, pMain, &pIter->pIncr);
         if( rc==SQLITE_OK ){
-          vdbeIncrSetThreads(pIter->pIncr, pSorter->bUseThreads);
+          vdbeIncrSetThreads(pIter->pIncr);
           for(iTask=0; iTask<(pSorter->nTask-1); iTask++){
             IncrMerger *pIncr;
             if( (pIncr = pMain->aIter[iTask].pIncr) ){
-              vdbeIncrSetThreads(pIncr, pSorter->bUseThreads);
+              vdbeIncrSetThreads(pIncr);
               assert( pIncr->pTask!=pLast );
             }
           }

diff --git a/test/sortfault.test b/test/sortfault.test
index 7c58bb683301a6cdc4ec2eb03fcca676942e0b7c..2f746fcc246d25ccc3a133708a74bc43dc44ea00 100644 (file)
--- a/test/sortfault.test
+++ b/test/sortfault.test
@@ -26,6 +26,7 @@ do_execsql_test 1.0 {
 foreach {tn mmap_limit nWorker tmpstore threadsmode fakeheap} {
           1          0       0     file multithread    false
           2     100000       0     file multithread    false
+          3     100000       1     file multithread    false
 } {
   catch { db close }
   sqlite3_shutdown
@@ -53,6 +54,27 @@ foreach {tn mmap_limit nWorker tmpstore threadsmode fakeheap} {
   } -test {
     faultsim_test_result {0 {40 1000 40 1000 40 1000 40 1000 40 1000}}
   }
+
+
+  do_faultsim_test 2.$tn -prep {
+    sqlite3 db test.db
+    sqlite3_test_control SQLITE_TESTCTRL_SORTER_MMAP db $::mmap_limit
+    add_test_utf16bin_collate db
+    execsql { PRAGMA cache_size = 5 }
+  } -body {
+    execsql { 
+      WITH r(x,y) AS (
+          SELECT 100, $::str
+          UNION ALL
+          SELECT x-1, $::str FROM r
+          LIMIT 100
+      )
+      SELECT count(x), length(y) FROM r GROUP BY y COLLATE utf16bin, (x%5)
+    }
+  } -test {
+    faultsim_test_result {0 {20 1000 20 1000 20 1000 20 1000 20 1000}}
+  }
+
 }
 
 catch { db close }