Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Silence three harmless compiler warnings in vdbesort.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
a5431c86df442c6e6dfaeae8e8aa62b5 |
| User & Date: | drh 2012-08-14 19:04:27 |
Context
|
2012-08-15
| ||
| 16:06 | Change autoconf so that the --with-tcl=DIR option will override the TCL configuration that is found using tclsh. (check-in: 772d0de3 user: drh tags: trunk) | |
| 15:57 | Experimental change to speed up ORDER BY clauses that sort based on a single expression. (Leaf check-in: 2bb8c492 user: dan tags: sorter-exp) | |
|
2012-08-14
| ||
| 19:04 | Silence three harmless compiler warnings in vdbesort.c. (check-in: a5431c86 user: drh tags: trunk) | |
| 18:43 | Add an assert() to the btree rebalancer in order to silence a clang/scan-build warning. (check-in: 6730579c user: drh tags: trunk) | |
Changes
Changes to src/vdbesort.c.
191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 ... 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 ... 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 |
** than p->nBuffer bytes remaining in the PMA, read all remaining data. */
iBuf = p->iReadOff % p->nBuffer;
if( iBuf==0 ){
int nRead; /* Bytes to read from disk */
int rc; /* sqlite3OsRead() return code */
/* Determine how many bytes of data to read. */
nRead = p->iEof - p->iReadOff;
if( nRead>p->nBuffer ) nRead = p->nBuffer;
assert( nRead>0 );
/* Read data from the file. Return early if an error occurs. */
rc = sqlite3OsRead(p->pFile, p->aBuffer, nRead, p->iReadOff);
assert( rc!=SQLITE_IOERR_SHORT_READ );
if( rc!=SQLITE_OK ) return rc;
................................................................................
vdbeSorterIterZero(db, pIter);
return SQLITE_OK;
}
rc = vdbeSorterIterVarint(db, pIter, &nRec);
if( rc==SQLITE_OK ){
pIter->nKey = (int)nRec;
rc = vdbeSorterIterRead(db, pIter, nRec, &pIter->aKey);
}
return rc;
}
/*
** Initialize iterator pIter to scan through the PMA stored in file pFile
................................................................................
}else{
int iBuf;
iBuf = iStart % nBuf;
if( iBuf ){
int nRead = nBuf - iBuf;
if( (iStart + nRead) > pSorter->iWriteOff ){
nRead = pSorter->iWriteOff - iStart;
}
rc = sqlite3OsRead(
pSorter->pTemp1, &pIter->aBuffer[iBuf], nRead, iStart
);
assert( rc!=SQLITE_IOERR_SHORT_READ );
}
|
| | | |
191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 ... 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 ... 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 |
** than p->nBuffer bytes remaining in the PMA, read all remaining data. */
iBuf = p->iReadOff % p->nBuffer;
if( iBuf==0 ){
int nRead; /* Bytes to read from disk */
int rc; /* sqlite3OsRead() return code */
/* Determine how many bytes of data to read. */
nRead = (int)(p->iEof - p->iReadOff);
if( nRead>p->nBuffer ) nRead = p->nBuffer;
assert( nRead>0 );
/* Read data from the file. Return early if an error occurs. */
rc = sqlite3OsRead(p->pFile, p->aBuffer, nRead, p->iReadOff);
assert( rc!=SQLITE_IOERR_SHORT_READ );
if( rc!=SQLITE_OK ) return rc;
................................................................................
vdbeSorterIterZero(db, pIter);
return SQLITE_OK;
}
rc = vdbeSorterIterVarint(db, pIter, &nRec);
if( rc==SQLITE_OK ){
pIter->nKey = (int)nRec;
rc = vdbeSorterIterRead(db, pIter, (int)nRec, &pIter->aKey);
}
return rc;
}
/*
** Initialize iterator pIter to scan through the PMA stored in file pFile
................................................................................
}else{
int iBuf;
iBuf = iStart % nBuf;
if( iBuf ){
int nRead = nBuf - iBuf;
if( (iStart + nRead) > pSorter->iWriteOff ){
nRead = (int)(pSorter->iWriteOff - iStart);
}
rc = sqlite3OsRead(
pSorter->pTemp1, &pIter->aBuffer[iBuf], nRead, iStart
);
assert( rc!=SQLITE_IOERR_SHORT_READ );
}
|