Add a compound-query test to the speedtest1 test program.

FossilOrigin-Name: 532995759114ab7a7cba18cc9d8820d78eb1a96e

diff --git a/manifest b/manifest
index ea5c2672914547f5317a8c787e93d0f89d06b560..a08edf5d8c384b155b235716e9d2c839e6781701 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\sWITH\sclause\sto\shelp\sresolve\snames\sfor\sSELECT\sstatements\son\sthe\sleft\nof\sa\scompound\squery.\s\sProposed\sfix\sfor\sticket\s[31a19d11b97088296a].
-D 2014-02-09T18:02:09.253
+C Add\sa\scompound-query\stest\sto\sthe\sspeedtest1\stest\sprogram.
+D 2014-02-09T23:59:28.966
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -824,7 +824,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-F test/speedtest1.c 8b3b85c82018cdbc492ab43b841157bcbf6b281c
+F test/speedtest1.c 1603da7b4897716f9df15bd71b0310f56ec3181e
 F test/spellfix.test 61309f5efbec53603b3f86457d34a504f80abafe
 F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
@@ -1152,7 +1152,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 56febbeb575a298ae8839b3a59711150ceb9999d
-R c206aab6ac6bc2f14c7db43625790fe8
+P 67bfd59d9087a987f15f6148efa1ff104983e1fb
+R 08e9f131a35b941b5219bd5647483bf9
 U drh
-Z c763a50ce107ca4b3399be4e022f486e
+Z 03478c9c29bcc9ab89e223c27b70af04

diff --git a/manifest.uuid b/manifest.uuid
index cc9edf8507aa58ff125cff54c2c7e5741e670297..85633fa577ecc5e217739869d2c2941f871c237e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-67bfd59d9087a987f15f6148efa1ff104983e1fb
\ No newline at end of file
+532995759114ab7a7cba18cc9d8820d78eb1a96e
\ No newline at end of file

diff --git a/test/speedtest1.c b/test/speedtest1.c
index 1de51771062abfb47f8cd187073accfa84bd8e5b..05160e0eeb58bd6584409e914d273d0e6d919b2a 100644 (file)
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -778,6 +778,7 @@ void testset_cte(void){
   };
   const char *zPuz;
   double rSpacing;
+  int nElem;
 
   if( g.szTest<25 ){
     zPuz = azPuzzle[0];
@@ -875,6 +876,20 @@ void testset_cte(void){
   speedtest1_run();
   speedtest1_end_test();
 
+  nElem = 10000*g.szTest;
+  speedtest1_begin_test(400, "EXCEPT operator on %d-element tables", nElem);
+  speedtest1_prepare(
+    "WITH RECURSIVE \n"
+    "  t1(x) AS (VALUES(2) UNION ALL SELECT x+2 FROM t1 WHERE x<%d),\n"
+    "  t2(y) AS (VALUES(3) UNION ALL SELECT y+3 FROM t2 WHERE y<%d)\n"
+    "SELECT count(x), avg(x) FROM (\n"
+    "  SELECT x FROM t1 EXCEPT SELECT y FROM t2 ORDER BY 1\n"
+    ");",
+    nElem, nElem
+  );
+  speedtest1_run();
+  speedtest1_end_test();
+
 }
 
 /*