/ Check-in [5499af53]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove a NEVER() that is in fact reachable on an OOM. This probably has nothing to do with the multi-or-covering-index change but just happened to be found while testing that change.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | multi-or-covering-index
Files: files | file ages | folders
SHA1: 5499af53ebcdc21ae288aa2347aa21f6891d79ef
User & Date: drh 2012-08-24 21:54:11
Context
2012-08-24
23:24
Move field WhereLevel.pCovidx inside the union to WhereLevel.u.pCovidx. Closed-Leaf check-in: b722143d user: drh tags: multi-or-covering-index
21:54
Remove a NEVER() that is in fact reachable on an OOM. This probably has nothing to do with the multi-or-covering-index change but just happened to be found while testing that change. check-in: 5499af53 user: drh tags: multi-or-covering-index
19:58
Another test for whereD.test. check-in: 29d58617 user: dan tags: multi-or-covering-index
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/where.c.

  3618   3618     /* Evaluate the equality constraints
  3619   3619     */
  3620   3620     assert( pIdx->nColumn>=nEq );
  3621   3621     for(j=0; j<nEq; j++){
  3622   3622       int r1;
  3623   3623       int k = pIdx->aiColumn[j];
  3624   3624       pTerm = findTerm(pWC, iCur, k, notReady, pLevel->plan.wsFlags, pIdx);
  3625         -    if( NEVER(pTerm==0) ) break;
         3625  +    if( pTerm==0 ) break;
  3626   3626       /* The following true for indices with redundant columns. 
  3627   3627       ** Ex: CREATE INDEX i1 ON t1(a,b,a); SELECT * FROM t1 WHERE a=0 AND b=0; */
  3628   3628       testcase( (pTerm->wtFlags & TERM_CODED)!=0 );
  3629   3629       testcase( pTerm->wtFlags & TERM_VIRTUAL ); /* EV: R-30575-11662 */
  3630   3630       r1 = codeEqualityTerm(pParse, pTerm, pLevel, regBase+j);
  3631   3631       if( r1!=regBase+j ){
  3632   3632         if( nReg==1 ){