SQLite

Check-in [72f9727714]
Login

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

Overview
Comment:Remove an unnecessary branch from the UPDATE logic - one that was also unreachable except following an OOM on x64.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 72f972771457b8c8d9f859238d6a72b43f41d2c3
User & Date: drh 2013-12-03 10:14:28.006
Context
2013-12-03
10:35
Modify test file conflict2.test so that it works with the "inmemory_journal" permutation. (check-in: e4164fd8f7 user: dan tags: trunk)
10:14
Remove an unnecessary branch from the UPDATE logic - one that was also unreachable except following an OOM on x64. (check-in: 72f9727714 user: drh tags: trunk)
09:49
Add a "database_may_be_corrupt" directive to test file fuzz3.test. Reformat an assert() statement in vdbeaux.c to make its intent clearer. (check-in: 9d8a0e1321 user: dan tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/update.c.
︙︙
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593

    sqlite3GenerateRowIndexDelete(pParse, pTab, iDataCur, iIdxCur, aRegIdx);
  
    /* If changing the record number, delete the old record.  */
    if( hasFK || chngKey || pPk!=0 ){
      sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, 0);
    }
    if( bReplace || chngKey ){
      if( sqlite3VdbeCurrentAddr(v)==j1+1 ){
        sqlite3VdbeChangeToNoop(v, j1);
      }else{
        sqlite3VdbeJumpHere(v, j1);
      }
    }

    if( hasFK ){
      sqlite3FkCheck(pParse, pTab, 0, regNewRowid, aXRef, chngKey);
    }
  
    /* Insert the new index entries and the new record. */








<
<
<
|
<








575
576
577
578
579
580
581



582

583
584
585
586
587
588
589

    sqlite3GenerateRowIndexDelete(pParse, pTab, iDataCur, iIdxCur, aRegIdx);
  
    /* If changing the record number, delete the old record.  */
    if( hasFK || chngKey || pPk!=0 ){
      sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, 0);
    }
    if( bReplace || chngKey ){



      sqlite3VdbeJumpHere(v, j1);

    }

    if( hasFK ){
      sqlite3FkCheck(pParse, pTab, 0, regNewRowid, aXRef, chngKey);
    }
  
    /* Insert the new index entries and the new record. */
︙︙