Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add an OOM fault injection test for the new code on this branch. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | stat4-skipscan |
| Files: | files | file ages | folders |
| SHA1: |
c96de490ac77dd23c108004b95152cce |
| User & Date: | dan 2014-06-28 19:06:49 |
Context
|
2014-06-30
| ||
| 19:07 | Attempt to use STAT4 information to estimate the selectivity of WHERE clause terms when using the skip-scan optimization. (check-in: d09ca6d5 user: drh tags: trunk) | |
|
2014-06-28
| ||
| 19:06 | Add an OOM fault injection test for the new code on this branch. (Closed-Leaf check-in: c96de490 user: dan tags: stat4-skipscan) | |
| 17:35 | Add further tests to skipscan5.test. (check-in: 4b8230e8 user: dan tags: stat4-skipscan) | |
Changes
Changes to src/vdbeaux.c.
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
....
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
|
assert( mem1.zMalloc==0 );
/* rc==0 here means that one or both of the keys ran out of fields and
** all the fields up to that point were equal. Return the the default_rc
** value. */
assert( CORRUPT_DB
|| pPKey2->default_rc==vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)
);
return pPKey2->default_rc;
}
/*
** This function is an optimized version of sqlite3VdbeRecordCompare()
** that (a) the first field of pPKey2 is an integer, and (b) the
................................................................................
}
}
assert( (res==0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)==0)
|| (res<0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)<0)
|| (res>0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)>0)
|| CORRUPT_DB
);
return res;
}
/*
** Return a pointer to an sqlite3VdbeRecordCompare() compatible function
** suitable for comparing serialized records to the unpacked record passed
|
>
>
|
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
....
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
|
assert( mem1.zMalloc==0 );
/* rc==0 here means that one or both of the keys ran out of fields and
** all the fields up to that point were equal. Return the the default_rc
** value. */
assert( CORRUPT_DB
|| pPKey2->default_rc==vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)
|| pKeyInfo->db->mallocFailed
);
return pPKey2->default_rc;
}
/*
** This function is an optimized version of sqlite3VdbeRecordCompare()
** that (a) the first field of pPKey2 is an integer, and (b) the
................................................................................
}
}
assert( (res==0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)==0)
|| (res<0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)<0)
|| (res>0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)>0)
|| CORRUPT_DB
|| pPKey2->pKeyInfo->db->mallocFailed
);
return res;
}
/*
** Return a pointer to an sqlite3VdbeRecordCompare() compatible function
** suitable for comparing serialized records to the unpacked record passed
|
Changes to test/mallocK.test.
12
13
14
15
16
17
18
19
20
21
22
23
24
25
..
64
65
66
67
68
69
70
71
72
|
# This test script checks malloc failures in WHERE clause analysis.
#
# $Id: mallocK.test,v 1.3 2009/01/08 21:00:03 drh Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
source $testdir/malloc_common.tcl
set sql {SELECT * FROM t1, t2 WHERE (a=1 OR a=2)}
for {set x 1} {$x<5} {incr x} {
append sql " AND b=y"
do_malloc_test mallocK-1.$x -sqlbody $sql -sqlprep {
CREATE TABLE t1(a,b);
CREATE TABLE t2(x,y);
................................................................................
CREATE TABLE t1(a,b);
CREATE VIRTUAL TABLE t2 USING echo(t1);
}
}
}
}
finish_test
|
>
>
>
>
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
..
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
# This test script checks malloc failures in WHERE clause analysis. # # $Id: mallocK.test,v 1.3 2009/01/08 21:00:03 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl source $testdir/malloc_common.tcl set testprefix mallocK set sql {SELECT * FROM t1, t2 WHERE (a=1 OR a=2)} for {set x 1} {$x<5} {incr x} { append sql " AND b=y" do_malloc_test mallocK-1.$x -sqlbody $sql -sqlprep { CREATE TABLE t1(a,b); CREATE TABLE t2(x,y); ................................................................................ CREATE TABLE t1(a,b); CREATE VIRTUAL TABLE t2 USING echo(t1); } } } } #------------------------------------------------------------------------- # Test that OOM errors are correctly handled by the code that uses stat4 # data to estimate the number of rows visited by a skip-scan range query. # add_alignment_test_collations db do_execsql_test 6.0 { CREATE TABLE t3(a TEXT, b TEXT COLLATE utf16_aligned, c); INSERT INTO t3 VALUES('one', '.....', 0); INSERT INTO t3 VALUES('one', '....x', 1); INSERT INTO t3 VALUES('one', '...x.', 2); INSERT INTO t3 VALUES('one', '...xx', 3); INSERT INTO t3 VALUES('one', '..x..', 4); INSERT INTO t3 VALUES('one', '..x.x', 5); INSERT INTO t3 VALUES('one', '..xx.', 6); INSERT INTO t3 VALUES('one', '..xxx', 7); INSERT INTO t3 VALUES('one', '.x...', 8); INSERT INTO t3 VALUES('one', '.x..x', 9); INSERT INTO t3 VALUES('one', '.x.x.', 10); INSERT INTO t3 VALUES('one', '.x.xx', 11); INSERT INTO t3 VALUES('one', '.xx..', 12); INSERT INTO t3 VALUES('one', '.xx.x', 13); INSERT INTO t3 VALUES('one', '.xxx.', 14); INSERT INTO t3 VALUES('one', '.xxxx', 15); INSERT INTO t3 VALUES('two', 'x....', 16); INSERT INTO t3 VALUES('two', 'x...x', 17); INSERT INTO t3 VALUES('two', 'x..x.', 18); INSERT INTO t3 VALUES('two', 'x..xx', 19); INSERT INTO t3 VALUES('two', 'x.x..', 20); INSERT INTO t3 VALUES('two', 'x.x.x', 21); INSERT INTO t3 VALUES('two', 'x.xx.', 22); INSERT INTO t3 VALUES('two', 'x.xxx', 23); INSERT INTO t3 VALUES('two', 'xx...', 24); INSERT INTO t3 VALUES('two', 'xx..x', 25); INSERT INTO t3 VALUES('two', 'xx.x.', 26); INSERT INTO t3 VALUES('two', 'xx.xx', 27); INSERT INTO t3 VALUES('two', 'xxx..', 28); INSERT INTO t3 VALUES('two', 'xxx.x', 29); INSERT INTO t3 VALUES('two', 'xxxx.', 30); INSERT INTO t3 VALUES('two', 'xxxxx', 31); INSERT INTO t3 SELECT * FROM t3; CREATE INDEX i3 ON t3(a, b); ANALYZE; SELECT 'x' > '.'; } {1} ifcapable stat4 { do_eqp_test 6.1 { SELECT DISTINCT c FROM t3 WHERE b BETWEEN '.xx..' AND '.xxxx'; } { 0 0 0 {SEARCH TABLE t3 USING INDEX i3 (ANY(a) AND b>? AND b<?)} 0 0 0 {USE TEMP B-TREE FOR DISTINCT} } } do_faultsim_test 6 -faults oom* -body { db cache flush db eval { SELECT DISTINCT c FROM t3 WHERE b BETWEEN '.xx..' AND '.xxxx' } } -test { faultsim_test_result {0 {12 13 14 15}} } finish_test |