mirror of
https://github.com/sqlite/sqlite.git
synced 2025-07-30 19:03:16 +03:00
Slightly faster tokenization of non-keyword identifiers.
FossilOrigin-Name: 55fa22bd403cc8f0973efea898a7cfa3a32b57c7e2a7a4c30c3f2c72d5396f07
This commit is contained in:
drh
15
manifest
15
manifest
@ -1,5 +1,5 @@
|
||||
C Add\sthe\s--lookaside\sSIZE\sCOUNT\scommand-line\soption\sto\sthe\sdbfuzz2\stesting\stool.
|
||||
D 2020-12-01T23:18:13.197
|
||||
C Slightly\sfaster\stokenization\sof\snon-keyword\sidentifiers.
|
||||
D 2020-12-02T00:20:00.564
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
@ -603,7 +603,7 @@ F src/test_windirent.h 90dfbe95442c9762357fe128dc7ae3dc199d006de93eb33ba3972e0a9
|
||||
F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
|
||||
F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
|
||||
F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
|
||||
F src/tokenize.c 4dc01b267593537e2a0d0efe9f80dabe24c5b6f7627bc6971c487fa6a1dacbbf
|
||||
F src/tokenize.c 01dba3023659dc6f6b1e054c14b35a0074bd35de10466b99454d33278191d97f
|
||||
F src/treeview.c 4b92992176fb2caefbe06ba5bd06e0e0ebcde3d5564758da672631f17aa51cda
|
||||
F src/trigger.c 515e79206d40d1d4149129318582e79a6e9db590a7b74e226fdb5b2a6c7e1b10
|
||||
F src/update.c 9f126204a6acb96bbe47391ae48e0fc579105d8e76a6d9c4fab3271367476580
|
||||
@ -1390,7 +1390,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
|
||||
F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
|
||||
F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
|
||||
F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
|
||||
F test/speedtest1.c 849dbcb0bded9f966e43f28e8ce824b2915cb5dd0031a2e85996f7e3de36c2b1
|
||||
F test/speedtest1.c 5e5b805f24cc939656058f6a498f5a2160f9142e4815c54faf758ec798d4cdad
|
||||
F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
|
||||
F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
|
||||
F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
|
||||
@ -1886,7 +1886,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P a26b6597e3ae272231b96f9982c3bcc17ddec2f2b6eb4df06a224b91089fed5b
|
||||
R 2c2b0393b1f5ca930e6c9ce57f506377
|
||||
P 2466960c0ba02ef9c325e9a5f8603db518e7529547f614c225fef430421e1643 16e281ed6219cc229dec7e3f1b40da2304dc270a74fd6ef78d04a088e30e7026
|
||||
R a8add1c818b1e70c15ae61bdff16cc29
|
||||
T +closed 16e281ed6219cc229dec7e3f1b40da2304dc270a74fd6ef78d04a088e30e7026
|
||||
U drh
|
||||
Z 2700eec066243e283a576b1178e7dd55
|
||||
Z 1f1b11cb63e506030abbce26b0c97982
|
||||
|
||||
@ -1 +1 @@
|
||||
2466960c0ba02ef9c325e9a5f8603db518e7529547f614c225fef430421e1643
|
||||
55fa22bd403cc8f0973efea898a7cfa3a32b57c7e2a7a4c30c3f2c72d5396f07
|
||||
@ -27,8 +27,8 @@
|
||||
** all of them need to be used within the switch.
|
||||
*/
|
||||
#define CC_X 0 /* The letter 'x', or start of BLOB literal */
|
||||
#define CC_KYWD 1 /* Alphabetics or '_'. Usable in a keyword */
|
||||
#define CC_ID 2 /* unicode characters usable in IDs */
|
||||
#define CC_KYWD0 1 /* First letter of a keyword */
|
||||
#define CC_KYWD 2 /* Alphabetics or '_'. Usable in a keyword */
|
||||
#define CC_DIGIT 3 /* Digits */
|
||||
#define CC_DOLLAR 4 /* '$' */
|
||||
#define CC_VARALPHA 5 /* '@', '#', ':'. Alphabetic SQL variables */
|
||||
@ -53,20 +53,21 @@
|
||||
#define CC_AND 24 /* '&' */
|
||||
#define CC_TILDA 25 /* '~' */
|
||||
#define CC_DOT 26 /* '.' */
|
||||
#define CC_ILLEGAL 27 /* Illegal character */
|
||||
#define CC_NUL 28 /* 0x00 */
|
||||
#define CC_ID 27 /* unicode characters usable in IDs */
|
||||
#define CC_ILLEGAL 28 /* Illegal character */
|
||||
#define CC_NUL 29 /* 0x00 */
|
||||
|
||||
static const unsigned char aiClass[] = {
|
||||
#ifdef SQLITE_ASCII
|
||||
/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xa xb xc xd xe xf */
|
||||
/* 0x */ 28, 27, 27, 27, 27, 27, 27, 27, 27, 7, 7, 27, 7, 7, 27, 27,
|
||||
/* 1x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
|
||||
/* 0x */ 29, 28, 28, 28, 28, 28, 28, 28, 28, 7, 7, 28, 7, 7, 28, 28,
|
||||
/* 1x */ 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
|
||||
/* 2x */ 7, 15, 8, 5, 4, 22, 24, 8, 17, 18, 21, 20, 23, 11, 26, 16,
|
||||
/* 3x */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 19, 12, 14, 13, 6,
|
||||
/* 4x */ 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
/* 5x */ 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 9, 27, 27, 27, 1,
|
||||
/* 5x */ 1, 1, 1, 1, 1, 1, 1, 1, 0, 2, 2, 9, 28, 28, 28, 2,
|
||||
/* 6x */ 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
/* 7x */ 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 27, 10, 27, 25, 27,
|
||||
/* 7x */ 1, 1, 1, 1, 1, 1, 1, 1, 0, 2, 2, 28, 10, 28, 25, 28,
|
||||
/* 8x */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
||||
/* 9x */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
||||
/* Ax */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
||||
@ -78,22 +79,22 @@ static const unsigned char aiClass[] = {
|
||||
#endif
|
||||
#ifdef SQLITE_EBCDIC
|
||||
/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xa xb xc xd xe xf */
|
||||
/* 0x */ 27, 27, 27, 27, 27, 7, 27, 27, 27, 27, 27, 27, 7, 7, 27, 27,
|
||||
/* 1x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
|
||||
/* 2x */ 27, 27, 27, 27, 27, 7, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
|
||||
/* 3x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
|
||||
/* 4x */ 7, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 26, 12, 17, 20, 10,
|
||||
/* 5x */ 24, 27, 27, 27, 27, 27, 27, 27, 27, 27, 15, 4, 21, 18, 19, 27,
|
||||
/* 6x */ 11, 16, 27, 27, 27, 27, 27, 27, 27, 27, 27, 23, 22, 1, 13, 6,
|
||||
/* 7x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 8, 5, 5, 5, 8, 14, 8,
|
||||
/* 8x */ 27, 1, 1, 1, 1, 1, 1, 1, 1, 1, 27, 27, 27, 27, 27, 27,
|
||||
/* 9x */ 27, 1, 1, 1, 1, 1, 1, 1, 1, 1, 27, 27, 27, 27, 27, 27,
|
||||
/* Ax */ 27, 25, 1, 1, 1, 1, 1, 0, 1, 1, 27, 27, 27, 27, 27, 27,
|
||||
/* Bx */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 9, 27, 27, 27, 27, 27,
|
||||
/* Cx */ 27, 1, 1, 1, 1, 1, 1, 1, 1, 1, 27, 27, 27, 27, 27, 27,
|
||||
/* Dx */ 27, 1, 1, 1, 1, 1, 1, 1, 1, 1, 27, 27, 27, 27, 27, 27,
|
||||
/* Ex */ 27, 27, 1, 1, 1, 1, 1, 0, 1, 1, 27, 27, 27, 27, 27, 27,
|
||||
/* Fx */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 27, 27, 27, 27, 27, 27,
|
||||
/* 0x */ 29, 28, 28, 28, 28, 7, 28, 28, 28, 28, 28, 28, 7, 7, 28, 28,
|
||||
/* 1x */ 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
|
||||
/* 2x */ 28, 28, 28, 28, 28, 7, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
|
||||
/* 3x */ 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
|
||||
/* 4x */ 7, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 26, 12, 17, 20, 10,
|
||||
/* 5x */ 24, 28, 28, 28, 28, 28, 28, 28, 28, 28, 15, 4, 21, 18, 19, 28,
|
||||
/* 6x */ 11, 16, 28, 28, 28, 28, 28, 28, 28, 28, 28, 23, 22, 2, 13, 6,
|
||||
/* 7x */ 28, 28, 28, 28, 28, 28, 28, 28, 28, 8, 5, 5, 5, 8, 14, 8,
|
||||
/* 8x */ 28, 1, 1, 1, 1, 1, 1, 1, 1, 1, 28, 28, 28, 28, 28, 28,
|
||||
/* 9x */ 28, 1, 1, 1, 1, 1, 1, 1, 1, 1, 28, 28, 28, 28, 28, 28,
|
||||
/* Ax */ 28, 25, 1, 1, 1, 1, 1, 0, 2, 2, 28, 28, 28, 28, 28, 28,
|
||||
/* Bx */ 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 9, 28, 28, 28, 28, 28,
|
||||
/* Cx */ 28, 1, 1, 1, 1, 1, 1, 1, 1, 1, 28, 28, 28, 28, 28, 28,
|
||||
/* Dx */ 28, 1, 1, 1, 1, 1, 1, 1, 1, 1, 28, 28, 28, 28, 28, 28,
|
||||
/* Ex */ 28, 28, 1, 1, 1, 1, 1, 0, 2, 2, 28, 28, 28, 28, 28, 28,
|
||||
/* Fx */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 28, 28, 28, 28, 28, 28,
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -499,7 +500,7 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
|
||||
if( n==0 ) *tokenType = TK_ILLEGAL;
|
||||
return i;
|
||||
}
|
||||
case CC_KYWD: {
|
||||
case CC_KYWD0: {
|
||||
for(i=1; aiClass[z[i]]<=CC_KYWD; i++){}
|
||||
if( IdChar(z[i]) ){
|
||||
/* This token started out using characters that can appear in keywords,
|
||||
@ -529,6 +530,7 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
|
||||
** SQL keywords start with the letter 'x'. Fall through */
|
||||
/* no break */ deliberate_fall_through
|
||||
}
|
||||
case CC_KYWD:
|
||||
case CC_ID: {
|
||||
i = 1;
|
||||
break;
|
||||
|
||||
@ -707,9 +707,9 @@ 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%s TABLE t1(a INTEGER %s, b INTEGER %s, c TEXT %s);",
|
||||
speedtest1_exec("CREATE%s TABLE z1(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);
|
||||
speedtest1_prepare("INSERT INTO z1 VALUES(?1,?2,?3); -- %d times", n);
|
||||
for(i=1; i<=n; i++){
|
||||
x1 = swizzle(i,maxb);
|
||||
speedtest1_numbername(x1, zNum, sizeof(zNum));
|
||||
@ -726,9 +726,9 @@ void testset_main(void){
|
||||
speedtest1_begin_test(110, "%d ordered INSERTS with one index/PK", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_exec(
|
||||
"CREATE%s TABLE t2(a INTEGER %s %s, b INTEGER %s, c TEXT %s) %s",
|
||||
"CREATE%s TABLE z2(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);
|
||||
speedtest1_prepare("INSERT INTO z2 VALUES(?1,?2,?3); -- %d times", n);
|
||||
for(i=1; i<=n; i++){
|
||||
x1 = swizzle(i,maxb);
|
||||
speedtest1_numbername(x1, zNum, sizeof(zNum));
|
||||
@ -768,7 +768,7 @@ void testset_main(void){
|
||||
speedtest1_begin_test(130, "%d SELECTS, numeric BETWEEN, unindexed", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"SELECT count(*), avg(b), sum(length(c)), group_concat(c) FROM t1\n"
|
||||
"SELECT count(*), avg(b), sum(length(c)), group_concat(c) FROM z1\n"
|
||||
" WHERE b BETWEEN ?1 AND ?2; -- %d times", n
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
@ -788,7 +788,7 @@ void testset_main(void){
|
||||
speedtest1_begin_test(140, "%d SELECTS, LIKE, unindexed", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"SELECT count(*), avg(b), sum(length(c)), group_concat(c) FROM t1\n"
|
||||
"SELECT count(*), avg(b), sum(length(c)), group_concat(c) FROM z1\n"
|
||||
" WHERE c LIKE ?1; -- %d times", n
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
@ -810,7 +810,7 @@ void testset_main(void){
|
||||
speedtest1_begin_test(142, "%d SELECTS w/ORDER BY, unindexed", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"SELECT a, b, c FROM t1 WHERE c LIKE ?1\n"
|
||||
"SELECT a, b, c FROM z1 WHERE c LIKE ?1\n"
|
||||
" ORDER BY a; -- %d times", n
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
@ -831,7 +831,7 @@ void testset_main(void){
|
||||
speedtest1_begin_test(145, "%d SELECTS w/ORDER BY and LIMIT, unindexed", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"SELECT a, b, c FROM t1 WHERE c LIKE ?1\n"
|
||||
"SELECT a, b, c FROM z1 WHERE c LIKE ?1\n"
|
||||
" ORDER BY a LIMIT 10; -- %d times", n
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
@ -851,10 +851,10 @@ void testset_main(void){
|
||||
|
||||
speedtest1_begin_test(150, "CREATE INDEX five times");
|
||||
speedtest1_exec("BEGIN;");
|
||||
speedtest1_exec("CREATE UNIQUE INDEX t1b ON t1(b);");
|
||||
speedtest1_exec("CREATE INDEX t1c ON t1(c);");
|
||||
speedtest1_exec("CREATE UNIQUE INDEX t2b ON t2(b);");
|
||||
speedtest1_exec("CREATE INDEX t2c ON t2(c DESC);");
|
||||
speedtest1_exec("CREATE UNIQUE INDEX t1b ON z1(b);");
|
||||
speedtest1_exec("CREATE INDEX t1c ON z1(c);");
|
||||
speedtest1_exec("CREATE UNIQUE INDEX t2b ON z2(b);");
|
||||
speedtest1_exec("CREATE INDEX t2c ON z2(c DESC);");
|
||||
speedtest1_exec("CREATE INDEX t3bc ON t3(b,c);");
|
||||
speedtest1_exec("COMMIT;");
|
||||
speedtest1_end_test();
|
||||
@ -864,7 +864,7 @@ void testset_main(void){
|
||||
speedtest1_begin_test(160, "%d SELECTS, numeric BETWEEN, indexed", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"SELECT count(*), avg(b), sum(length(c)), group_concat(a) FROM t1\n"
|
||||
"SELECT count(*), avg(b), sum(length(c)), group_concat(a) FROM z1\n"
|
||||
" WHERE b BETWEEN ?1 AND ?2; -- %d times", n
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
@ -884,7 +884,7 @@ void testset_main(void){
|
||||
speedtest1_begin_test(161, "%d SELECTS, numeric BETWEEN, PK", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"SELECT count(*), avg(b), sum(length(c)), group_concat(a) FROM t2\n"
|
||||
"SELECT count(*), avg(b), sum(length(c)), group_concat(a) FROM z2\n"
|
||||
" WHERE a BETWEEN ?1 AND ?2; -- %d times", n
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
@ -904,7 +904,7 @@ void testset_main(void){
|
||||
speedtest1_begin_test(170, "%d SELECTS, text BETWEEN, indexed", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"SELECT count(*), avg(b), sum(length(c)), group_concat(a) FROM t1\n"
|
||||
"SELECT count(*), avg(b), sum(length(c)), group_concat(a) FROM z1\n"
|
||||
" WHERE c BETWEEN ?1 AND (?1||'~'); -- %d times", n
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
@ -930,14 +930,14 @@ void testset_main(void){
|
||||
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");
|
||||
speedtest1_exec("INSERT INTO t4 SELECT * FROM z1");
|
||||
speedtest1_exec("COMMIT");
|
||||
speedtest1_end_test();
|
||||
|
||||
n = sz;
|
||||
speedtest1_begin_test(190, "DELETE and REFILL one table", n);
|
||||
speedtest1_exec("DELETE FROM t2;");
|
||||
speedtest1_exec("INSERT INTO t2 SELECT * FROM t1;");
|
||||
speedtest1_exec("DELETE FROM z2;");
|
||||
speedtest1_exec("INSERT INTO z2 SELECT * FROM z1;");
|
||||
speedtest1_end_test();
|
||||
|
||||
|
||||
@ -947,8 +947,8 @@ void testset_main(void){
|
||||
|
||||
|
||||
speedtest1_begin_test(210, "ALTER TABLE ADD COLUMN, and query");
|
||||
speedtest1_exec("ALTER TABLE t2 ADD COLUMN d DEFAULT 123");
|
||||
speedtest1_exec("SELECT sum(d) FROM t2");
|
||||
speedtest1_exec("ALTER TABLE z2 ADD COLUMN d DEFAULT 123");
|
||||
speedtest1_exec("SELECT sum(d) FROM z2");
|
||||
speedtest1_end_test();
|
||||
|
||||
|
||||
@ -956,7 +956,7 @@ void testset_main(void){
|
||||
speedtest1_begin_test(230, "%d UPDATES, numeric BETWEEN, indexed", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"UPDATE t2 SET d=b*2 WHERE b BETWEEN ?1 AND ?2; -- %d times", n
|
||||
"UPDATE z2 SET d=b*2 WHERE b BETWEEN ?1 AND ?2; -- %d times", n
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
x1 = speedtest1_random()%maxb;
|
||||
@ -973,7 +973,7 @@ void testset_main(void){
|
||||
speedtest1_begin_test(240, "%d UPDATES of individual rows", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"UPDATE t2 SET d=b*3 WHERE a=?1; -- %d times", n
|
||||
"UPDATE z2 SET d=b*3 WHERE a=?1; -- %d times", n
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
x1 = speedtest1_random()%sz + 1;
|
||||
@ -984,12 +984,12 @@ void testset_main(void){
|
||||
speedtest1_end_test();
|
||||
|
||||
speedtest1_begin_test(250, "One big UPDATE of the whole %d-row table", sz);
|
||||
speedtest1_exec("UPDATE t2 SET d=b*4");
|
||||
speedtest1_exec("UPDATE z2 SET d=b*4");
|
||||
speedtest1_end_test();
|
||||
|
||||
|
||||
speedtest1_begin_test(260, "Query added column after filling");
|
||||
speedtest1_exec("SELECT sum(d) FROM t2");
|
||||
speedtest1_exec("SELECT sum(d) FROM z2");
|
||||
speedtest1_end_test();
|
||||
|
||||
|
||||
@ -998,7 +998,7 @@ void testset_main(void){
|
||||
speedtest1_begin_test(270, "%d DELETEs, numeric BETWEEN, indexed", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"DELETE FROM t2 WHERE b BETWEEN ?1 AND ?2; -- %d times", n
|
||||
"DELETE FROM z2 WHERE b BETWEEN ?1 AND ?2; -- %d times", n
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
x1 = speedtest1_random()%maxb + 1;
|
||||
@ -1027,16 +1027,16 @@ void testset_main(void){
|
||||
|
||||
|
||||
speedtest1_begin_test(290, "Refill two %d-row tables using REPLACE", sz);
|
||||
speedtest1_exec("REPLACE INTO t2(a,b,c) SELECT a,b,c FROM t1");
|
||||
speedtest1_exec("REPLACE INTO t3(a,b,c) SELECT a,b,c FROM t1");
|
||||
speedtest1_exec("REPLACE INTO z2(a,b,c) SELECT a,b,c FROM z1");
|
||||
speedtest1_exec("REPLACE INTO t3(a,b,c) SELECT a,b,c FROM z1");
|
||||
speedtest1_end_test();
|
||||
|
||||
speedtest1_begin_test(300, "Refill a %d-row table using (b&1)==(a&1)", sz);
|
||||
speedtest1_exec("DELETE FROM t2;");
|
||||
speedtest1_exec("INSERT INTO t2(a,b,c)\n"
|
||||
" SELECT a,b,c FROM t1 WHERE (b&1)==(a&1);");
|
||||
speedtest1_exec("INSERT INTO t2(a,b,c)\n"
|
||||
" SELECT a,b,c FROM t1 WHERE (b&1)<>(a&1);");
|
||||
speedtest1_exec("DELETE FROM z2;");
|
||||
speedtest1_exec("INSERT INTO z2(a,b,c)\n"
|
||||
" SELECT a,b,c FROM z1 WHERE (b&1)==(a&1);");
|
||||
speedtest1_exec("INSERT INTO z2(a,b,c)\n"
|
||||
" SELECT a,b,c FROM z1 WHERE (b&1)<>(a&1);");
|
||||
speedtest1_end_test();
|
||||
|
||||
|
||||
@ -1044,11 +1044,11 @@ void testset_main(void){
|
||||
speedtest1_begin_test(310, "%d four-ways joins", n);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare(
|
||||
"SELECT t1.c FROM t1, t2, t3, t4\n"
|
||||
"SELECT z1.c FROM z1, z2, t3, t4\n"
|
||||
" WHERE t4.a BETWEEN ?1 AND ?2\n"
|
||||
" AND t3.a=t4.b\n"
|
||||
" AND t2.a=t3.b\n"
|
||||
" AND t1.c=t2.c"
|
||||
" AND z2.a=t3.b\n"
|
||||
" AND z1.c=z2.c"
|
||||
);
|
||||
for(i=1; i<=n; i++){
|
||||
x1 = speedtest1_random()%sz + 1;
|
||||
@ -1063,8 +1063,8 @@ void testset_main(void){
|
||||
speedtest1_begin_test(320, "subquery in result set", n);
|
||||
speedtest1_prepare(
|
||||
"SELECT sum(a), max(c),\n"
|
||||
" avg((SELECT a FROM t2 WHERE 5+t2.b=t1.b) AND rowid<?1), max(c)\n"
|
||||
" FROM t1 WHERE rowid<?1;"
|
||||
" avg((SELECT a FROM z2 WHERE 5+z2.b=z1.b) AND rowid<?1), max(c)\n"
|
||||
" FROM z1 WHERE rowid<?1;"
|
||||
);
|
||||
sqlite3_bind_int(g.pStmt, 1, est_square_root(g.szTest)*50);
|
||||
speedtest1_run();
|
||||
@ -1282,10 +1282,10 @@ void testset_cte(void){
|
||||
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"
|
||||
" z1(x) AS (VALUES(2) UNION ALL SELECT x+2 FROM z1 WHERE x<%d),\n"
|
||||
" z2(y) AS (VALUES(3) UNION ALL SELECT y+3 FROM z2 WHERE y<%d)\n"
|
||||
"SELECT count(x), avg(x) FROM (\n"
|
||||
" SELECT x FROM t1 EXCEPT SELECT y FROM t2 ORDER BY 1\n"
|
||||
" SELECT x FROM z1 EXCEPT SELECT y FROM z2 ORDER BY 1\n"
|
||||
");",
|
||||
nElem, nElem
|
||||
);
|
||||
@ -1318,9 +1318,9 @@ void testset_fp(void){
|
||||
n = g.szTest*5000;
|
||||
speedtest1_begin_test(100, "Fill a table with %d FP values", n*2);
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_exec("CREATE%s TABLE t1(a REAL %s, b REAL %s);",
|
||||
speedtest1_exec("CREATE%s TABLE z1(a REAL %s, b REAL %s);",
|
||||
isTemp(1), g.zNN, g.zNN);
|
||||
speedtest1_prepare("INSERT INTO t1 VALUES(?1,?2); -- %d times", n);
|
||||
speedtest1_prepare("INSERT INTO z1 VALUES(?1,?2); -- %d times", n);
|
||||
for(i=1; i<=n; i++){
|
||||
speedtest1_random_ascii_fp(zFP1);
|
||||
speedtest1_random_ascii_fp(zFP2);
|
||||
@ -1333,7 +1333,7 @@ void testset_fp(void){
|
||||
|
||||
n = g.szTest/25 + 2;
|
||||
speedtest1_begin_test(110, "%d range queries", n);
|
||||
speedtest1_prepare("SELECT sum(b) FROM t1 WHERE a BETWEEN ?1 AND ?2");
|
||||
speedtest1_prepare("SELECT sum(b) FROM z1 WHERE a BETWEEN ?1 AND ?2");
|
||||
for(i=1; i<=n; i++){
|
||||
speedtest1_random_ascii_fp(zFP1);
|
||||
speedtest1_random_ascii_fp(zFP2);
|
||||
@ -1345,15 +1345,15 @@ void testset_fp(void){
|
||||
|
||||
speedtest1_begin_test(120, "CREATE INDEX three times");
|
||||
speedtest1_exec("BEGIN;");
|
||||
speedtest1_exec("CREATE INDEX t1a ON t1(a);");
|
||||
speedtest1_exec("CREATE INDEX t1b ON t1(b);");
|
||||
speedtest1_exec("CREATE INDEX t1ab ON t1(a,b);");
|
||||
speedtest1_exec("CREATE INDEX t1a ON z1(a);");
|
||||
speedtest1_exec("CREATE INDEX t1b ON z1(b);");
|
||||
speedtest1_exec("CREATE INDEX t1ab ON z1(a,b);");
|
||||
speedtest1_exec("COMMIT;");
|
||||
speedtest1_end_test();
|
||||
|
||||
n = g.szTest/3 + 2;
|
||||
speedtest1_begin_test(130, "%d indexed range queries", n);
|
||||
speedtest1_prepare("SELECT sum(b) FROM t1 WHERE a BETWEEN ?1 AND ?2");
|
||||
speedtest1_prepare("SELECT sum(b) FROM z1 WHERE a BETWEEN ?1 AND ?2");
|
||||
for(i=1; i<=n; i++){
|
||||
speedtest1_random_ascii_fp(zFP1);
|
||||
speedtest1_random_ascii_fp(zFP2);
|
||||
@ -1365,14 +1365,14 @@ void testset_fp(void){
|
||||
|
||||
n = g.szTest*5000;
|
||||
speedtest1_begin_test(140, "%d calls to round()", n);
|
||||
speedtest1_exec("SELECT sum(round(a,2)+round(b,4)) FROM t1;");
|
||||
speedtest1_exec("SELECT sum(round(a,2)+round(b,4)) FROM z1;");
|
||||
speedtest1_end_test();
|
||||
|
||||
|
||||
speedtest1_begin_test(150, "%d printf() calls", n*4);
|
||||
speedtest1_exec(
|
||||
"WITH c(fmt) AS (VALUES('%%g'),('%%e'),('%%!g'),('%%.20f'))"
|
||||
"SELECT sum(printf(fmt,a)) FROM t1, c"
|
||||
"SELECT sum(printf(fmt,a)) FROM z1, c"
|
||||
);
|
||||
speedtest1_end_test();
|
||||
}
|
||||
@ -1458,8 +1458,8 @@ 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("INSERT INTO t1 SELECT * FROM rt1");
|
||||
speedtest1_exec("CREATE TABLE z1(id INTEGER PRIMARY KEY,x0,x1,y0,y1,z0,z1)");
|
||||
speedtest1_exec("INSERT INTO z1 SELECT * FROM rt1");
|
||||
speedtest1_end_test();
|
||||
|
||||
n = g.szTest*200;
|
||||
@ -1477,7 +1477,7 @@ void testset_rtree(int p1, int p2){
|
||||
if( g.bVerify ){
|
||||
n = g.szTest*200;
|
||||
speedtest1_begin_test(111, "Verify result from 1-D intersect slice queries");
|
||||
speedtest1_prepare("SELECT count(*) FROM t1 WHERE x0>=?1 AND x1<=?2");
|
||||
speedtest1_prepare("SELECT count(*) FROM z1 WHERE x0>=?1 AND x1<=?2");
|
||||
iStep = mxCoord/n;
|
||||
for(i=0; i<n; i++){
|
||||
sqlite3_bind_int(g.pStmt, 1, i*iStep);
|
||||
@ -1506,7 +1506,7 @@ void testset_rtree(int p1, int p2){
|
||||
if( g.bVerify ){
|
||||
n = g.szTest*200;
|
||||
speedtest1_begin_test(121, "Verify result from 1-D overlap slice queries");
|
||||
speedtest1_prepare("SELECT count(*) FROM t1 WHERE y1>=?1 AND y0<=?2");
|
||||
speedtest1_prepare("SELECT count(*) FROM z1 WHERE y1>=?1 AND y0<=?2");
|
||||
iStep = mxCoord/n;
|
||||
for(i=0; i<n; i++){
|
||||
sqlite3_bind_int(g.pStmt, 1, i*iStep);
|
||||
@ -1602,7 +1602,7 @@ void testset_rtree(int p1, int p2){
|
||||
speedtest1_end_test();
|
||||
|
||||
speedtest1_begin_test(170, "Restore deleted entries using INSERT OR IGNORE");
|
||||
speedtest1_exec("INSERT OR IGNORE INTO rt1 SELECT * FROM t1");
|
||||
speedtest1_exec("INSERT OR IGNORE INTO rt1 SELECT * FROM z1");
|
||||
speedtest1_end_test();
|
||||
}
|
||||
#endif /* SQLITE_ENABLE_RTREE */
|
||||
@ -1887,11 +1887,11 @@ void testset_trigger(void){
|
||||
|
||||
speedtest1_exec(
|
||||
"BEGIN;"
|
||||
"CREATE TABLE t1(rowid INTEGER PRIMARY KEY, i INTEGER, t TEXT);"
|
||||
"CREATE TABLE t2(rowid INTEGER PRIMARY KEY, i INTEGER, t TEXT);"
|
||||
"CREATE TABLE z1(rowid INTEGER PRIMARY KEY, i INTEGER, t TEXT);"
|
||||
"CREATE TABLE z2(rowid INTEGER PRIMARY KEY, i INTEGER, t TEXT);"
|
||||
"CREATE TABLE t3(rowid INTEGER PRIMARY KEY, i INTEGER, t TEXT);"
|
||||
"CREATE VIEW v1 AS SELECT rowid, i, t FROM t1;"
|
||||
"CREATE VIEW v2 AS SELECT rowid, i, t FROM t2;"
|
||||
"CREATE VIEW v1 AS SELECT rowid, i, t FROM z1;"
|
||||
"CREATE VIEW v2 AS SELECT rowid, i, t FROM z2;"
|
||||
"CREATE VIEW v3 AS SELECT rowid, i, t FROM t3;"
|
||||
);
|
||||
for(jj=1; jj<=3; jj++){
|
||||
@ -1905,22 +1905,22 @@ void testset_trigger(void){
|
||||
}
|
||||
}
|
||||
speedtest1_exec(
|
||||
"CREATE INDEX i1 ON t1(t);"
|
||||
"CREATE INDEX i2 ON t2(t);"
|
||||
"CREATE INDEX i1 ON z1(t);"
|
||||
"CREATE INDEX i2 ON z2(t);"
|
||||
"CREATE INDEX i3 ON t3(t);"
|
||||
"COMMIT;"
|
||||
);
|
||||
|
||||
speedtest1_begin_test(100, "speed4p-join1");
|
||||
speedtest1_prepare(
|
||||
"SELECT * FROM t1, t2, t3 WHERE t1.oid = t2.oid AND t2.oid = t3.oid"
|
||||
"SELECT * FROM z1, z2, t3 WHERE z1.oid = z2.oid AND z2.oid = t3.oid"
|
||||
);
|
||||
speedtest1_run();
|
||||
speedtest1_end_test();
|
||||
|
||||
speedtest1_begin_test(110, "speed4p-join2");
|
||||
speedtest1_prepare(
|
||||
"SELECT * FROM t1, t2, t3 WHERE t1.t = t2.t AND t2.t = t3.t"
|
||||
"SELECT * FROM z1, z2, t3 WHERE z1.t = z2.t AND z2.t = t3.t"
|
||||
);
|
||||
speedtest1_run();
|
||||
speedtest1_end_test();
|
||||
@ -1957,8 +1957,8 @@ void testset_trigger(void){
|
||||
|
||||
speedtest1_begin_test(150, "speed4p-subselect1");
|
||||
speedtest1_prepare("SELECT "
|
||||
"(SELECT t FROM t1 WHERE rowid = ?1),"
|
||||
"(SELECT t FROM t2 WHERE rowid = ?1),"
|
||||
"(SELECT t FROM z1 WHERE rowid = ?1),"
|
||||
"(SELECT t FROM z2 WHERE rowid = ?1),"
|
||||
"(SELECT t FROM t3 WHERE rowid = ?1)"
|
||||
);
|
||||
for(jj=0; jj<NROW2; jj++){
|
||||
@ -1969,7 +1969,7 @@ void testset_trigger(void){
|
||||
|
||||
speedtest1_begin_test(160, "speed4p-rowid-update");
|
||||
speedtest1_exec("BEGIN");
|
||||
speedtest1_prepare("UPDATE t1 SET i=i+1 WHERE rowid=?1");
|
||||
speedtest1_prepare("UPDATE z1 SET i=i+1 WHERE rowid=?1");
|
||||
for(jj=0; jj<NROW2; jj++){
|
||||
sqlite3_bind_int(g.pStmt, 1, jj);
|
||||
speedtest1_run();
|
||||
@ -1979,7 +1979,7 @@ void testset_trigger(void){
|
||||
|
||||
speedtest1_exec("CREATE TABLE t5(t TEXT PRIMARY KEY, i INTEGER);");
|
||||
speedtest1_begin_test(170, "speed4p-insert-ignore");
|
||||
speedtest1_exec("INSERT OR IGNORE INTO t5 SELECT t, i FROM t1");
|
||||
speedtest1_exec("INSERT OR IGNORE INTO t5 SELECT t, i FROM z1");
|
||||
speedtest1_end_test();
|
||||
|
||||
speedtest1_exec(
|
||||
|
||||
Reference in New Issue
Block a user