Enhancements to the query planner to exploit transitive relationships in the
WHERE clause, and other minor changes to bring the sessions branch into alignment with the trunk. FossilOrigin-Name: 82d3d1ae824e1fbc7958657be79231590ec17ace
This commit is contained in:
@@ -257,5 +257,129 @@ do_execsql_test autoindex1-700 {
|
||||
0 0 0 {USE TEMP B-TREE FOR ORDER BY}
|
||||
}
|
||||
|
||||
# The following checks a performance issue reported on the sqlite-dev
|
||||
# mailing list on 2013-01-10
|
||||
#
|
||||
do_execsql_test autoindex1-800 {
|
||||
CREATE TABLE accounts(
|
||||
_id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
account_name TEXT,
|
||||
account_type TEXT,
|
||||
data_set TEXT
|
||||
);
|
||||
CREATE TABLE data(
|
||||
_id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
package_id INTEGER REFERENCES package(_id),
|
||||
mimetype_id INTEGER REFERENCES mimetype(_id) NOT NULL,
|
||||
raw_contact_id INTEGER REFERENCES raw_contacts(_id) NOT NULL,
|
||||
is_read_only INTEGER NOT NULL DEFAULT 0,
|
||||
is_primary INTEGER NOT NULL DEFAULT 0,
|
||||
is_super_primary INTEGER NOT NULL DEFAULT 0,
|
||||
data_version INTEGER NOT NULL DEFAULT 0,
|
||||
data1 TEXT,
|
||||
data2 TEXT,
|
||||
data3 TEXT,
|
||||
data4 TEXT,
|
||||
data5 TEXT,
|
||||
data6 TEXT,
|
||||
data7 TEXT,
|
||||
data8 TEXT,
|
||||
data9 TEXT,
|
||||
data10 TEXT,
|
||||
data11 TEXT,
|
||||
data12 TEXT,
|
||||
data13 TEXT,
|
||||
data14 TEXT,
|
||||
data15 TEXT,
|
||||
data_sync1 TEXT,
|
||||
data_sync2 TEXT,
|
||||
data_sync3 TEXT,
|
||||
data_sync4 TEXT
|
||||
);
|
||||
CREATE TABLE mimetypes(
|
||||
_id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
mimetype TEXT NOT NULL
|
||||
);
|
||||
CREATE TABLE raw_contacts(
|
||||
_id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
account_id INTEGER REFERENCES accounts(_id),
|
||||
sourceid TEXT,
|
||||
raw_contact_is_read_only INTEGER NOT NULL DEFAULT 0,
|
||||
version INTEGER NOT NULL DEFAULT 1,
|
||||
dirty INTEGER NOT NULL DEFAULT 0,
|
||||
deleted INTEGER NOT NULL DEFAULT 0,
|
||||
contact_id INTEGER REFERENCES contacts(_id),
|
||||
aggregation_mode INTEGER NOT NULL DEFAULT 0,
|
||||
aggregation_needed INTEGER NOT NULL DEFAULT 1,
|
||||
custom_ringtone TEXT,
|
||||
send_to_voicemail INTEGER NOT NULL DEFAULT 0,
|
||||
times_contacted INTEGER NOT NULL DEFAULT 0,
|
||||
last_time_contacted INTEGER,
|
||||
starred INTEGER NOT NULL DEFAULT 0,
|
||||
display_name TEXT,
|
||||
display_name_alt TEXT,
|
||||
display_name_source INTEGER NOT NULL DEFAULT 0,
|
||||
phonetic_name TEXT,
|
||||
phonetic_name_style TEXT,
|
||||
sort_key TEXT,
|
||||
sort_key_alt TEXT,
|
||||
name_verified INTEGER NOT NULL DEFAULT 0,
|
||||
sync1 TEXT,
|
||||
sync2 TEXT,
|
||||
sync3 TEXT,
|
||||
sync4 TEXT,
|
||||
sync_uid TEXT,
|
||||
sync_version INTEGER NOT NULL DEFAULT 1,
|
||||
has_calendar_event INTEGER NOT NULL DEFAULT 0,
|
||||
modified_time INTEGER,
|
||||
is_restricted INTEGER DEFAULT 0,
|
||||
yp_source TEXT,
|
||||
method_selected INTEGER DEFAULT 0,
|
||||
custom_vibration_type INTEGER DEFAULT 0,
|
||||
custom_ringtone_path TEXT,
|
||||
message_notification TEXT,
|
||||
message_notification_path TEXT
|
||||
);
|
||||
CREATE INDEX data_mimetype_data1_index ON data (mimetype_id,data1);
|
||||
CREATE INDEX data_raw_contact_id ON data (raw_contact_id);
|
||||
CREATE UNIQUE INDEX mime_type ON mimetypes (mimetype);
|
||||
CREATE INDEX raw_contact_sort_key1_index ON raw_contacts (sort_key);
|
||||
CREATE INDEX raw_contact_sort_key2_index ON raw_contacts (sort_key_alt);
|
||||
CREATE INDEX raw_contacts_contact_id_index ON raw_contacts (contact_id);
|
||||
CREATE INDEX raw_contacts_source_id_account_id_index
|
||||
ON raw_contacts (sourceid, account_id);
|
||||
ANALYZE sqlite_master;
|
||||
INSERT INTO sqlite_stat1
|
||||
VALUES('raw_contacts','raw_contact_sort_key2_index','1600 4');
|
||||
INSERT INTO sqlite_stat1
|
||||
VALUES('raw_contacts','raw_contact_sort_key1_index','1600 4');
|
||||
INSERT INTO sqlite_stat1
|
||||
VALUES('raw_contacts','raw_contacts_source_id_account_id_index',
|
||||
'1600 1600 1600');
|
||||
INSERT INTO sqlite_stat1
|
||||
VALUES('raw_contacts','raw_contacts_contact_id_index','1600 1');
|
||||
INSERT INTO sqlite_stat1 VALUES('mimetypes','mime_type','12 1');
|
||||
INSERT INTO sqlite_stat1
|
||||
VALUES('data','data_mimetype_data1_index','9819 2455 3');
|
||||
INSERT INTO sqlite_stat1 VALUES('data','data_raw_contact_id','9819 7');
|
||||
INSERT INTO sqlite_stat1 VALUES('accounts',NULL,'1');
|
||||
DROP TABLE IF EXISTS sqlite_stat3;
|
||||
ANALYZE sqlite_master;
|
||||
|
||||
EXPLAIN QUERY PLAN
|
||||
SELECT * FROM
|
||||
data JOIN mimetypes ON (data.mimetype_id=mimetypes._id)
|
||||
JOIN raw_contacts ON (data.raw_contact_id=raw_contacts._id)
|
||||
JOIN accounts ON (raw_contacts.account_id=accounts._id)
|
||||
WHERE mimetype_id=10 AND data14 IS NOT NULL;
|
||||
} {/SEARCH TABLE data .*SEARCH TABLE raw_contacts/}
|
||||
do_execsql_test autoindex1-801 {
|
||||
EXPLAIN QUERY PLAN
|
||||
SELECT * FROM
|
||||
data JOIN mimetypes ON (data.mimetype_id=mimetypes._id)
|
||||
JOIN raw_contacts ON (data.raw_contact_id=raw_contacts._id)
|
||||
JOIN accounts ON (raw_contacts.account_id=accounts._id)
|
||||
WHERE mimetypes._id=10 AND data14 IS NOT NULL;
|
||||
} {/SEARCH TABLE data .*SEARCH TABLE raw_contacts/}
|
||||
|
||||
finish_test
|
||||
|
||||
@@ -46,6 +46,8 @@ ifcapable !fts3 {
|
||||
# 8.* - Test that if the content=xxx and prefix options are used together,
|
||||
# the 'rebuild' command still works.
|
||||
#
|
||||
# 9.* - Test using content=xxx where xxx is a virtual table.
|
||||
#
|
||||
|
||||
do_execsql_test 1.1.1 {
|
||||
CREATE TABLE t1(a, b, c);
|
||||
@@ -522,4 +524,103 @@ do_execsql_test 8.4 { SELECT rowid FROM ft10 WHERE a MATCH 'ab*'; } {1 2 3}
|
||||
do_execsql_test 8.5 { SELECT rowid FROM ft10 WHERE b MATCH 'abav*'; } {3}
|
||||
do_execsql_test 8.6 { SELECT rowid FROM ft10 WHERE ft10 MATCH 'abas*'; } {1}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Test cases 9.*
|
||||
#
|
||||
reset_db
|
||||
register_echo_module [sqlite3_connection_pointer db]
|
||||
|
||||
do_execsql_test 9.1 {
|
||||
CREATE TABLE tbl1(a, b);
|
||||
INSERT INTO tbl1 VALUES('a b', 'c d');
|
||||
INSERT INTO tbl1 VALUES('e f', 'a b');
|
||||
CREATE VIRTUAL TABLE e1 USING echo(tbl1);
|
||||
CREATE VIRTUAL TABLE ft1 USING fts4(content=e1);
|
||||
INSERT INTO ft1(ft1) VALUES('rebuild');
|
||||
}
|
||||
|
||||
do_execsql_test 9.2 {
|
||||
SELECT rowid, * FROM ft1 WHERE ft1 MATCH 'e'
|
||||
} {2 {e f} {a b}}
|
||||
|
||||
do_execsql_test 9.3 {
|
||||
SELECT rowid, * FROM ft1 WHERE ft1 MATCH 'a'
|
||||
} {1 {a b} {c d} 2 {e f} {a b}}
|
||||
|
||||
do_execsql_test 9.4 {
|
||||
DELETE FROM ft1 WHERE docid=1;
|
||||
}
|
||||
|
||||
do_execsql_test 9.5 {
|
||||
SELECT rowid, * FROM ft1 WHERE ft1 MATCH 'a'
|
||||
} {2 {e f} {a b}}
|
||||
|
||||
do_execsql_test 9.6 {
|
||||
INSERT INTO ft1(ft1) VALUES('rebuild');
|
||||
SELECT rowid, * FROM ft1 WHERE ft1 MATCH 'a'
|
||||
} {1 {a b} {c d} 2 {e f} {a b}}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Test cases 10.*
|
||||
#
|
||||
reset_db
|
||||
register_fs_module [sqlite3_connection_pointer db]
|
||||
|
||||
proc write_file {path text} {
|
||||
set fd [open $path w]
|
||||
puts -nonewline $fd $text
|
||||
close $fd
|
||||
}
|
||||
|
||||
write_file t1.txt {a b c d e f g h i j k l m n o p q r s t u v w x y z}
|
||||
write_file t2.txt {a b c d e f g h i j k l m a b c d e f g h i j k l m}
|
||||
write_file t3.txt {n o p q r s t u v w x y z n o p q r s t u v w x y z}
|
||||
|
||||
do_execsql_test 10.1 {
|
||||
CREATE TABLE idx(id INTEGER PRIMARY KEY, path TEXT);
|
||||
INSERT INTO idx VALUES (1, 't1.txt');
|
||||
INSERT INTO idx VALUES (2, 't2.txt');
|
||||
INSERT INTO idx VALUES (3, 't3.txt');
|
||||
|
||||
CREATE VIRTUAL TABLE vt USING fs(idx);
|
||||
SELECT * FROM vt;
|
||||
} {
|
||||
1 {a b c d e f g h i j k l m n o p q r s t u v w x y z}
|
||||
2 {a b c d e f g h i j k l m a b c d e f g h i j k l m}
|
||||
3 {n o p q r s t u v w x y z n o p q r s t u v w x y z}
|
||||
}
|
||||
|
||||
do_execsql_test 10.2 {
|
||||
SELECT * FROM vt WHERE rowid = 2;
|
||||
} {
|
||||
2 {a b c d e f g h i j k l m a b c d e f g h i j k l m}
|
||||
}
|
||||
|
||||
do_execsql_test 10.3 {
|
||||
CREATE VIRTUAL TABLE ft USING fts4(content=vt);
|
||||
INSERT INTO ft(ft) VALUES('rebuild');
|
||||
}
|
||||
|
||||
do_execsql_test 10.4 {
|
||||
SELECT snippet(ft, '[', ']', '...', -1, 5) FROM ft WHERE ft MATCH 'e'
|
||||
} {
|
||||
{...c d [e] f g...} {...c d [e] f g...}
|
||||
}
|
||||
|
||||
do_execsql_test 10.5 {
|
||||
SELECT snippet(ft, '[', ']', '...', -1, 5) FROM ft WHERE ft MATCH 't'
|
||||
} {
|
||||
{...r s [t] u v...} {...r s [t] u v...}
|
||||
}
|
||||
|
||||
do_execsql_test 10.6 { DELETE FROM ft WHERE docid=2 }
|
||||
|
||||
do_execsql_test 10.7 {
|
||||
SELECT snippet(ft, '[', ']', '...', -1, 5) FROM ft WHERE ft MATCH 'e'
|
||||
} {
|
||||
{...c d [e] f g...}
|
||||
}
|
||||
|
||||
finish_test
|
||||
|
||||
|
||||
+2
-2
@@ -197,12 +197,12 @@ do_execsql_test regexp1-2.15 {
|
||||
do_execsql_test regexp1-2.20 {
|
||||
SELECT 'abc$¢€xyz' REGEXP '^abc\u0024\u00a2\u20acxyz$',
|
||||
'abc$¢€xyz' REGEXP '^abc\u0024\u00A2\u20ACxyz$',
|
||||
'abc$¢€xyz' REGEXP '^abc\x24\xa2\x20acxyz$'
|
||||
'abc$¢€xyz' REGEXP '^abc\x24\xa2\u20acxyz$'
|
||||
} {1 1 1}
|
||||
do_execsql_test regexp1-2.21 {
|
||||
SELECT 'abc$¢€xyz' REGEXP '^abc[\u0024][\u00a2][\u20ac]xyz$',
|
||||
'abc$¢€xyz' REGEXP '^abc[\u0024\u00A2\u20AC]{3}xyz$',
|
||||
'abc$¢€xyz' REGEXP '^abc[\x24][\xa2\x20ac]+xyz$'
|
||||
'abc$¢€xyz' REGEXP '^abc[\x24][\xa2\u20ac]+xyz$'
|
||||
} {1 1 1}
|
||||
do_execsql_test regexp1-2.22 {
|
||||
SELECT 'abc$¢€xyz' REGEXP '^abc[^\u0025-X][^ -\u007f][^\u20ab]xyz$'
|
||||
|
||||
+2
-2
@@ -253,7 +253,7 @@ do_test shell1-2.4.2 {
|
||||
# .backup ?DB? FILE Backup DB (default "main") to FILE
|
||||
do_test shell1-3.1.1 {
|
||||
catchcmd "test.db" ".backup"
|
||||
} {1 {Error: unknown command or invalid arguments: "backup". Enter ".help" for help}}
|
||||
} {1 {missing FILENAME argument on .backup}}
|
||||
do_test shell1-3.1.2 {
|
||||
catchcmd "test.db" ".backup FOO"
|
||||
} {0 {}}
|
||||
@@ -263,7 +263,7 @@ do_test shell1-3.1.3 {
|
||||
do_test shell1-3.1.4 {
|
||||
# too many arguments
|
||||
catchcmd "test.db" ".backup FOO BAR BAD"
|
||||
} {1 {Error: unknown command or invalid arguments: "backup". Enter ".help" for help}}
|
||||
} {1 {too many arguments to .backup}}
|
||||
|
||||
# .bail ON|OFF Stop after hitting an error. Default OFF
|
||||
do_test shell1-3.2.1 {
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
# 2013 April 17
|
||||
#
|
||||
# The author disclaims copyright to this source code. In place of
|
||||
# a legal notice, here is a blessing:
|
||||
#
|
||||
# May you do good and not evil.
|
||||
# May you find forgiveness for yourself and forgive others.
|
||||
# May you share freely, never taking more than you give.
|
||||
#
|
||||
#*************************************************************************
|
||||
# This file implements regression tests for SQLite library. The
|
||||
# focus of this script is testing of transitive WHERE clause constraints
|
||||
#
|
||||
|
||||
set testdir [file dirname $argv0]
|
||||
source $testdir/tester.tcl
|
||||
|
||||
do_execsql_test transitive1-100 {
|
||||
CREATE TABLE t1(a TEXT, b TEXT, c TEXT COLLATE NOCASE);
|
||||
INSERT INTO t1 VALUES('abc','abc','Abc');
|
||||
INSERT INTO t1 VALUES('def','def','def');
|
||||
INSERT INTO t1 VALUES('ghi','ghi','GHI');
|
||||
CREATE INDEX t1a1 ON t1(a);
|
||||
CREATE INDEX t1a2 ON t1(a COLLATE nocase);
|
||||
|
||||
SELECT * FROM t1 WHERE a=b AND c=b AND c='DEF';
|
||||
} {def def def}
|
||||
do_execsql_test transitive1-110 {
|
||||
SELECT * FROM t1 WHERE a=b AND c=b AND c>='DEF' ORDER BY +a;
|
||||
} {def def def ghi ghi GHI}
|
||||
do_execsql_test transitive1-120 {
|
||||
SELECT * FROM t1 WHERE a=b AND c=b AND c<='DEF' ORDER BY +a;
|
||||
} {abc abc Abc def def def}
|
||||
|
||||
do_execsql_test transitive1-200 {
|
||||
CREATE TABLE t2(a INTEGER, b INTEGER, c TEXT);
|
||||
INSERT INTO t2 VALUES(100,100,100);
|
||||
INSERT INTO t2 VALUES(20,20,20);
|
||||
INSERT INTO t2 VALUES(3,3,3);
|
||||
|
||||
SELECT * FROM t2 WHERE a=b AND c=b AND c=20;
|
||||
} {20 20 20}
|
||||
do_execsql_test transitive1-210 {
|
||||
SELECT * FROM t2 WHERE a=b AND c=b AND c>=20 ORDER BY +a;
|
||||
} {3 3 3 20 20 20}
|
||||
do_execsql_test transitive1-220 {
|
||||
SELECT * FROM t2 WHERE a=b AND c=b AND c<=20 ORDER BY +a;
|
||||
} {20 20 20 100 100 100}
|
||||
|
||||
finish_test
|
||||
Reference in New Issue
Block a user