Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix an FTS3 problem where an OOM error was not being propagated back out to the top-level interface. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
2ad1461f255c2499367b706a5ec65b44 |
| User & Date: | drh 2009-12-04 13:43:00 |
References
|
2009-12-04
| ||
| 14:11 | Modify [2ad1461f25] to avoid leaving a prepared statement in "active" state following an OOM error in FTS3. (check-in: 69c21ee4 user: dan tags: trunk) | |
Context
|
2009-12-04
| ||
| 14:11 | Modify [2ad1461f25] to avoid leaving a prepared statement in "active" state following an OOM error in FTS3. (check-in: 69c21ee4 user: dan tags: trunk) | |
| 13:43 | Fix an FTS3 problem where an OOM error was not being propagated back out to the top-level interface. (check-in: 2ad1461f user: drh tags: trunk) | |
| 08:41 | Reset the state of the asynchronous IO module at the end of the tkt-94c04eaadb.test script. (check-in: e8ae7e98 user: dan tags: trunk) | |
Changes
Changes to ext/fts3/fts3.c.
1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 |
}else{
sqlite3_int64 i1;
rc = fts3SelectLeaf(p, zTerm, nTerm, zRoot, nRoot, &i1);
if( rc==SQLITE_OK ){
sqlite3_int64 i2 = sqlite3_column_int64(pStmt, 2);
rc = sqlite3Fts3SegReaderNew(p, iAge, i1, i2, 0, 0, 0, &pNew);
}
sqlite3Fts3ReadBlock(p, 0, 0, 0);
}
iAge++;
/* If a new Fts3SegReader was allocated, add it to the apSegment array. */
assert( (rc==SQLITE_OK)==(pNew!=0) );
if( pNew ){
if( nSegment==nAlloc ){
Fts3SegReader **pArray;
nAlloc += 16;
pArray = (Fts3SegReader **)sqlite3_realloc(
apSegment, nAlloc*sizeof(Fts3SegReader *)
);
|
> | > | |
1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 |
}else{
sqlite3_int64 i1;
rc = fts3SelectLeaf(p, zTerm, nTerm, zRoot, nRoot, &i1);
if( rc==SQLITE_OK ){
sqlite3_int64 i2 = sqlite3_column_int64(pStmt, 2);
rc = sqlite3Fts3SegReaderNew(p, iAge, i1, i2, 0, 0, 0, &pNew);
}
if( rc==SQLITE_OK ){
rc = sqlite3Fts3ReadBlock(p, 0, 0, 0);
}
}
iAge++;
/* If a new Fts3SegReader was allocated, add it to the apSegment array. */
assert( pNew!=0 || rc!=SQLITE_OK );
if( pNew ){
if( nSegment==nAlloc ){
Fts3SegReader **pArray;
nAlloc += 16;
pArray = (Fts3SegReader **)sqlite3_realloc(
apSegment, nAlloc*sizeof(Fts3SegReader *)
);
|