SQLite4
Check-in [259878e357]
Not logged in

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

Overview
Comment:Remove an inaccurate assert() from lsm_sorted.c.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | block-redirects
Files: files | file ages | folders
SHA1: 259878e357ae7ccfbb455233551e8392bf18bc3a
User & Date: dan 2013-01-26 17:24:06
Context
2013-01-26
19:17
Fix problems with redirected blocks in compressed databases. check-in: 930b7e4507 user: dan tags: block-redirects
17:24
Remove an inaccurate assert() from lsm_sorted.c. check-in: 259878e357 user: dan tags: block-redirects
16:44
Fix a problem to do with an lsm_seek(LSM_SEEK_LE) on a level that is currently undergoing a merge. Add more complex assert statements to catch any similar problems. check-in: ca4dc40190 user: dan tags: block-redirects
Changes
Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to lsm-test/lsmtest9.c.

    60     60     for(i=0; rc==0 && i<p->nRepeat; i++){
    61     61   
    62     62       testDeleteDatasourceRange(pControl, pData, iData, nRecOn3*2, &rc);
    63     63       testDeleteDatasourceRange(pDb,      pData, iData, nRecOn3*2, &rc);
    64     64   
    65     65       if( db ){
    66     66         int nDone;
    67         -      fprintf(stderr, "lsm_work() start...\n");
    68         -      fflush(stderr);
           67  +#if 0
           68  +      fprintf(stderr, "lsm_work() start...\n"); fflush(stderr);
           69  +#endif
    69     70         do {
    70     71           nDone = 0;
    71     72           rc = lsm_work(db, 1, (1<<30), &nDone);
    72     73         }while( rc==0 && nDone>0 );
    73         -      fprintf(stderr, "lsm_work() done...\n");
    74         -      fflush(stderr);
           74  +#if 0 
           75  +      fprintf(stderr, "lsm_work() done...\n"); fflush(stderr);
           76  +#endif
    75     77       }
    76     78   
    77     79   if( i+1<p->nRepeat ){
    78     80       iData += (nRecOn3*2);
    79     81       testWriteDatasourceRange(pControl, pData, iData+nRecOn3, nRecOn3*2, &rc);
    80     82       testWriteDatasourceRange(pDb,      pData, iData+nRecOn3, nRecOn3*2, &rc);
    81     83   

Changes to src/lsm_sorted.c.

  1916   1916       int iPtr = 0;
  1917   1917       if( nRhs==0 ) iPtr = *piPgno;
  1918   1918   
  1919   1919       rc = seekInSegment(
  1920   1920           pCsr, &aPtr[0], iTopic, pKey, nKey, iPtr, eSeek, &iOut, &bStop
  1921   1921       );
  1922   1922       if( rc==LSM_OK && nRhs>0 && eSeek==LSM_SEEK_GE && aPtr[0].pPg==0 ){
  1923         -      assert( aPtr[0].pKey==0 );
  1924   1923         res = 0;
  1925   1924       }
  1926   1925     }
  1927   1926     
  1928   1927     if( res>=0 ){
  1929   1928       int bHit = 0;                 /* True if at least one rhs is not EOF */
  1930   1929       int iPtr = *piPgno;