From: drh <drh@noemail.net>
Date: Wed, 9 Nov 2016 01:07:10 +0000 (+0000)
Subject: Add a DISTINCT query to speedtest1.c.  Also change INSERT OR REPLACE into
X-Git-Tag: version-3.16.0~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=088c086b1459d820f2c7a2a498b3435cb4b4f41b;p=thirdparty%2Fsqlite.git

Add a DISTINCT query to speedtest1.c.  Also change INSERT OR REPLACE into
just REPLACE.

FossilOrigin-Name: 754ee844958bdc3b96acfd1f5395da5796e54a82
---

diff --git a/manifest b/manifest
index 7c318efe4e..5fb18f4d9a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\s"experimental"\smarking\sfrom\sthe\ssqlite3_preupdate\sinterfaces.\nBut\sbe\ssure\sall\sthe\sinterface\sdefinitions\sare\swithin\s\ndocumentation.
-D 2016-11-09T00:57:27.790
+C Add\sa\sDISTINCT\squery\sto\sspeedtest1.c.\s\sAlso\schange\sINSERT\sOR\sREPLACE\sinto\njust\sREPLACE.
+D 2016-11-09T01:07:10.116
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
@@ -1116,7 +1116,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-F test/speedtest1.c cb433ff792a1b317d0787416bb8a57bbc3266871
+F test/speedtest1.c 48d82e01bd475d288460368497ad55a37f1bf659
 F test/spellfix.test f9c1f431e2c096c8775fec032952320c0e4700db
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -1530,7 +1530,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P bec5b6d4d083556d111a89186b4f7b35b5e7cebf
-R ff2060e290f81fca7217b945d86dd7cc
+P d6dd2ad35ed17e980ed564688499c802e5850386
+R d08cd4afd007fbdaa2d25ecaf2cc91e7
 U drh
-Z a7ff54b297c4e1fff86ebb13237d1a94
+Z 0b6edaf7c64c65fbed1b9876eb6764f5
diff --git a/manifest.uuid b/manifest.uuid
index e61f550e0b..4b0a0b7366 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d6dd2ad35ed17e980ed564688499c802e5850386
\ No newline at end of file
+754ee844958bdc3b96acfd1f5395da5796e54a82
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index 244a1666ae..48d13b66c7 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -834,11 +834,11 @@ void testset_main(void){
   sz = n = g.szTest*700;
   zNum[0] = 0;
   maxb = roundup_allones(sz/3);
-  speedtest1_begin_test(400, "%d INSERT OR REPLACE ops on an IPK", n);
+  speedtest1_begin_test(400, "%d REPLACE ops on an IPK", n);
   speedtest1_exec("BEGIN");
   speedtest1_exec("CREATE%s TABLE t5(a INTEGER PRIMARY KEY, b %s);",
                   isTemp(9), g.zNN);
-  speedtest1_prepare("INSERT OR REPLACE INTO t5 VALUES(?1,?2); --  %d times",n);
+  speedtest1_prepare("REPLACE INTO t5 VALUES(?1,?2); --  %d times",n);
   for(i=1; i<=n; i++){
     x1 = swizzle(i,maxb);
     speedtest1_numbername(i, zNum, sizeof(zNum));
@@ -860,12 +860,12 @@ void testset_main(void){
   sz = n = g.szTest*700;
   zNum[0] = 0;
   maxb = roundup_allones(sz/3);
-  speedtest1_begin_test(500, "%d INSERT OR REPLACE ops on TEXT PK", n);
+  speedtest1_begin_test(500, "%d REPLACE on TEXT PK", n);
   speedtest1_exec("BEGIN");
   speedtest1_exec("CREATE%s TABLE t6(a TEXT PRIMARY KEY, b %s)%s;",
                   isTemp(9), g.zNN,
                   sqlite3_libversion_number()>=3008002 ? "WITHOUT ROWID" : "");
-  speedtest1_prepare("INSERT OR REPLACE INTO t6 VALUES(?1,?2); --  %d times",n);
+  speedtest1_prepare("REPLACE INTO t6 VALUES(?1,?2); --  %d times",n);
   for(i=1; i<=n; i++){
     x1 = swizzle(i,maxb);
     speedtest1_numbername(x1, zNum, sizeof(zNum));
@@ -875,7 +875,7 @@ void testset_main(void){
   }
   speedtest1_exec("COMMIT");
   speedtest1_end_test();
-  speedtest1_begin_test(510, "%d SELECTS on an IPK", n);
+  speedtest1_begin_test(510, "%d SELECTS on a TEXT PK", n);
   speedtest1_prepare("SELECT b FROM t6 WHERE a=?1; --  %d times",n);
   for(i=1; i<=n; i++){
     x1 = swizzle(i,maxb);
@@ -884,6 +884,10 @@ void testset_main(void){
     speedtest1_run();
   }
   speedtest1_end_test();
+  speedtest1_begin_test(520, "%d SELECT DISTINCT", n);
+  speedtest1_exec("SELECT DISTINCT b FROM t5;");
+  speedtest1_exec("SELECT DISTINCT b FROM t6;");
+  speedtest1_end_test();
 
 
   speedtest1_begin_test(980, "PRAGMA integrity_check");