diff options
| -rw-r--r-- | manifest | 13 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | test/speedtest1.c | 35 |
3 files changed, 33 insertions, 17 deletions
@@ -1,5 +1,5 @@ -C Improved\slocaltime()\ssupport\sfor\sWindowsCE -D 2016-04-12T16:23:30.244 +C Add\sthe\s--temp\soption\sto\sthe\sspeedtest1.c\sperformance\stest\sprogram. +D 2016-04-12T16:59:39.643 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -1083,7 +1083,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 21af8db2492a903835b654517ac8d90aed0af91f +F test/speedtest1.c 870ea1f3086ace7125f578cfae7ac1137b3e0bdd F test/spellfix.test f9c1f431e2c096c8775fec032952320c0e4700db F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 @@ -1482,8 +1482,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 7e7289655185e7643ead6d685922528bc4d9e0ae 541c6da23850673f5d2a2e31c3967b796ee2effc -R ff0c266585dc1c24384af2892b8942ce -T +closed 541c6da23850673f5d2a2e31c3967b796ee2effc +P 662c32af0276a9ef4eea2d29e2523ccc44b6d128 +R cf025f2af3ea009a3845c13fd71354e9 U drh -Z 2794cf8f4a03e9c72f55b1cbc1df2c40 +Z ba428edd13c3659c3e56c28f6b7f2005 diff --git a/manifest.uuid b/manifest.uuid index 1e27f6a99..3197cf859 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -662c32af0276a9ef4eea2d29e2523ccc44b6d128
\ No newline at end of file +8053a6e2bf616fc9326f0323962176e318d7d2a5
\ No newline at end of file diff --git a/test/speedtest1.c b/test/speedtest1.c index 8ed0424f8..bcd85b049 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -30,6 +30,7 @@ static const char zHelp[] = " --shrink-memory Invoke sqlite3_db_release_memory() frequently.\n" " --size N Relative test size. Default=100\n" " --stats Show statistics at the end\n" + " --temp N N from 0 to 9. 0: no temp table. 9: all temp tables\n" " --testset T Run test-set T\n" " --trace Turn on SQL tracing\n" " --threads N Use up to N threads for sorting\n" @@ -69,6 +70,7 @@ static struct Global { int bExplain; /* Print SQL with EXPLAIN prefix */ int bVerify; /* Try to verify that results are correct */ int bMemShrink; /* Call sqlite3_db_release_memory() often */ + int eTemp; /* 0: no TEMP. 9: always TEMP. */ int szTest; /* Scale factor for test iterations */ const char *zWR; /* Might be WITHOUT ROWID */ const char *zNN; /* Might be NOT NULL */ @@ -78,6 +80,12 @@ static struct Global { char zResult[3000]; /* Text of the current result */ } g; +/* Return " TEMP" or "", as appropriate for creating a table. +*/ +static const char *isTemp(int N){ + return g.eTemp>=N ? " TEMP" : ""; +} + /* Print an error message and exit */ static void fatal_error(const char *zMsg, ...){ @@ -459,8 +467,8 @@ void testset_main(void){ maxb = roundup_allones(sz); speedtest1_begin_test(100, "%d INSERTs into table with no index", n); speedtest1_exec("BEGIN"); - speedtest1_exec("CREATE TABLE t1(a INTEGER %s, b INTEGER %s, c TEXT %s);", - g.zNN, g.zNN, g.zNN); + speedtest1_exec("CREATE%s TABLE t1(a INTEGER %s, b INTEGER %s, c TEXT %s);", + isTemp(9), g.zNN, g.zNN, g.zNN); speedtest1_prepare("INSERT INTO t1 VALUES(?1,?2,?3); -- %d times", n); for(i=1; i<=n; i++){ x1 = swizzle(i,maxb); @@ -477,8 +485,9 @@ void testset_main(void){ n = sz; speedtest1_begin_test(110, "%d ordered INSERTS with one index/PK", n); speedtest1_exec("BEGIN"); - speedtest1_exec("CREATE TABLE t2(a INTEGER %s %s, b INTEGER %s, c TEXT %s) %s", - g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); + speedtest1_exec( + "CREATE%s TABLE t2(a INTEGER %s %s, b INTEGER %s, c TEXT %s) %s", + isTemp(5), g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); speedtest1_prepare("INSERT INTO t2 VALUES(?1,?2,?3); -- %d times", n); for(i=1; i<=n; i++){ x1 = swizzle(i,maxb); @@ -495,8 +504,9 @@ void testset_main(void){ n = sz; speedtest1_begin_test(120, "%d unordered INSERTS with one index/PK", n); speedtest1_exec("BEGIN"); - speedtest1_exec("CREATE TABLE t3(a INTEGER %s %s, b INTEGER %s, c TEXT %s) %s", - g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); + speedtest1_exec( + "CREATE%s TABLE t3(a INTEGER %s %s, b INTEGER %s, c TEXT %s) %s", + isTemp(3), g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); speedtest1_prepare("INSERT INTO t3 VALUES(?1,?2,?3); -- %d times", n); for(i=1; i<=n; i++){ x1 = swizzle(i,maxb); @@ -654,12 +664,12 @@ void testset_main(void){ speedtest1_begin_test(180, "%d INSERTS with three indexes", n); speedtest1_exec("BEGIN"); speedtest1_exec( - "CREATE TABLE t4(\n" + "CREATE%s TABLE t4(\n" " a INTEGER %s %s,\n" " b INTEGER %s,\n" " c TEXT %s\n" ") %s", - g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); + isTemp(1), g.zNN, g.zPK, g.zNN, g.zNN, g.zWR); speedtest1_exec("CREATE INDEX t4b ON t4(b)"); speedtest1_exec("CREATE INDEX t4c ON t4(c)"); speedtest1_exec("INSERT INTO t4 SELECT * FROM t1"); @@ -1047,7 +1057,7 @@ void testset_rtree(int p1, int p2){ speedtest1_end_test(); speedtest1_begin_test(101, "Copy from rtree to a regular table"); - speedtest1_exec("CREATE TABLE t1(id INTEGER PRIMARY KEY,x0,x1,y0,y1,z0,z1)"); + speedtest1_exec(" TABLE t1(id INTEGER PRIMARY KEY,x0,x1,y0,y1,z0,z1)"); speedtest1_exec("INSERT INTO t1 SELECT * FROM rt1"); speedtest1_end_test(); @@ -1321,6 +1331,13 @@ int main(int argc, char **argv){ g.szTest = integerValue(argv[++i]); }else if( strcmp(z,"stats")==0 ){ showStats = 1; + }else if( strcmp(z,"temp")==0 ){ + if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); + i++; + if( argv[i][0]<'0' || argv[i][0]>'9' || argv[i][1]!=0 ){ + fatal_error("argument to --temp should be integer between 0 and 9"); + } + g.eTemp = argv[i][0] - '0'; }else if( strcmp(z,"testset")==0 ){ if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]); zTSet = argv[++i]; |