Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Get the min/max optimization working with descending indices. Ticket #2514. (CVS 4161) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
a80a3c9d0a5e0a8a3d67bd841e207689 |
User & Date: | drh 2007-07-18 18:17:12.000 |
Context
2007-07-19
| ||
12:41 | Clarify the documentation on the nByte parameter to sqlite3_prepare(). Make it clear that nByte is a maximum string length. Ticket #2516. (CVS 4162) (check-in: d1ae3de461 user: drh tags: trunk) | |
2007-07-18
| ||
18:17 | Get the min/max optimization working with descending indices. Ticket #2514. (CVS 4161) (check-in: a80a3c9d0a user: drh tags: trunk) | |
18:16 | Additional diagnostics added to the "out" file generated by lemon. (CVS 4160) (check-in: 7ef2aaf72a user: drh tags: trunk) | |
Changes
Changes to src/select.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** ** $Id: select.c,v 1.354 2007/07/18 18:17:12 drh Exp $ */ #include "sqliteInt.h" /* ** Delete all the content of a Select structure but do not deallocate ** the select structure itself. |
︙ | ︙ | |||
2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 | sqlite3VdbeAddOp(v, OP_Integer, iDb, 0); sqlite3VdbeOp3(v, OP_OpenRead, iIdx, pIdx->tnum, (char*)pKey, P3_KEYINFO_HANDOFF); if( seekOp==OP_Rewind ){ sqlite3VdbeAddOp(v, OP_Null, 0, 0); sqlite3VdbeAddOp(v, OP_MakeRecord, 1, 0); seekOp = OP_MoveGt; } sqlite3VdbeAddOp(v, seekOp, iIdx, 0); sqlite3VdbeAddOp(v, OP_IdxRowid, iIdx, 0); sqlite3VdbeAddOp(v, OP_Close, iIdx, 0); sqlite3VdbeAddOp(v, OP_MoveGe, base, 0); } eList.nExpr = 1; | > > > > > > > > > > | 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 | sqlite3VdbeAddOp(v, OP_Integer, iDb, 0); sqlite3VdbeOp3(v, OP_OpenRead, iIdx, pIdx->tnum, (char*)pKey, P3_KEYINFO_HANDOFF); if( seekOp==OP_Rewind ){ sqlite3VdbeAddOp(v, OP_Null, 0, 0); sqlite3VdbeAddOp(v, OP_MakeRecord, 1, 0); seekOp = OP_MoveGt; } if( pIdx->aSortOrder[0]==SQLITE_SO_DESC ){ /* Ticket #2514: invert the seek operator if we are using ** a descending index. */ if( seekOp==OP_Last ){ seekOp = OP_Rewind; }else{ assert( seekOp==OP_MoveGt ); seekOp = OP_MoveLt; } } sqlite3VdbeAddOp(v, seekOp, iIdx, 0); sqlite3VdbeAddOp(v, OP_IdxRowid, iIdx, 0); sqlite3VdbeAddOp(v, OP_Close, iIdx, 0); sqlite3VdbeAddOp(v, OP_MoveGe, base, 0); } eList.nExpr = 1; |
︙ | ︙ |
Added test/minmax2.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 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 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 | # 2007 July 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 file is testing SELECT statements that contain # aggregate min() and max() functions and which are handled as # as a special case. This file makes sure that the min/max # optimization works right in the presence of descending # indices. Ticket #2514. # # $Id: minmax2.test,v 1.1 2007/07/18 18:17:12 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl do_test minmax2-1.0 { execsql { PRAGMA legacy_file_format=0; BEGIN; CREATE TABLE t1(x, y); INSERT INTO t1 VALUES(1,1); INSERT INTO t1 VALUES(2,2); INSERT INTO t1 VALUES(3,2); INSERT INTO t1 VALUES(4,3); INSERT INTO t1 VALUES(5,3); INSERT INTO t1 VALUES(6,3); INSERT INTO t1 VALUES(7,3); INSERT INTO t1 VALUES(8,4); INSERT INTO t1 VALUES(9,4); INSERT INTO t1 VALUES(10,4); INSERT INTO t1 VALUES(11,4); INSERT INTO t1 VALUES(12,4); INSERT INTO t1 VALUES(13,4); INSERT INTO t1 VALUES(14,4); INSERT INTO t1 VALUES(15,4); INSERT INTO t1 VALUES(16,5); INSERT INTO t1 VALUES(17,5); INSERT INTO t1 VALUES(18,5); INSERT INTO t1 VALUES(19,5); INSERT INTO t1 VALUES(20,5); COMMIT; SELECT DISTINCT y FROM t1 ORDER BY y; } } {1 2 3 4 5} do_test minmax2-1.1 { set sqlite_search_count 0 execsql {SELECT min(x) FROM t1} } {1} do_test minmax2-1.2 { set sqlite_search_count } {19} do_test minmax2-1.3 { set sqlite_search_count 0 execsql {SELECT max(x) FROM t1} } {20} do_test minmax2-1.4 { set sqlite_search_count } {19} do_test minmax2-1.5 { execsql {CREATE INDEX t1i1 ON t1(x DESC)} set sqlite_search_count 0 execsql {SELECT min(x) FROM t1} } {1} do_test minmax2-1.6 { set sqlite_search_count } {2} do_test minmax2-1.7 { set sqlite_search_count 0 execsql {SELECT max(x) FROM t1} } {20} do_test minmax2-1.8 { set sqlite_search_count } {1} do_test minmax2-1.9 { set sqlite_search_count 0 execsql {SELECT max(y) FROM t1} } {5} do_test minmax2-1.10 { set sqlite_search_count } {19} do_test minmax2-2.0 { execsql { CREATE TABLE t2(a INTEGER PRIMARY KEY, b); INSERT INTO t2 SELECT * FROM t1; } set sqlite_search_count 0 execsql {SELECT min(a) FROM t2} } {1} do_test minmax2-2.1 { set sqlite_search_count } {0} do_test minmax2-2.2 { set sqlite_search_count 0 execsql {SELECT max(a) FROM t2} } {20} do_test minmax2-2.3 { set sqlite_search_count } {0} do_test minmax2-3.0 { ifcapable subquery { execsql {INSERT INTO t2 VALUES((SELECT max(a) FROM t2)+1,999)} } else { db function max_a_t2 {execsql {SELECT max(a) FROM t2}} execsql {INSERT INTO t2 VALUES(max_a_t2()+1,999)} } set sqlite_search_count 0 execsql {SELECT max(a) FROM t2} } {21} do_test minmax2-3.1 { set sqlite_search_count } {0} do_test minmax2-3.2 { ifcapable subquery { execsql {INSERT INTO t2 VALUES((SELECT max(a) FROM t2)+1,999)} } else { db function max_a_t2 {execsql {SELECT max(a) FROM t2}} execsql {INSERT INTO t2 VALUES(max_a_t2()+1,999)} } set sqlite_search_count 0 ifcapable subquery { execsql { SELECT b FROM t2 WHERE a=(SELECT max(a) FROM t2) } } else { execsql { SELECT b FROM t2 WHERE a=max_a_t2() } } } {999} do_test minmax2-3.3 { set sqlite_search_count } {0} ifcapable {compound && subquery} { do_test minmax2-4.1 { execsql { SELECT coalesce(min(x+0),-1), coalesce(max(x+0),-1) FROM (SELECT * FROM t1 UNION SELECT NULL as 'x', NULL as 'y') } } {1 20} do_test minmax2-4.2 { execsql { SELECT y, coalesce(sum(x),0) FROM (SELECT null AS x, y+1 AS y FROM t1 UNION SELECT * FROM t1) GROUP BY y ORDER BY y; } } {1 1 2 5 3 22 4 92 5 90 6 0} do_test minmax2-4.3 { execsql { SELECT y, count(x), count(*) FROM (SELECT null AS x, y+1 AS y FROM t1 UNION SELECT * FROM t1) GROUP BY y ORDER BY y; } } {1 1 1 2 2 3 3 4 5 4 8 9 5 5 6 6 0 1} } ;# ifcapable compound # Make sure the min(x) and max(x) optimizations work on empty tables # including empty tables with indices. Ticket #296. # do_test minmax2-5.1 { execsql { CREATE TABLE t3(x INTEGER UNIQUE NOT NULL); SELECT coalesce(min(x),999) FROM t3; } } {999} do_test minmax2-5.2 { execsql { SELECT coalesce(min(rowid),999) FROM t3; } } {999} do_test minmax2-5.3 { execsql { SELECT coalesce(max(x),999) FROM t3; } } {999} do_test minmax2-5.4 { execsql { SELECT coalesce(max(rowid),999) FROM t3; } } {999} do_test minmax2-5.5 { execsql { SELECT coalesce(max(rowid),999) FROM t3 WHERE rowid<25; } } {999} # Make sure the min(x) and max(x) optimizations work when there # is a LIMIT clause. Ticket #396. # do_test minmax2-6.1 { execsql { SELECT min(a) FROM t2 LIMIT 1 } } {1} do_test minmax2-6.2 { execsql { SELECT max(a) FROM t2 LIMIT 3 } } {22} do_test minmax2-6.3 { execsql { SELECT min(a) FROM t2 LIMIT 0,100 } } {1} do_test minmax2-6.4 { execsql { SELECT max(a) FROM t2 LIMIT 1,100 } } {} do_test minmax2-6.5 { execsql { SELECT min(x) FROM t3 LIMIT 1 } } {{}} do_test minmax2-6.6 { execsql { SELECT max(x) FROM t3 LIMIT 0 } } {} do_test minmax2-6.7 { execsql { SELECT max(a) FROM t2 LIMIT 0 } } {} # Make sure the max(x) and min(x) optimizations work for nested # queries. Ticket #587. # do_test minmax2-7.1 { execsql { SELECT max(x) FROM t1; } } 20 ifcapable subquery { do_test minmax2-7.2 { execsql { SELECT * FROM (SELECT max(x) FROM t1); } } 20 } do_test minmax2-7.3 { execsql { SELECT min(x) FROM t1; } } 1 ifcapable subquery { do_test minmax2-7.4 { execsql { SELECT * FROM (SELECT min(x) FROM t1); } } 1 } # Make sure min(x) and max(x) work correctly when the datatype is # TEXT instead of NUMERIC. Ticket #623. # do_test minmax2-8.1 { execsql { CREATE TABLE t4(a TEXT); INSERT INTO t4 VALUES('1234'); INSERT INTO t4 VALUES('234'); INSERT INTO t4 VALUES('34'); SELECT min(a), max(a) FROM t4; } } {1234 34} do_test minmax2-8.2 { execsql { CREATE TABLE t5(a INTEGER); INSERT INTO t5 VALUES('1234'); INSERT INTO t5 VALUES('234'); INSERT INTO t5 VALUES('34'); SELECT min(a), max(a) FROM t5; } } {34 1234} # Ticket #658: Test the min()/max() optimization when the FROM clause # is a subquery. # ifcapable {compound && subquery} { do_test minmax2-9.1 { execsql { SELECT max(rowid) FROM ( SELECT max(rowid) FROM t4 UNION SELECT max(rowid) FROM t5 ) } } {1} do_test minmax2-9.2 { execsql { SELECT max(rowid) FROM ( SELECT max(rowid) FROM t4 EXCEPT SELECT max(rowid) FROM t5 ) } } {{}} } ;# ifcapable compound&&subquery # If there is a NULL in an aggregate max() or min(), ignore it. An # aggregate min() or max() will only return NULL if all values are NULL. # do_test minmax2-10.1 { execsql { CREATE TABLE t6(x); INSERT INTO t6 VALUES(1); INSERT INTO t6 VALUES(2); INSERT INTO t6 VALUES(NULL); SELECT coalesce(min(x),-1) FROM t6; } } {1} do_test minmax2-10.2 { execsql { SELECT max(x) FROM t6; } } {2} do_test minmax2-10.3 { execsql { CREATE INDEX i6 ON t6(x DESC); SELECT coalesce(min(x),-1) FROM t6; } } {1} do_test minmax2-10.4 { execsql { SELECT max(x) FROM t6; } } {2} do_test minmax2-10.5 { execsql { DELETE FROM t6 WHERE x NOT NULL; SELECT count(*) FROM t6; } } 1 do_test minmax2-10.6 { execsql { SELECT count(x) FROM t6; } } 0 ifcapable subquery { do_test minmax2-10.7 { execsql { SELECT (SELECT min(x) FROM t6), (SELECT max(x) FROM t6); } } {{} {}} } do_test minmax2-10.8 { execsql { SELECT min(x), max(x) FROM t6; } } {{} {}} do_test minmax2-10.9 { execsql { INSERT INTO t6 SELECT * FROM t6; INSERT INTO t6 SELECT * FROM t6; INSERT INTO t6 SELECT * FROM t6; INSERT INTO t6 SELECT * FROM t6; INSERT INTO t6 SELECT * FROM t6; INSERT INTO t6 SELECT * FROM t6; INSERT INTO t6 SELECT * FROM t6; INSERT INTO t6 SELECT * FROM t6; INSERT INTO t6 SELECT * FROM t6; INSERT INTO t6 SELECT * FROM t6; SELECT count(*) FROM t6; } } 1024 do_test minmax2-10.10 { execsql { SELECT count(x) FROM t6; } } 0 ifcapable subquery { do_test minmax2-10.11 { execsql { SELECT (SELECT min(x) FROM t6), (SELECT max(x) FROM t6); } } {{} {}} } do_test minmax2-10.12 { execsql { SELECT min(x), max(x) FROM t6; } } {{} {}} finish_test |