Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add a few more tests to where8.test. (CVS 6081) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
ac28aa8b618d59628c5b8fc6fe649ec1 |
User & Date: | danielk1977 2008-12-30 15:26:30.000 |
Context
2008-12-30
| ||
15:51 | Fix a bug in where8.test causing a tcl exception. (CVS 6082) (check-in: 495b569a39 user: danielk1977 tags: trunk) | |
15:26 | Add a few more tests to where8.test. (CVS 6081) (check-in: ac28aa8b61 user: danielk1977 tags: trunk) | |
14:40 | Still more test cases in where7.test. (CVS 6080) (check-in: eb9ba5fe70 user: drh tags: trunk) | |
Changes
Changes to src/where.c.
︙ | ︙ | |||
12 13 14 15 16 17 18 | ** This module contains C code that generates VDBE code used to process ** the WHERE clause of SQL statements. This module is responsible for ** generating the code that loops through a table looking for applicable ** rows. Indices are selected and used to speed the search when doing ** so is applicable. Because this module is responsible for selecting ** indices, you might also think of this module as the "query optimizer". ** | | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | ** This module contains C code that generates VDBE code used to process ** the WHERE clause of SQL statements. This module is responsible for ** generating the code that loops through a table looking for applicable ** rows. Indices are selected and used to speed the search when doing ** so is applicable. Because this module is responsible for selecting ** indices, you might also think of this module as the "query optimizer". ** ** $Id: where.c,v 1.353 2008/12/30 15:26:30 danielk1977 Exp $ */ #include "sqliteInt.h" /* ** Trace output macros */ #if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) |
︙ | ︙ | |||
572 573 574 575 576 577 578 | /* Figure out the collation sequence required from an index for ** it to be useful for optimising expression pX. Store this ** value in variable pColl. */ assert(pX->pLeft); pColl = sqlite3BinaryCompareCollSeq(pParse, pX->pLeft, pX->pRight); | | < < | | 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 | /* Figure out the collation sequence required from an index for ** it to be useful for optimising expression pX. Store this ** value in variable pColl. */ assert(pX->pLeft); pColl = sqlite3BinaryCompareCollSeq(pParse, pX->pLeft, pX->pRight); assert(pColl || pParse->nErr); for(j=0; pIdx->aiColumn[j]!=iColumn; j++){ if( NEVER(j>=pIdx->nColumn) ) return 0; } if( pColl && sqlite3StrICmp(pColl->zName, pIdx->azColl[j]) ) continue; } return pTerm; } } return 0; } |
︙ | ︙ |
Changes to test/where8.test.
︙ | ︙ | |||
8 9 10 11 12 13 14 | # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The focus # is testing of where.c. More specifically, the focus is the optimization # of WHERE clauses that feature the OR operator. # | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The focus # is testing of where.c. More specifically, the focus is the optimization # of WHERE clauses that feature the OR operator. # # $Id: where8.test,v 1.3 2008/12/30 15:26:30 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Test organization: # # where8-1.*: Tests to demonstrate simple cases work with a single table |
︙ | ︙ | |||
292 293 294 295 296 297 298 299 300 301 302 303 304 305 | #----------------------------------------------------------------------- # The following tests - where8-4.* - verify that adding or removing # indexes does not change the results returned by various queries. # do_test where8-4.1 { execsql { CREATE TABLE t3(a INTEGER, b REAL, c TEXT); CREATE TABLE t4(f INTEGER, g REAL, h TEXT); } } {} finish_test | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 | #----------------------------------------------------------------------- # The following tests - where8-4.* - verify that adding or removing # indexes does not change the results returned by various queries. # do_test where8-4.1 { execsql { BEGIN; CREATE TABLE t3(a INTEGER, b REAL, c TEXT); CREATE TABLE t4(f INTEGER, g REAL, h TEXT); INSERT INTO t3 VALUES('hills', NULL, 1415926535); INSERT INTO t3 VALUES('and', 'of', NULL); INSERT INTO t3 VALUES('have', 'towering', 53594.08128); INSERT INTO t3 VALUES(NULL, 45.64856692, 'Not'); INSERT INTO t3 VALUES('same', 5028841971, NULL); INSERT INTO t3 VALUES('onlookers', 'in', 8214808651); INSERT INTO t3 VALUES(346.0348610, 2643383279, NULL); INSERT INTO t3 VALUES(1415926535, 'of', 'are'); INSERT INTO t3 VALUES(NULL, 0.4811174502, 'snapshots'); INSERT INTO t3 VALUES('over', 'the', 8628034825); INSERT INTO t3 VALUES(8628034825, 66.59334461, 2847564.823); INSERT INTO t3 VALUES('onlookers', 'same', 'and'); INSERT INTO t3 VALUES(NULL, 'light', 6939937510); INSERT INTO t3 VALUES('from', 'their', 'viewed'); INSERT INTO t3 VALUES('from', 'Alpine', 'snapshots'); INSERT INTO t3 VALUES('from', 'sometimes', 'unalike'); INSERT INTO t3 VALUES(1339.360726, 'light', 'have'); INSERT INTO t3 VALUES(6939937510, 3282306647, 'other'); INSERT INTO t3 VALUES('paintings', 8628034825, 'all'); INSERT INTO t3 VALUES('paintings', NULL, 'same'); INSERT INTO t3 VALUES('Alpine', 378678316.5, 'unalike'); INSERT INTO t3 VALUES('Alpine', NULL, 'same'); INSERT INTO t3 VALUES(1339.360726, 2847564.823, 'over'); INSERT INTO t3 VALUES('villages', 'their', 'have'); INSERT INTO t3 VALUES('unalike', 'remarkably', 'in'); INSERT INTO t3 VALUES('and', 8979323846, 'and'); INSERT INTO t3 VALUES(NULL, 1415926535, 'an'); INSERT INTO t3 VALUES(271.2019091, 8628034825, 0.4811174502); INSERT INTO t3 VALUES('all', 3421170679, 'the'); INSERT INTO t3 VALUES('Not', 'and', 1415926535); INSERT INTO t3 VALUES('of', 'other', 'light'); INSERT INTO t3 VALUES(NULL, 'towering', 'Not'); INSERT INTO t3 VALUES(346.0348610, NULL, 'other'); INSERT INTO t3 VALUES('Not', 378678316.5, NULL); INSERT INTO t3 VALUES('snapshots', 8628034825, 'of'); INSERT INTO t3 VALUES(3282306647, 271.2019091, 'and'); INSERT INTO t3 VALUES(50.58223172, 378678316.5, 5028841971); INSERT INTO t3 VALUES(50.58223172, 2643383279, 'snapshots'); INSERT INTO t3 VALUES('writings', 8979323846, 8979323846); INSERT INTO t3 VALUES('onlookers', 'his', 'in'); INSERT INTO t3 VALUES('unalike', 8628034825, 1339.360726); INSERT INTO t3 VALUES('of', 'Alpine', 'and'); INSERT INTO t3 VALUES('onlookers', NULL, 'from'); INSERT INTO t3 VALUES('writings', 'it', 1339.360726); INSERT INTO t3 VALUES('it', 'and', 'villages'); INSERT INTO t3 VALUES('an', 'the', 'villages'); INSERT INTO t3 VALUES(8214808651, 8214808651, 'same'); INSERT INTO t3 VALUES(346.0348610, 'light', 1415926535); INSERT INTO t3 VALUES(NULL, 8979323846, 'and'); INSERT INTO t3 VALUES(NULL, 'same', 1339.360726); INSERT INTO t4 VALUES('his', 'from', 'an'); INSERT INTO t4 VALUES('snapshots', 'or', NULL); INSERT INTO t4 VALUES('Alpine', 'have', 'it'); INSERT INTO t4 VALUES('have', 'peak', 'remarkably'); INSERT INTO t4 VALUES('hills', NULL, 'Not'); INSERT INTO t4 VALUES('same', 'from', 2643383279); INSERT INTO t4 VALUES('have', 'angle', 8628034825); INSERT INTO t4 VALUES('sometimes', 'it', 2847564.823); INSERT INTO t4 VALUES(0938446095, 'peak', 'of'); INSERT INTO t4 VALUES(8628034825, 'and', 'same'); INSERT INTO t4 VALUES('and', 271.2019091, 'their'); INSERT INTO t4 VALUES('the', 'of', 'remarkably'); INSERT INTO t4 VALUES('and', 3421170679, 1415926535); INSERT INTO t4 VALUES('and', 'in', 'all'); INSERT INTO t4 VALUES(378678316.5, 0.4811174502, 'snapshots'); INSERT INTO t4 VALUES('it', 'are', 'have'); INSERT INTO t4 VALUES('angle', 'snapshots', 378678316.5); INSERT INTO t4 VALUES('from', 1415926535, 8628034825); INSERT INTO t4 VALUES('snapshots', 'angle', 'have'); INSERT INTO t4 VALUES(3421170679, 0938446095, 'Not'); INSERT INTO t4 VALUES('peak', NULL, 0.4811174502); INSERT INTO t4 VALUES('same', 'have', 'Alpine'); INSERT INTO t4 VALUES(271.2019091, 66.59334461, 0938446095); INSERT INTO t4 VALUES(8979323846, 'his', 'an'); INSERT INTO t4 VALUES(NULL, 'and', 3282306647); INSERT INTO t4 VALUES('remarkably', NULL, 'Not'); INSERT INTO t4 VALUES('villages', 4543.266482, 'his'); INSERT INTO t4 VALUES(2643383279, 'paintings', 'onlookers'); INSERT INTO t4 VALUES(1339.360726, 'of', 'the'); INSERT INTO t4 VALUES('peak', 'other', 'peak'); INSERT INTO t4 VALUES('it', 'or', 8979323846); INSERT INTO t4 VALUES('onlookers', 'Not', 'towering'); INSERT INTO t4 VALUES(NULL, 'peak', 'Not'); INSERT INTO t4 VALUES('of', 'have', 6939937510); INSERT INTO t4 VALUES('light', 'hills', 0.4811174502); INSERT INTO t4 VALUES(5028841971, 'Not', 'it'); INSERT INTO t4 VALUES('and', 'Not', NULL); INSERT INTO t4 VALUES(346.0348610, 'villages', NULL); INSERT INTO t4 VALUES(8979323846, NULL, 6939937510); INSERT INTO t4 VALUES('an', 'light', 'peak'); INSERT INTO t4 VALUES(5028841971, 6939937510, 'light'); INSERT INTO t4 VALUES('sometimes', 'peak', 'peak'); INSERT INTO t4 VALUES(378678316.5, 5028841971, 'an'); INSERT INTO t4 VALUES(378678316.5, 'his', 'Alpine'); INSERT INTO t4 VALUES('from', 'of', 'all'); INSERT INTO t4 VALUES(0938446095, 'same', NULL); INSERT INTO t4 VALUES(0938446095, 'Alpine', NULL); INSERT INTO t4 VALUES('his', 'of', 378678316.5); INSERT INTO t4 VALUES(271.2019091, 'viewed', 3282306647); INSERT INTO t4 VALUES('hills', 'all', 'peak'); COMMIT; } } {} catch {unset results} set A 2 foreach idxsql { { /* No indexes */ } { CREATE INDEX i5 ON t3(a); } { CREATE INDEX i5 ON t3(a, b); CREATE INDEX i6 ON t4(f); } { CREATE UNIQUE INDEX i5 ON t3(a, b); CREATE INDEX i7 ON t3(c); CREATE INDEX i6 ON t4(f); CREATE INDEX i8 ON t4(h); } { CREATE INDEX i5 ON t3(a, b, c); CREATE INDEX i6 ON t4(f, g, h); CREATE INDEX i7 ON t3(c, b, a); CREATE INDEX i8 ON t4(h, g, f); } } { execsql { DROP INDEX IF EXISTS i5; DROP INDEX IF EXISTS i6; DROP INDEX IF EXISTS i7; DROP INDEX IF EXISTS i8; } execsql $idxsql foreach {B sql} { 1 { SELECT * FROM t3 WHERE c LIKE b } 2 { SELECT * FROM t3 WHERE c||'' LIKE 'the%' } 3 { SELECT * FROM t3 WHERE rowid LIKE '12%' } 4 { SELECT * FROM t3 WHERE +c LIKE 'the%' } 5 { SELECT * FROM t3 WHERE c LIKE 'the%' } 6 { SELECT * FROM t3 WHERE c GLOB '*llo' } 7 { SELECT * FROM t3 WHERE a = 'angle' } 8 { SELECT * FROM t3 WHERE a = 'it' OR b = 6939937510 } 9 { SELECT * FROM t3, t4 WHERE a = 'painting' OR a = 'are' OR a = f } 10 { SELECT * FROM t3, t4 WHERE a = 'all' OR a = 'and' OR a = h } 11 { SELECT * FROM t3, t4 WHERE a < 'of' OR b > 346 AND c IS NULL } 12 { SELECT * FROM t3, t4 WHERE 'the' > a OR b > 'have' AND c = 1415926535 } 13 { SELECT * FROM t3 WHERE a BETWEEN 'one' AND 'two' OR a = 3421170679 } 14 { SELECT * FROM t3 WHERE a BETWEEN 'one' AND 'two' OR a IS NULL } 15 { SELECT * FROM t3 WHERE c > 'one' OR c >= 'one' OR c LIKE 'one%' } 16 { SELECT * FROM t3 WHERE c > 'one' OR c = c OR c = a } 17 { SELECT * FROM t3 WHERE c IS NULL OR a >= 'peak' } 18 { SELECT * FROM t3 WHERE c IN ('other', 'all', 'snapshots') OR a>1 } 19 { SELECT * FROM t3 WHERE c IN ('other', 'all', 'snapshots') AND a>1 } 20 { SELECT * FROM t3 WHERE c IS NULL AND a>'one' } 21 { SELECT * FROM t3 WHERE c IS NULL OR a>'one' } } { do_test where8-4.$A.$B.1 { set R [execsql $sql] if {![info exists results($B)]} { set results($B) $R } list } {} do_test where8-4.$A.$B.2 { lsort $R } [lsort $results($B)] } incr A } finish_test |